[jboss-svn-commits] JBL Code SVN: r6441 - in labs/jbosstm/trunk: ArjunaCore/arjuna ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery ArjunaCore/tsmx ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common ArjunaCore/txoj ArjunaCore/txoj/classes/com/arjuna/ats/txoj ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common ArjunaJTA/jdbc ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common ArjunaJTA/jta ArjunaJTA/jta/classes/com/arjuna/ats/jta/common ArjunaJTS/jts ArjunaJTS/jts/classes/com/arjuna/ats/jts ArjunaJTS/jts/classes/com/arjuna/ats/jts/common ArjunaJTS/orbportability ArjunaJTS/orbportability/classes/com/arjuna/orbportability ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common antbuildsystem common common/classes/com/arjuna/common
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 27 12:09:30 EDT 2006
Author: kevin.conner at jboss.com
Date: 2006-09-27 12:09:02 -0400 (Wed, 27 Sep 2006)
New Revision: 6441
Added:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.java
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.java
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.java
Removed:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.javatmpl
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.javatmpl
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl
labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.javatmpl
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.javatmpl
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.javatmpl
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.javatmpl
labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.javatmpl
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.javatmpl
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.javatmpl
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.javatmpl
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.javatmpl
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.javatmpl
labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.javatmpl
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
labs/jbosstm/trunk/ArjunaCore/txoj/build.xml
labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
labs/jbosstm/trunk/antbuildsystem/build.xml
labs/jbosstm/trunk/common/build.xml
Log:
Removed javatmpl files and tidied up the build system
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -64,13 +64,6 @@
<!--
<property name="com.hp.mwlabs.ts.arjuna.compile.excludes" value="**/jdbc/**/*.java"/>
-->
- <!-- Files that need word substitutions -->
- <property name="com.hp.mwlabs.ts.arjuna.info.src" location="${com.hp.mwlabs.ts.arjuna.src}/com/arjuna/ats/arjuna/Info.javatmpl"/>
- <property name="com.hp.mwlabs.ts.arjuna.info.dest" location="${com.hp.mwlabs.ts.arjuna.src}/com/arjuna/ats/arjuna/Info.java"/>
- <property name="com.hp.mwlabs.ts.arjuna.properties.src" location="${com.hp.mwlabs.ts.arjuna.src}/com/arjuna/ats/arjuna/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.ts.arjuna.properties.dest" location="${com.hp.mwlabs.ts.arjuna.src}/com/arjuna/ats/arjuna/common/Configuration.java"/>
- <property name="com.hp.mwlabs.ts.arjuna.recoveryproperties.src" location="${com.hp.mwlabs.ts.arjuna.src}/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl"/>
- <property name="com.hp.mwlabs.ts.arjuna.recoveryproperties.dest" location="${com.hp.mwlabs.ts.arjuna.src}/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.java"/>
<property name="com.hp.mwlabs.ts.arjuna.propertyfile.src" value="${com.hp.mwlabs.ts.modulename}-properties.xml"/>
<property name="com.hp.mwlabs.ts.arjuna.recoverypropertyfile.src" value="RecoveryManager-properties.xml"/>
@@ -148,22 +141,6 @@
<equals arg1="${com.hp.mw.ts.arjuna.services.install}" arg2="yes"/>
</condition>
- <!-- Process the info class -->
- <copy
- file="${com.hp.mwlabs.ts.arjuna.info.src}"
- tofile="${com.hp.mwlabs.ts.arjuna.info.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
- <filter token="SOURCEID" value="${com.hp.mw.sourceid}"/>
- <filter token="BUILDINFO" value="${com.hp.mw.builder}"/>
- <filter token="VERSION" value="${com.hp.mw.version}"/>
- <filter token="DATE" value="${com.hp.mw.date}"/>
- <filter token="NOTES" value="${com.hp.mw.notes}"/>
- </filterset>
- </copy>
-
<!-- Set the module property files details -->
<!-- Set the module property files details -->
@@ -180,28 +157,6 @@
<echo message="Commong logging property file name : ${com.hp.mwlabs.ts.arjuna.loggingpropertyfile}"/>
<echo message="Property directory : ${com.hp.mw.propertydirectory}"/>
- <!-- Process the classes that use the property file -->
- <copy
- file="${com.hp.mwlabs.ts.arjuna.properties.src}"
- tofile="${com.hp.mwlabs.ts.arjuna.properties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="ARJUNA_VERSION" value="${com.hp.mw.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.arjuna.propertyfile}"/>
- <filter token="PROPERTIES_DIR" value="${com.hp.mw.propertydirectory}"/>
- </filterset>
- </copy>
- <copy
- file="${com.hp.mwlabs.ts.arjuna.recoveryproperties.src}"
- tofile="${com.hp.mwlabs.ts.arjuna.recoveryproperties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="RECOVERY_PROPERTIES_FILE" value="${com.hp.mwlabs.ts.arjuna.recoverypropertyfile}"/>
- </filterset>
- </copy>
-
<!-- Make the destination directory -->
<mkdir dir="${com.hp.mwlabs.ts.arjuna.dest}"/>
@@ -240,6 +195,20 @@
</classpath>
</javac>
+ <!-- Process the properties -->
+ <property name="property.file" value="arjuna.properties"/>
+ <propertyfile file="${com.hp.mwlabs.ts.arjuna.dest}/${property.file}">
+ <entry key="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
+ <entry key="SOURCEID" value="${com.hp.mw.sourceid}"/>
+ <entry key="BUILDINFO" value="${com.hp.mw.builder}"/>
+ <entry key="VERSION" value="${com.hp.mw.version}"/>
+ <entry key="DATE" value="${com.hp.mw.date}"/>
+ <entry key="NOTES" value="${com.hp.mw.notes}"/>
+ <entry key="ARJUNA_VERSION" value="${com.hp.mw.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.arjuna.propertyfile}"/>
+ <entry key="RECOVERY_PROPERTIES_FILE" value="${com.hp.mwlabs.ts.arjuna.recoverypropertyfile}"/>
+ </propertyfile>
+
</target>
<!-- Non-specific objectstore files -->
@@ -554,10 +523,6 @@
<echo message="Cleaning module"/>
<delete dir="${com.hp.mwlabs.ts.arjuna.destroot}"/>
<delete dir="${com.hp.mwlabs.ts.arjuna.jar.dest}"/>
- <delete file="${com.hp.mwlabs.ts.arjuna.info.dest}"/>
- <delete file="${com.hp.mwlabs.ts.arjuna.properties.dest}"/>
- <delete file="${com.hp.mwlabs.ts.arjuna.recoveryproperties.dest}"/>
- <delete file="${com.hp.mwlabs.ts.arjuna.brandings.dest}"/>
</target>
<target name="com.hp.mwlabs.ts.arjuna.tests.clean">
Copied: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.java (from rev 6408, labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.arjuna;
+
+import java.util.Hashtable;
+
+import com.arjuna.ats.arjuna.common.Configuration;
+
+/**
+ * Module specific implementation of the interface object.
+ *
+ * @author Richard Begg (richard_begg at hp.com)
+ * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since HPTS 3.0
+ */
+
+public class Info
+{
+ public String toString()
+ {
+ StringBuffer moduleInfo = new StringBuffer();
+
+ moduleInfo.append("<module-info name=\"" + Configuration.getBuildTimeProperty("MODULE") + "\">");
+ moduleInfo.append("<source-identifier>" + Configuration.getBuildTimeProperty("SOURCEID") + "</source-identifier>");
+ moduleInfo.append("<build-information>" + Configuration.getBuildTimeProperty("BUILDINFO") + "</build-information>");
+ moduleInfo.append("<version>" + Configuration.getBuildTimeProperty("VERSION") + "</version>");
+ moduleInfo.append("<date>" + Configuration.getBuildTimeProperty("DATE") + "</date>");
+ moduleInfo.append("<notes>" + Configuration.getBuildTimeProperty("NOTES") + "</notes>");
+ moduleInfo.append("<configuration>");
+ moduleInfo.append("<properties-file dir=\""+Configuration.propertiesDir()+"\">"+Configuration.propertiesFile()+"</properties-file>");
+ moduleInfo.append("<object-store-root>"+Configuration.objectStoreRoot()+"</object-store-root>");
+ moduleInfo.append("</configuration>");
+ moduleInfo.append("</module-info>");
+
+ return(moduleInfo.toString());
+ }
+
+}
+
+
+
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/Info.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.arjuna;
-
-import java.util.Hashtable;
-
-/**
- * Module specific implementation of the interface object.
- *
- * @author Richard Begg (richard_begg at hp.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since HPTS 3.0
- */
-
-public class Info
-{
- public String toString()
- {
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"@MODULE@\">");
- moduleInfo.append("<source-identifier>@SOURCEID@</source-identifier>");
- moduleInfo.append("<build-information>@BUILDINFO@</build-information>");
- moduleInfo.append("<version>@VERSION@</version>");
- moduleInfo.append("<date>@DATE@</date>");
- moduleInfo.append("<notes>@NOTES@</notes>");
- moduleInfo.append("<configuration>");
- moduleInfo.append("<properties-file dir=\""+com.arjuna.ats.arjuna.common.Configuration.propertiesDir()+"\">"+com.arjuna.ats.arjuna.common.Configuration.propertiesFile()+"</properties-file>");
- moduleInfo.append("<object-store-root>"+com.arjuna.ats.arjuna.common.Configuration.objectStoreRoot()+"</object-store-root>");
- moduleInfo.append("</configuration>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-
-}
-
-
-
Copied: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,217 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.arjuna.common;
+
+import com.arjuna.common.Info;
+import com.arjuna.common.util.propertyservice.PropertyManager;
+import com.arjuna.common.util.FileLocator;
+
+import java.io.File;
+import java.io.InputStream;
+
+import com.arjuna.ats.arjuna.logging.tsLogger;
+
+import java.io.IOException;
+import java.util.Properties;
+
+/*
+ * When we have an installation utility (e.g., InstallShield) we can have
+ * that compile the property file location in a separate file which this
+ * class then uses. So we ship a small source file in the distribution which
+ * then gets built on a per-installation basis. Could do that for other
+ * things too.
+ */
+
+/**
+ * This class contains various run-time configuration options. Default
+ * values are provided at compile-time, and may be operating system
+ * specific.
+ *
+ * @author Mark Little (mark at arjuna.com)
+ * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since 1.0.
+ */
+
+public class Configuration
+{
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+public static synchronized final String propertiesFile ()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+public static synchronized final void setPropertiesFile (String file)
+ {
+ _propFile = file;
+ }
+
+ /**
+ * @return the location of the module properties file to use.
+ *
+ * @message com.arjuna.ats.arjuna.common.Configuration_1 [com.arjuna.ats.arjuna.common.Configuration_1] Configuration.propertiesDir() - Cannot find properties file {0}
+ */
+
+public static synchronized final String propertiesDir ()
+ {
+ String propDir = ".";
+
+ try
+ {
+ propDir = FileLocator.locateFile( propertiesFile() );
+ }
+ catch (java.io.FileNotFoundException e)
+ {
+ if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
+ tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.common.Configuration_1",
+ new Object[]{propertiesFile()});
+ }
+ }
+
+ return propDir;
+ }
+
+ /**
+ * @return the version of arjuna.
+ */
+
+public static final String version ()
+ {
+ return getBuildTimeProperty("ARJUNA_VERSION");
+ }
+
+ /**
+ * Used to obtain the root of the object store.
+ *
+ * @return <code>path</code> to object store.
+ */
+
+public static synchronized final String objectStoreRoot ()
+ {
+ if (_objectStore == null)
+ {
+ /* Set default location under current directory */
+ _objectStore = System.getProperty("user.dir") + File.separator + "ObjectStore";
+
+ }
+
+ return _objectStore;
+ }
+
+ /**
+ * Used to set the root of the object store. Changes will
+ * take effect the next time the root is queried. Existing
+ * object store instances will not be effected.
+ */
+
+public static synchronized final void setObjectStoreRoot (String s)
+ {
+ _objectStore = s;
+ }
+
+ /**
+ * Whether to use the alternative abstract record ordering.
+ * At present this is not fully documented, so stay away!
+ *
+ * @return <code>true</code> if order abstract records on type first, or
+ * <code>false</code> if order on Uid first.
+ */
+
+public static synchronized final boolean useAlternativeOrdering ()
+ {
+ return _useAltOrder;
+ }
+
+ /**
+ * Set whether or not to use the alternative abstract record
+ * ordering. Takes effect the next time ordering is required.
+ */
+
+public static synchronized final void setAlternativeOrdering (boolean b)
+ {
+ _useAltOrder = b;
+ }
+
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/arjuna.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+private static String _objectStore = null;
+private static boolean _useAltOrder = false;
+private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE");
+
+
+}
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,173 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.arjuna.common;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import com.arjuna.common.util.FileLocator;
-
-import java.io.File;
-
-import com.arjuna.ats.arjuna.logging.tsLogger;
-
-import java.io.IOException;
-
-/*
- * When we have an installation utility (e.g., InstallShield) we can have
- * that compile the property file location in a separate file which this
- * class then uses. So we ship a small source file in the distribution which
- * then gets built on a per-installation basis. Could do that for other
- * things too.
- */
-
-/**
- * This class contains various run-time configuration options. Default
- * values are provided at compile-time, and may be operating system
- * specific.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since 1.0.
- */
-
-public class Configuration
-{
-
- /**
- * @return the name of the module properties file to use.
- */
-
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
- /**
- * @return the location of the module properties file to use.
- *
- * @message com.arjuna.ats.arjuna.common.Configuration_1 [com.arjuna.ats.arjuna.common.Configuration_1] Configuration.propertiesDir() - Cannot find properties file {0}
- */
-
-public static synchronized final String propertiesDir ()
- {
- String propDir = ".";
-
- try
- {
- propDir = FileLocator.locateFile( propertiesFile() );
- }
- catch (java.io.FileNotFoundException e)
- {
- if (tsLogger.arjLoggerI18N.isWarnEnabled()) {
- tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.common.Configuration_1",
- new Object[]{propertiesFile()});
- }
- }
-
- return propDir;
- }
-
- /**
- * @return the version of arjuna.
- */
-
-public static final String version ()
- {
- return "@ARJUNA_VERSION@";
- }
-
- /**
- * Used to obtain the root of the object store.
- *
- * @return <code>path</code> to object store.
- */
-
-public static synchronized final String objectStoreRoot ()
- {
- if (_objectStore == null)
- {
- /* Set default location under current directory */
- _objectStore = System.getProperty("user.dir") + File.separator + "ObjectStore";
-
- }
-
- return _objectStore;
- }
-
- /**
- * Used to set the root of the object store. Changes will
- * take effect the next time the root is queried. Existing
- * object store instances will not be effected.
- */
-
-public static synchronized final void setObjectStoreRoot (String s)
- {
- _objectStore = s;
- }
-
- /**
- * Whether to use the alternative abstract record ordering.
- * At present this is not fully documented, so stay away!
- *
- * @return <code>true</code> if order abstract records on type first, or
- * <code>false</code> if order on Uid first.
- */
-
-public static synchronized final boolean useAlternativeOrdering ()
- {
- return _useAltOrder;
- }
-
- /**
- * Set whether or not to use the alternative abstract record
- * ordering. Takes effect the next time ordering is required.
- */
-
-public static synchronized final void setAlternativeOrdering (boolean b)
- {
- _useAltOrder = b;
- }
-
-private static String _objectStore = null;
-private static boolean _useAltOrder = false;
-private static String _propFile = "@PROPERTIES_FILE@";
-
-
-}
Copied: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.java (from rev 6408, labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2001
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: RecoveryConfiguration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.arjuna.recovery;
+
+import com.arjuna.ats.arjuna.common.Configuration;
+
+/**
+ * This class contains various run-time configuration options. Default
+ * values are provided at compile-time, and may be operating system
+ * specific.
+ *
+ */
+public class RecoveryConfiguration
+{
+
+ /**
+ * @return the name of the RecoveryManager properties file to use.
+ * @since JTS 2.1.
+ */
+ public static synchronized final String recoveryManagerPropertiesFile()
+ {
+ return _rmPropertyFile;
+ }
+
+ /**
+ * Set the name of the RecoveryManager properties file.
+ * @since JTS 2.1.
+ */
+
+ public static synchronized final void setRecoveryManagerPropertiesFile (String file)
+ {
+ _rmPropertyFile = file;
+ }
+
+ private static String _rmPropertyFile = Configuration.getBuildTimeProperty("RECOVERY_PROPERTIES_FILE") ;
+
+ private RecoveryConfiguration()
+ {
+ // zero-ton class
+ }
+}
+
+
+
Deleted: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryConfiguration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: RecoveryConfiguration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.arjuna.recovery;
-
-/**
- * This class contains various run-time configuration options. Default
- * values are provided at compile-time, and may be operating system
- * specific.
- *
- */
-public class RecoveryConfiguration
-{
-
- /**
- * @return the name of the RecoveryManager properties file to use.
- * @since JTS 2.1.
- */
- public static synchronized final String recoveryManagerPropertiesFile()
- {
- return _rmPropertyFile;
- }
-
- /**
- * Set the name of the RecoveryManager properties file.
- * @since JTS 2.1.
- */
-
- public static synchronized final void setRecoveryManagerPropertiesFile (String file)
- {
- _rmPropertyFile = file;
- }
-
- private static String _rmPropertyFile = "@RECOVERY_PROPERTIES_FILE@" ;
-
- private RecoveryConfiguration()
- {
- // zero-ton class
- }
-}
-
-
-
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -43,9 +43,6 @@
<property name="com.arjuna.mwlabs.ts.tsmx.utilities.dest" location="${com.arjuna.mwlabs.ts.tsmx.destroot}/bin"/>
<property name="com.arjuna.mwlabs.ts.tsmx.etc" location="etc"/>
- <property name="com.arjuna.mwlabs.ts.tsmx.properties.src" location="${com.arjuna.mwlabs.ts.tsmx.src}/com/arjuna/ats/tsmx/common/Configuration.javatmpl"/>
- <property name="com.arjuna.mwlabs.ts.tsmx.properties.dest" location="${com.arjuna.mwlabs.ts.tsmx.src}/com/arjuna/ats/tsmx/common/Configuration.java"/>
-
<property name="com.arjuna.mw.ts.tsmx.tests.compile" value="no"/>
<property name="com.arjuna.mw.ts.tsmx.tests.install" value="no"/>
<property name="com.arjuna.mw.ts.tsmx.utilities.compile" value="yes"/>
@@ -123,20 +120,6 @@
<!-- Make the destination directory -->
<mkdir dir="${com.arjuna.mwlabs.ts.tsmx.dest}"/>
-
- <!-- Process the classes that use the property file -->
- <copy
- file="${com.arjuna.mwlabs.ts.tsmx.properties.src}"
- tofile="${com.arjuna.mwlabs.ts.tsmx.properties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="TSMX_VERSION" value="${com.arjuna.mw.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.arjuna.mwlabs.ts.tsmx.propertyfile}"/>
- <filter token="PROPERTIES_DIR" value="${com.arjuna.mw.propertydirectory}"/>
- </filterset>
- </copy>
-
</target>
<target name="com.arjuna.mw.ts.tsmx.build" depends="com.arjuna.mw.ts.tsmx.jar, com.arjuna.mwlabs.ts.tsmx.utilities.jar, com.arjuna.mwlabs.ts.tsmx.tests.jar"/>
@@ -161,6 +144,12 @@
</classpath>
</javac>
+ <!-- Process the properties -->
+ <property name="property.file" value="tsmx.properties"/>
+ <propertyfile file="${com.arjuna.mwlabs.ts.tsmx.dest}/${property.file}">
+ <entry key="TSMX_VERSION" value="${com.arjuna.mw.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.arjuna.mwlabs.ts.tsmx.propertyfile}"/>
+ </propertyfile>
</target>
<!-- Jar targets -->
Copied: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.ats.tsmx.common;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import com.arjuna.ats.tsmx.*;
+
+public class Configuration
+{
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+ public static synchronized final String propertiesFile()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+ public static synchronized final void setPropertiesFile(String file)
+ {
+ _propFile = file;
+ }
+
+ /**
+ * @return the version of tsmx.
+ */
+
+ public static final String version()
+ {
+ return getBuildTimeProperty("TSMX_VERSION") ;
+ }
+
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/tsmx.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+ private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE") ;
+}
Deleted: labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/classes/com/arjuna/ats/tsmx/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-package com.arjuna.ats.tsmx.common;
-
-import com.arjuna.ats.tsmx.*;
-
-public class Configuration
-{
-
- /**
- * @return the name of the module properties file to use.
- */
-
- public static synchronized final String propertiesFile()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
- public static synchronized final void setPropertiesFile(String file)
- {
- _propFile = file;
- }
-
- /**
- * @return the version of tsmx.
- */
-
- public static final String version()
- {
- return "@TSMX_VERSION@";
- }
-
- private static String _propFile = "@PROPERTIES_FILE@";
-}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -50,11 +50,6 @@
<property name="com.hp.mwlabs.ts.txoj.tests.destdir" location="${com.hp.mwlabs.ts.txoj.jar.dest}/tests/"/>
<property name="com.hp.mwlabs.ts.txoj.utilities.src" location="bin"/>
<property name="com.hp.mwlabs.ts.txoj.utilities.dest" location="${com.hp.mwlabs.ts.txoj.destroot}/bin"/>
- <!-- Files that need word substitutions -->
- <property name="com.hp.mwlabs.ts.txoj.info.src" location="${com.hp.mwlabs.ts.txoj.src}/com/arjuna/ats/txoj/Info.javatmpl"/>
- <property name="com.hp.mwlabs.ts.txoj.info.dest" location="${com.hp.mwlabs.ts.txoj.src}/com/arjuna/ats/txoj/Info.java"/>
- <property name="com.hp.mwlabs.ts.txoj.properties.src" location="${com.hp.mwlabs.ts.txoj.src}/com/arjuna/ats/txoj/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.ts.txoj.properties.dest" location="${com.hp.mwlabs.ts.txoj.src}/com/arjuna/ats/txoj/common/Configuration.java"/>
<property name="com.hp.mwlabs.ts.txoj.resourcebundle" value="txoj_msg_en_US.properties"/>
@@ -118,22 +113,6 @@
<equals arg1="${com.hp.mw.ts.txoj.utilities.install}" arg2="yes"/>
</condition>
- <!-- Process the info class -->
- <copy
- file="${com.hp.mwlabs.ts.txoj.info.src}"
- tofile="${com.hp.mwlabs.ts.txoj.info.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
- <filter token="SOURCEID" value="${com.hp.mw.sourceid}"/>
- <filter token="BUILDINFO" value="${com.hp.mw.builder}"/>
- <filter token="VERSION" value="${com.hp.mw.version}"/>
- <filter token="DATE" value="${com.hp.mw.date}"/>
- <filter token="NOTES" value="${com.hp.mw.notes}"/>
- </filterset>
- </copy>
-
<!-- Set the module property file details -->
<property name="com.hp.mwlabs.ts.txoj.propertyfile" value="${com.hp.mwlabs.ts.modulename}-properties.xml"/>
@@ -142,18 +121,6 @@
<echo message="Property file name : ${com.hp.mwlabs.ts.txoj.propertyfile}"/>
<echo message="Property directory : ${com.hp.mw.propertydirectory}"/>
- <!-- Process the class that uses the property file -->
- <copy
- file="${com.hp.mwlabs.ts.txoj.properties.src}"
- tofile="${com.hp.mwlabs.ts.txoj.properties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="TXOJ_VERSION" value="${com.hp.mw.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.txoj.propertyfile}"/>
- </filterset>
- </copy>
-
<!-- Make the destination directory -->
<mkdir dir="${com.hp.mwlabs.ts.txoj.dest}"/>
@@ -192,6 +159,18 @@
</classpath>
</javac>
+ <!-- Process the properties -->
+ <property name="property.file" value="txoj.properties"/>
+ <propertyfile file="${com.hp.mwlabs.ts.txoj.dest}/${property.file}">
+ <entry key="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
+ <entry key="SOURCEID" value="${com.hp.mw.sourceid}"/>
+ <entry key="BUILDINFO" value="${com.hp.mw.builder}"/>
+ <entry key="VERSION" value="${com.hp.mw.version}"/>
+ <entry key="DATE" value="${com.hp.mw.date}"/>
+ <entry key="NOTES" value="${com.hp.mw.notes}"/>
+ <entry key="TXOJ_VERSION" value="${com.hp.mw.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.txoj.propertyfile}"/>
+ </propertyfile>
</target>
<target name="com.hp.mwlabs.ts.txoj.tests.jar" depends="com.hp.mwlabs.ts.txoj.tests.compile" if="com.hp.mwlabs.ts.txoj.tests.compile">
@@ -339,8 +318,6 @@
<echo message="Cleaning module"/>
<delete dir="${com.hp.mwlabs.ts.txoj.destroot}"/>
<delete dir="${com.hp.mwlabs.ts.txoj.jar.dest}"/>
- <delete file="${com.hp.mwlabs.ts.txoj.info.dest}"/>
- <delete file="${com.hp.mwlabs.ts.txoj.properties.dest}"/>
</target>
Copied: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.java (from rev 6408, labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.txoj;
+
+import java.util.Hashtable;
+
+import com.arjuna.ats.txoj.common.Configuration;
+
+/**
+ * Module specific implementation of the interface object.
+ *
+ * @author Richard Begg (richard_begg at hp.com)
+ * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since HPTS 3.0
+ */
+public class Info
+{
+ public String toString()
+ {
+ StringBuffer moduleInfo = new StringBuffer();
+
+ moduleInfo.append("<module-info name=\"" + Configuration.getBuildTimeProperty("MODULE") + "\">");
+ moduleInfo.append("<source-identifier>" + Configuration.getBuildTimeProperty("SOURCEID") + "</source-identifier>");
+ moduleInfo.append("<build-information>" + Configuration.getBuildTimeProperty("BUILDINFO") + "</build-information>");
+ moduleInfo.append("<version>" + Configuration.getBuildTimeProperty("VERSION") + "</version>");
+ moduleInfo.append("<date>" + Configuration.getBuildTimeProperty("DATE") + "</date>");
+ moduleInfo.append("<notes>" + Configuration.getBuildTimeProperty("NOTES") + "</notes>");
+ moduleInfo.append("<configuration>");
+ moduleInfo.append("<lock-store-root>"+com.arjuna.ats.txoj.common.Configuration.lockStoreRoot()+"</lock-store-root>");
+ moduleInfo.append("</configuration>");
+ moduleInfo.append("</module-info>");
+
+ return(moduleInfo.toString());
+ }
+}
Deleted: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/Info.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.txoj;
-
-import java.util.Hashtable;
-
-/**
- * Module specific implementation of the interface object.
- *
- * @author Richard Begg (richard_begg at hp.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since HPTS 3.0
- */
-public class Info
-{
- public String toString()
- {
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"@MODULE@\">");
- moduleInfo.append("<source-identifier>@SOURCEID@</source-identifier>");
- moduleInfo.append("<build-information>@BUILDINFO@</build-information>");
- moduleInfo.append("<version>@VERSION@</version>");
- moduleInfo.append("<date>@DATE@</date>");
- moduleInfo.append("<notes>@NOTES@</notes>");
- moduleInfo.append("<configuration>");
- moduleInfo.append("<lock-store-root>"+com.arjuna.ats.txoj.common.Configuration.lockStoreRoot()+"</lock-store-root>");
- moduleInfo.append("</configuration>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-}
Copied: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,147 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.txoj.common;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+import java.io.File;
+import java.io.InputStream;
+
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Runtime configuration class for this module.
+ *
+ * @author Mark Little (mark at arjuna.com)
+ * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 1.0.
+ */
+
+public class Configuration
+{
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+public static synchronized final String propertiesFile ()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+public static synchronized final void setPropertiesFile (String file)
+ {
+ _propFile = file;
+ }
+
+ /**
+ * Used to get the root of the object store.
+ *
+ * @return <code>path</code> to lock store.
+ */
+
+public static synchronized final String lockStoreRoot ()
+ {
+ if (_lockStore == null)
+ /* Set default location under current directory */
+ _lockStore = System.getProperty("user.dir") + File.separator + "LockStore";
+
+System.err.println("Returning lockstore location of: " + _lockStore);
+ return _lockStore;
+ }
+
+ /**
+ * Used to set the root of the lock store. Changes will
+ * take effect the next time the root is queried. Existing
+ * lock store instances will not be effected.
+ */
+
+public static synchronized final void setLockStoreRoot (String s)
+ {
+ _lockStore = s;
+ }
+
+public static final String version ()
+ {
+ return getBuildTimeProperty("TXOJ_VERSION") ;
+ }
+
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/txoj.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+private static String _lockStore = null;
+private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE") ;
+
+}
+
Deleted: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.txoj.common;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-import java.io.File;
-
-import java.io.IOException;
-
-/**
- * Runtime configuration class for this module.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class Configuration
-{
-
- /**
- * @return the name of the module properties file to use.
- */
-
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
- /**
- * Used to get the root of the object store.
- *
- * @return <code>path</code> to lock store.
- */
-
-public static synchronized final String lockStoreRoot ()
- {
- if (_lockStore == null)
- /* Set default location under current directory */
- _lockStore = System.getProperty("user.dir") + File.separator + "LockStore";
-
-System.err.println("Returning lockstore location of: " + _lockStore);
- return _lockStore;
- }
-
- /**
- * Used to set the root of the lock store. Changes will
- * take effect the next time the root is queried. Existing
- * lock store instances will not be effected.
- */
-
-public static synchronized final void setLockStoreRoot (String s)
- {
- _lockStore = s;
- }
-
-public static final String version ()
- {
- return "@TXOJ_VERSION@";
- }
-
-private static String _lockStore = null;
-private static String _propFile = "@PROPERTIES_FILE@";
-
-}
-
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -57,13 +57,6 @@
<property name="com.hp.mwlabs.ts.jdbc.tests.destdir" location="${com.hp.mwlabs.ts.jdbc.jar.dest}/tests/"/>
<!-- Relative path for files to exclude in main compile -->
<property name="com.hp.mwlabs.ts.jdbc.compile.excludes" value="**/oracle_8*.java, **/oracle_9*.java, **/sequelink*.java, **/cloudscape*.java"/>
- <!-- Files that need word substitutions -->
- <property name="com.hp.mwlabs.ts.jdbc.properties.src" location="${com.hp.mwlabs.ts.jdbc.src}/com/arjuna/ats/jdbc/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.ts.jdbc.properties.dest"
- location="${com.hp.mwlabs.ts.jdbc.src}/com/arjuna/ats/jdbc/common/Configuration.java"/>
- <property name="com.hp.mwlabs.ts.jdbc.info.src" location="${com.hp.mwlabs.ts.jdbc.src}/com/arjuna/ats/jdbc/Info.javatmpl"/>
- <property name="com.hp.mwlabs.ts.jdbc.info.dest"
- location="${com.hp.mwlabs.ts.jdbc.src}/com/arjuna/ats/jdbc/Info.java"/>
<property name="com.hp.mwlabs.ts.jdbc.resourcebundle"
value="jdbc_msg_en_US.properties"/>
@@ -137,77 +130,26 @@
<!--Set the properties we need to preprocess files.-->
- <condition property="com.hp.mwlabs.ts.jdbc.sequelink51.ifdef" value=" ">
+ <condition property="sequelink51" value=", Sequelink_5_1">
<equals arg1="${com.hp.mw.ts.jdbc.sequelink51.compile}" arg2="yes"/>
</condition>
- <property name="com.hp.mwlabs.ts.jdbc.sequelink51.ifdef" value="/*"/>
+ <property name="sequelink51" value=""/>
- <condition property="com.hp.mwlabs.ts.jdbc.sequelink51.endif" value=" ">
- <equals arg1="${com.hp.mw.ts.jdbc.sequelink51.compile}" arg2="yes"/>
- </condition>
- <property name="com.hp.mwlabs.ts.jdbc.sequelink51.endif" value="*/"/>
-
- <condition property="com.hp.mwlabs.ts.jdbc.oracle81.ifdef" value=" ">
+ <condition property="oracle81" value=", Oracle_8_1_6">
<equals arg1="${com.hp.mw.ts.jdbc.oracle81.compile}" arg2="yes"/>
</condition>
- <property name="com.hp.mwlabs.ts.jdbc.oracle81.ifdef" value="/*"/>
+ <property name="oracle81" value=""/>
- <condition property="com.hp.mwlabs.ts.jdbc.oracle81.endif" value=" ">
- <equals arg1="${com.hp.mw.ts.jdbc.oracle81.compile}" arg2="yes"/>
- </condition>
- <property name="com.hp.mwlabs.ts.jdbc.oracle81.endif"
- value="*/"/>
-
- <condition property="com.hp.mwlabs.ts.jdbc.oracle90.ifdef" value=" ">
+ <condition property="oracle90" value=", Oracle_9_0">
<equals arg1="${com.hp.mw.ts.jdbc.oracle90.compile}" arg2="yes"/>
</condition>
- <property name="com.hp.mwlabs.ts.jdbc.oracle90.ifdef" value="/*"/>
+ <property name="oracle90" value=""/>
- <condition property="com.hp.mwlabs.ts.jdbc.oracle90.endif" value=" ">
- <equals arg1="${com.hp.mw.ts.jdbc.oracle90.compile}" arg2="yes"/>
- </condition>
- <property name="com.hp.mwlabs.ts.jdbc.oracle90.endif" value="*/"/>
-
- <condition property="com.hp.mwlabs.ts.jdbc.cloudscape36.ifdef" value=" ">
+ <condition property="cloudscape36" value=", Cloudscape_3_6">
<equals arg1="${com.hp.mw.ts.jdbc.cloudscape36.compile}" arg2="yes"/>
</condition>
- <property name="com.hp.mwlabs.ts.jdbc.cloudscape36.ifdef" value="/*"/>
+ <property name="cloudscape36" value=""/>
- <condition property="com.hp.mwlabs.ts.jdbc.cloudscape36.endif" value=" ">
- <equals arg1="${com.hp.mw.ts.jdbc.cloudscape36.compile}" arg2="yes"/>
- </condition>
- <property name="com.hp.mwlabs.ts.jdbc.cloudscape36.endif" value="*/"/>
-
- <!-- Process the info class -->
- <copy
- file="${com.hp.mwlabs.ts.jdbc.info.src}"
- tofile="${com.hp.mwlabs.ts.jdbc.info.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="IFDEF_BUILD_SEQUELINK_5_1" value="${com.hp.mwlabs.ts.jdbc.sequelink51.ifdef}"/>
- <filter
- token="ENDIF_BUILD_SEQUELINK_5_1"
- value="${com.hp.mwlabs.ts.jdbc.sequelink51.endif}"/>
- <filter token="IFDEF_BUILD_CLOUDSCAPE_3_6" value="${com.hp.mwlabs.ts.jdbc.cloudscape36.ifdef}"/>
- <filter
- token="ENDIF_BUILD_CLOUDSCAPE_3_6"
- value="${com.hp.mwlabs.ts.jdbc.cloudscape36.endif}"/>
- <filter token="IFDEF_BUILD_ORACLE_8_1_6" value="${com.hp.mwlabs.ts.jdbc.oracle81.ifdef}"/>
- <filter
- token="ENDIF_BUILD_ORACLE_8_1_6"
- value="${com.hp.mwlabs.ts.jdbc.oracle81.endif}"/>
- <filter token="IFDEF_BUILD_ORACLE_9_0" value="${com.hp.mwlabs.ts.jdbc.oracle90.ifdef}"/>
- <filter token="ENDIF_BUILD_ORACLE_9_0" value="${com.hp.mwlabs.ts.jdbc.oracle90.endif}"/>
- <filter token="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
- <filter token="SOURCEID" value="${com.hp.mw.sourceid}"/>
- <filter token="BUILDINFO" value="${com.hp.mw.builder}"/>
- <filter token="VERSION" value="${com.hp.mw.version}"/>
- <filter token="DATE" value="${com.hp.mw.date}"/>
- <filter token="NOTES" value="${com.hp.mw.notes}"/>
- </filterset>
- </copy>
-
<!-- Set the module property file details -->
<property name="com.hp.mwlabs.ts.jdbc.propertyfile" value="${com.hp.mwlabs.ts.modulename}-properties.xml"/>
@@ -217,18 +159,6 @@
<echo message="Property file name : ${com.hp.mwlabs.ts.jdbc.propertyfile}"/>
<echo message="Property directory : ${com.hp.mw.propertydirectory}"/>
- <!-- Process the class that uses the property file -->
- <copy
- file="${com.hp.mwlabs.ts.jdbc.properties.src}"
- tofile="${com.hp.mwlabs.ts.jdbc.properties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="JDBC_VERSION" value="${com.hp.mw.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.jdbc.propertyfile}"/>
- </filterset>
- </copy>
-
<!-- Make the destination directory -->
<mkdir dir="${com.hp.mwlabs.ts.jdbc.dest}"/>
@@ -269,6 +199,19 @@
</classpath>
</javac>
+ <!-- Process the properties -->
+ <property name="property.file" value="jdbc.properties"/>
+ <propertyfile file="${com.hp.mwlabs.ts.jdbc.dest}/${property.file}">
+ <entry key="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
+ <entry key="SOURCEID" value="${com.hp.mw.sourceid}"/>
+ <entry key="BUILDINFO" value="${com.hp.mw.builder}"/>
+ <entry key="VERSION" value="${com.hp.mw.version}"/>
+ <entry key="DATE" value="${com.hp.mw.date}"/>
+ <entry key="NOTES" value="${com.hp.mw.notes}"/>
+ <entry key="SUPPORTED_VERSIONS" value="JNDI${cloudscape36}${oracle81}${oracle90}${sequelink51}"/>
+ <entry key="JDBC_VERSION" value="${com.hp.mw.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.jdbc.propertyfile}"/>
+ </propertyfile>
</target>
<!-- Non-specific objectstore files -->
@@ -467,8 +410,6 @@
<delete dir="${com.hp.mwlabs.ts.jdbc.destroot}"/>
<delete dir="${com.hp.mwlabs.ts.jdbc.jar.dest}"/>
<delete dir="${com.hp.mwlabs.ts.jdbc.tests.dest}"/>
- <delete file="${com.hp.mwlabs.ts.jdbc.info.dest}"/>
- <delete file="${com.hp.mwlabs.ts.jdbc.properties.dest}"/>
</target>
Copied: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2002,
+ *
+ * Hewlett-Packard Arjuna Labs,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.jdbc;
+
+import com.arjuna.ats.jdbc.common.Configuration;
+
+/**
+ * Module specific implementation of the information object.
+ *
+ * @author Mark Little (mark_little at hp.com)
+ * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 2.0.
+ */
+
+public class Info
+{
+
+ public String toString()
+ {
+ StringBuffer moduleInfo = new StringBuffer();
+
+ moduleInfo.append("<module-info name=\"" + Configuration.getBuildTimeProperty("MODULE") + "\">");
+ moduleInfo.append("<source-identifier>" + Configuration.getBuildTimeProperty("SOURCEID") + "</source-identifier>");
+ moduleInfo.append("<build-information>" + Configuration.getBuildTimeProperty("BUILDINFO") + "</build-information>");
+ moduleInfo.append("<version>" + Configuration.getBuildTimeProperty("VERSION") + "</version>");
+ moduleInfo.append("<date>" + Configuration.getBuildTimeProperty("DATE") + "</date>");
+ moduleInfo.append("<notes>" + Configuration.getBuildTimeProperty("NOTES") + "</notes>");
+ moduleInfo.append("<configuration>");
+ moduleInfo.append("<supported-versions>" + Configuration.getBuildTimeProperty("SUPPORTED_VERSIONS") + "</supported-versions>");
+ moduleInfo.append("</configuration>");
+ moduleInfo.append("</module-info>");
+
+ return(moduleInfo.toString());
+ }
+
+}
+
Deleted: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/Info.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2002,
- *
- * Hewlett-Packard Arjuna Labs,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jdbc;
-
-/**
- * Module specific implementation of the information object.
- *
- * @author Mark Little (mark_little at hp.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 2.0.
- */
-
-public class Info
-{
-
- public String toString()
- {
- String supportedVersions = "JNDI";
-
- at IFDEF_BUILD_CLOUDSCAPE_3_6@
- supportedVersions += ", Cloudscape_3_6";
- at ENDIF_BUILD_CLOUDSCAPE_3_6@
-
- at IFDEF_BUILD_ORACLE_8_1_6@
- supportedVersions += ", Oracle_8_1_6";
- at ENDIF_BUILD_ORACLE_8_1_6@
-
- at IFDEF_BUILD_SEQUELINK_5_1@
- supportedVersions += ", Sequelink_5_1";
- at ENDIF_BUILD_SEQUELINK_5_1@
-
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"@MODULE@\">");
- moduleInfo.append("<source-identifier>@SOURCEID@</source-identifier>");
- moduleInfo.append("<build-information>@BUILDINFO@</build-information>");
- moduleInfo.append("<version>@VERSION@</version>");
- moduleInfo.append("<date>@DATE@</date>");
- moduleInfo.append("<notes>@NOTES@</notes>");
- moduleInfo.append("<configuration>");
- moduleInfo.append("<supported-versions>\""+supportedVersions+"\"/>");
- moduleInfo.append("</configuration>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-
-}
-
Copied: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.jdbc.common;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+import java.io.File;
+import java.io.InputStream;
+
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Runtime configuration class for this module.
+ *
+ * @author Mark Little (mark at arjuna.com)
+ * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 1.0.
+ */
+
+public class Configuration
+{
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+public static synchronized final String propertiesFile ()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+public static synchronized final void setPropertiesFile (String file)
+ {
+ _propFile = file;
+ }
+
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/jdbc.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE") ;
+
+}
+
Deleted: labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/classes/com/arjuna/ats/jdbc/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jdbc.common;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-import java.io.File;
-
-import java.io.IOException;
-
-/**
- * Runtime configuration class for this module.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class Configuration
-{
-
- /**
- * @return the name of the module properties file to use.
- */
-
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
-private static String _propFile = "@PROPERTIES_FILE@";
-
-}
-
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -54,9 +54,6 @@
<!-- Files that need word substitutions -->
- <property name="com.hp.mwlabs.ts.jta.properties.src" value="${com.hp.mwlabs.ts.jta.src}/com/arjuna/ats/jta/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.ts.jta.properties.dest"
- value="${com.hp.mwlabs.ts.jta.src}/com/arjuna/ats/jta/common/Configuration.java"/>
<property name="com.hp.mwlabs.ts.jta.resourcebundle"
value="jta_msg_en_US.properties"/>
@@ -133,18 +130,6 @@
<echo message="Property file name : ${com.hp.mwlabs.ts.jta.propertyfile}"/>
<echo message="Property directory : ${com.hp.mw.propertydirectory}"/>
- <!-- Process the class that uses the property file -->
- <copy
- file="${com.hp.mwlabs.ts.jta.properties.src}"
- tofile="${com.hp.mwlabs.ts.jta.properties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="JTA_VERSION" value="${com.hp.mw.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.jta.propertyfile}"/>
- </filterset>
- </copy>
-
<!-- Process the property file -->
<copy
file="${com.hp.mwlabs.ts.jta.etc}/default-${com.hp.mwlabs.ts.jta.propertyfile.tmpl}"
@@ -196,6 +181,12 @@
</classpath>
</javac>
+ <!-- Process the properties -->
+ <property name="property.file" value="jta.properties"/>
+ <propertyfile file="${com.hp.mwlabs.ts.jta.dest}/${property.file}">
+ <entry key="JTA_VERSION" value="${com.hp.mw.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.jta.propertyfile}"/>
+ </propertyfile>
</target>
<target name="com.hp.mwlabs.ts.jta.tests.jar" depends="com.hp.mwlabs.ts.jta.tests.compile" if="com.hp.mwlabs.ts.jta.tests.compile">
@@ -297,8 +288,6 @@
<delete dir="${com.hp.mwlabs.ts.jta.dest}"/>
<delete dir="${com.hp.mwlabs.ts.jta.jar.dest}"/>
<delete dir="${com.hp.mwlabs.ts.jta.tests.dest}"/>
- <delete file="${com.hp.mwlabs.ts.jta.info.dest}"/>
- <delete file="${com.hp.mwlabs.ts.jta.properties.dest}"/>
<delete file="${com.hp.mwlabs.ts.jta.propertyfile.src}"/>
</target>
Copied: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.jta.common;
+
+import com.arjuna.common.util.propertyservice.PropertyManager;
+
+import java.io.File;
+import java.io.InputStream;
+
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * Runtime configuration class for this module.
+ *
+ * @author Mark Little (mark at arjuna.com)
+ * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 1.0.
+ */
+
+public class Configuration
+{
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+public static synchronized final String propertiesFile ()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+public static synchronized final void setPropertiesFile (String file)
+ {
+ _propFile = file;
+ }
+
+ public static synchronized final Boolean getXATransactionTimeoutEnabled()
+ {
+ return _xaTransactionTimeoutEnabled ;
+ }
+
+ public static synchronized final void setXATransactionTimeoutEnabled(final Boolean xaTransactionTimeoutEnabled)
+ {
+ _xaTransactionTimeoutEnabled = xaTransactionTimeoutEnabled ;
+ }
+
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/jta.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+private static String _lockStore = null;
+private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE") ;
+private static Boolean _xaTransactionTimeoutEnabled ;
+
+}
+
Deleted: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jta.common;
-
-import com.arjuna.common.util.propertyservice.PropertyManager;
-
-import java.io.File;
-
-import java.io.IOException;
-
-/**
- * Runtime configuration class for this module.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class Configuration
-{
-
- /**
- * @return the name of the module properties file to use.
- */
-
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
- public static synchronized final Boolean getXATransactionTimeoutEnabled()
- {
- return _xaTransactionTimeoutEnabled ;
- }
-
- public static synchronized final void setXATransactionTimeoutEnabled(final Boolean xaTransactionTimeoutEnabled)
- {
- _xaTransactionTimeoutEnabled = xaTransactionTimeoutEnabled ;
- }
-
-private static String _lockStore = null;
-private static String _propFile = "@PROPERTIES_FILE@";
-private static Boolean _xaTransactionTimeoutEnabled ;
-
-}
-
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -58,11 +58,6 @@
<property name="com.hp.mwlabs.ts.jts.services.dest" value="${com.hp.mwlabs.ts.jts.buildroot}/services/"/>
<property name="com.hp.mwlabs.ts.jts.services.destdir" value="${com.hp.mwlabs.ts.jts.jar.dest}/services/"/>
- <!-- Files that need word substitutions -->
- <property name="com.hp.mwlabs.ts.jts.info.src" location="${com.hp.mwlabs.ts.jts.src}/com/arjuna/ats/jts/Info.javatmpl"/>
- <property name="com.hp.mwlabs.ts.jts.info.dest" location="${com.hp.mwlabs.ts.jts.src}/com/arjuna/ats/jts/Info.java"/>
- <property name="com.hp.mwlabs.ts.jts.properties.src" location="${com.hp.mwlabs.ts.jts.src}/com/arjuna/ats/jts/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.ts.jts.properties.dest" location="${com.hp.mwlabs.ts.jts.src}/com/arjuna/ats/jts/common/Configuration.java"/>
<property name="com.hp.mwlabs.ts.jts.resourcebundle"
value="jts_msg_en_US.properties"/>
@@ -122,21 +117,6 @@
<equals arg1="${com.hp.mw.ts.jts.services.install}" arg2="yes"/>
</condition>
- <!-- Process the info class -->
- <copy
- file="${com.hp.mwlabs.ts.jts.info.src}"
- tofile="${com.hp.mwlabs.ts.jts.info.dest}"
- >
- <filterset>
- <filter token="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
- <filter token="SOURCEID" value="${com.hp.mw.sourceid}"/>
- <filter token="BUILDINFO" value="${com.hp.mw.builder}"/>
- <filter token="VERSION" value="${com.hp.mw.version}"/>
- <filter token="DATE" value="${com.hp.mw.date}"/>
- <filter token="NOTES" value="${com.hp.mw.notes}"/>
- </filterset>
- </copy>
-
<!-- Set the module property file details -->
<property name="com.hp.mwlabs.ts.jts.propertyfile" value="${com.hp.mwlabs.ts.modulename}-properties.xml"/>
<property name="com.hp.mwlabs.ts.jts.recoverymanager.propertyfile" value="RecoveryManager-properties.xml"/>
@@ -149,18 +129,6 @@
<property name="com.hp.mw.idldirectory" location="${com.hp.mwlabs.installationdirectory}/idl"/>
<echo message="IDL directory : ${com.hp.mw.idldirectory}"/>
- <!-- Process the class that uses the property file -->
- <copy
- file="${com.hp.mwlabs.ts.jts.properties.src}"
- tofile="${com.hp.mwlabs.ts.jts.properties.dest}"
- >
- <filterset>
- <filter token="JTS_VERSION" value="${com.hp.mw.ts.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.jts.propertyfile}"/>
- <filter token="PROPERTIES_DIR" value="${com.hp.mw.propertydirectory}"/>
- </filterset>
- </copy>
-
<!-- Make the destination directory -->
<mkdir dir="${com.hp.mwlabs.ts.jts.dest}"/>
@@ -236,7 +204,19 @@
<path path="${com.hp.mwlabs.ts.jts.src}"/>
</classpath>
</javac>
-
+
+ <!-- Process the properties -->
+ <property name="property.file" value="jts.properties"/>
+ <propertyfile file="${com.hp.mwlabs.ts.jts.dest}/${property.file}">
+ <entry key="MODULE" value="${com.hp.mwlabs.ts.modulename}"/>
+ <entry key="SOURCEID" value="${com.hp.mw.sourceid}"/>
+ <entry key="BUILDINFO" value="${com.hp.mw.builder}"/>
+ <entry key="VERSION" value="${com.hp.mw.version}"/>
+ <entry key="DATE" value="${com.hp.mw.date}"/>
+ <entry key="NOTES" value="${com.hp.mw.notes}"/>
+ <entry key="JTS_VERSION" value="${com.hp.mw.ts.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.hp.mwlabs.ts.jts.propertyfile}"/>
+ </propertyfile>
</target>
<target name="com.hp.mwlabs.ts.jts.services.install" depends="com.hp.mwlabs.ts.jts.services.jar" if="com.hp.mwlabs.ts.jts.services.install">
@@ -440,9 +420,6 @@
<echo message="Cleaning module"/>
<delete dir="${com.hp.mwlabs.ts.jts.dest}"/>
<delete dir="${com.hp.mwlabs.ts.jts.jar.dest}"/>
- <delete file="${com.hp.mwlabs.ts.jts.info.dest}"/>
- <delete file="${com.hp.mwlabs.ts.jts.properties.dest}"/>
-
</target>
<target name="com.hp.mwlabs.ts.jts.tests.clean">
Copied: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.jts;
+
+import java.util.Hashtable;
+
+import com.arjuna.ats.jts.common.Configuration;
+
+/**
+ * Module specific implementation of the information object.
+ *
+ * @author Mark Little (mark at arjuna.com)
+ * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 2.0.
+ */
+
+public class Info
+{
+ public String toString()
+ {
+ StringBuffer moduleInfo = new StringBuffer();
+
+ moduleInfo.append("<module-info name=\"" + Configuration.getBuildTimeProperty("MODULE") + "\">");
+ moduleInfo.append("<source-identifier>" + Configuration.getBuildTimeProperty("SOURCEID") + "</source-identifier>");
+ moduleInfo.append("<build-information>" + Configuration.getBuildTimeProperty("BUILDINFO") + "</build-information>");
+ moduleInfo.append("<version>" + Configuration.getBuildTimeProperty("VERSION") + "</version>");
+ moduleInfo.append("<date>" + Configuration.getBuildTimeProperty("DATE") + "</date>");
+ moduleInfo.append("<notes>" + Configuration.getBuildTimeProperty("NOTES") + "</notes>");
+ moduleInfo.append("</module-info>");
+
+ return(moduleInfo.toString());
+ }
+}
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/Info.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jts;
-
-import java.util.Hashtable;
-
-/**
- * Module specific implementation of the information object.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 2.0.
- */
-
-public class Info
-{
- public String toString()
- {
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"@MODULE@\">");
- moduleInfo.append("<source-identifier>@SOURCEID@</source-identifier>");
- moduleInfo.append("<build-information>@BUILDINFO@</build-information>");
- moduleInfo.append("<version>@VERSION@</version>");
- moduleInfo.append("<date>@DATE@</date>");
- moduleInfo.append("<notes>@NOTES@</notes>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-}
Copied: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2001, 2002,
+ *
+ * Hewlett-Packard Arjuna Labs,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.ats.jts.common;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Build-time configuration information for the module.
+ *
+ * @author Mark Little (mark_little at hp.com)
+ * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 1.0.
+ */
+
+public class Configuration
+{
+
+ /**
+ * @return the version of the module.
+ */
+
+public static final String version ()
+ {
+ return getBuildTimeProperty("JTS_VERSION") ;
+ }
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+public static synchronized final String propertiesFile ()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+public static synchronized final void setPropertiesFile (String file)
+ {
+ _propFile = file;
+ }
+
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/jts.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE") ;
+
+}
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2001, 2002,
- *
- * Hewlett-Packard Arjuna Labs,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.jts.common;
-
-/**
- * Build-time configuration information for the module.
- *
- * @author Mark Little (mark_little at hp.com)
- * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class Configuration
-{
-
- /**
- * @return the version of the module.
- */
-
-public static final String version ()
- {
- return "@JTS_VERSION@";
- }
-
- /**
- * @return the name of the module properties file to use.
- */
-
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
-private static String _propFile = "@PROPERTIES_FILE@";
-
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -46,8 +46,6 @@
<property name="com.hp.mwlabs.orbportability.buildroot" value="build"/>
<property name="com.hp.mwlabs.orbportability.builddir" location="${com.hp.mwlabs.orbportability.buildroot}/classes/"/>
<property name="com.hp.mwlabs.orbportability.destdir" value="lib"/>
- <property name="com.hp.mwlabs.orbportability.properties.src" value="${com.hp.mwlabs.orbportability.src}/com/arjuna/orbportability/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.orbportability.properties.dest" value="${com.hp.mwlabs.orbportability.src}/com/arjuna/orbportability/common/Configuration.java"/>
<property name="com.hp.mwlabs.orbportability.tests.src" value="tests/classes/"/>
<property name="com.hp.mwlabs.orbportability.tests.build" value="${com.hp.mwlabs.orbportability.buildroot}/tests/"/>
<property name="com.hp.mwlabs.orbportability.tests.destdir" value="${com.hp.mwlabs.orbportability.destdir}/tests/"/>
@@ -107,21 +105,6 @@
<mkdir dir="${com.hp.mwlabs.orbportability.builddir}"/>
<mkdir dir="${com.hp.mwlabs.orbportability.destdir}"/>
- <copy
- file="${com.hp.mwlabs.orbportability.src}/com/arjuna/orbportability/Info.javatmpl"
- tofile="${com.hp.mwlabs.orbportability.src}/com/arjuna/orbportability/Info.java"
- overwrite="yes"
- >
- <filterset>
- <filter token="MODULE" value="${com.hp.mwlabs.modulename}"/>
- <filter token="SOURCEID" value="${com.hp.mw.sourceid}"/>
- <filter token="BUILDINFO" value="${com.hp.mw.builder}"/>
- <filter token="VERSION" value="${com.hp.mw.version}"/>
- <filter token="DATE" value="${com.hp.mw.date}"/>
- <filter token="NOTES" value="${com.hp.mw.notes}"/>
- </filterset>
- </copy>
-
<!-- Set the module property file details -->
<property name="com.hp.mwlabs.orbportability.propertyfile" value="${com.hp.mwlabs.modulename}-properties.xml"/>
<property name="com.hp.mw.orbportability.configurationfile" value="defaultorb-configuration.xml"/>
@@ -129,20 +112,6 @@
<echo message="Property directory : ${com.hp.mw.propertydirectory}"/>
<echo message="Property file name : ${com.hp.mwlabs.orbportability.propertyfile}"/>
- <!-- Process the class that uses the property file -->
- <copy
- file="${com.hp.mwlabs.orbportability.properties.src}"
- tofile="${com.hp.mwlabs.orbportability.properties.dest}"
- overwrite="yes"
- >
- <filterset>
- <filter token="ORBPORTABILITY_VERSION" value="${com.hp.mw.version}"/>
- <filter token="PROPERTIES_FILE" value="${com.hp.mwlabs.orbportability.propertyfile}"/>
- <filter token="PROPERTIES_DIR" value="${com.hp.mw.propertydirectory}"/>
- <filter token="ORB_CONFIGURATION" value="${com.hp.mw.orbportability.configurationfile}"/>
- </filterset>
- </copy>
-
</target>
<!-- If this build is part of a product build set the property files to the product property file -->
@@ -200,7 +169,22 @@
</classpath>
</javac>
+
+ <!-- Process the properties -->
+ <property name="property.file" value="orbportability.properties"/>
+ <propertyfile file="${com.hp.mwlabs.orbportability.builddir}/${property.file}">
+ <entry key="MODULE" value="${com.hp.mwlabs.modulename}"/>
+ <entry key="SOURCEID" value="${com.hp.mw.sourceid}"/>
+ <entry key="BUILDINFO" value="${com.hp.mw.builder}"/>
+ <entry key="VERSION" value="${com.hp.mw.version}"/>
+ <entry key="DATE" value="${com.hp.mw.date}"/>
+ <entry key="NOTES" value="${com.hp.mw.notes}"/>
+ <entry key="ORBPORTABILITY_VERSION" value="${com.hp.mw.version}"/>
+ <entry key="PROPERTIES_FILE" value="${com.hp.mwlabs.orbportability.propertyfile}"/>
+ <entry key="ORB_CONFIGURATION" value="${com.hp.mw.orbportability.configurationfile}"/>
+ </propertyfile>
+
</target>
<target name="com.hp.mw.orbportability.install" depends="com.hp.mw.orbportability.build,com.hp.mw.orbportability.tests.install">
@@ -244,8 +228,6 @@
<delete dir="${com.hp.mwlabs.orbportability.buildroot}"/>
<delete dir="${com.hp.mwlabs.orbportability.destdir}"/>
<delete dir="${com.hp.mwlabs.orbportability.tests.build}"/>
- <delete file="${com.hp.mwlabs.orbportability.src}/com/arjuna/orbportability/Info.java"/>
- <delete file="${com.hp.mwlabs.orbportability.properties.dest}"/>
</target>
Copied: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.orbportability;
+
+import com.arjuna.orbportability.common.Configuration;
+import com.arjuna.orbportability.Services;
+
+import java.io.*;
+import java.util.Hashtable;
+
+/**
+ * Module specific implementation of the interface object.
+ *
+ * @author Richard Begg (richard_begg at hp.com)
+ * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since HPTS 3.0
+ */
+
+public class Info
+{
+ public String toString()
+ {
+ StringBuffer moduleInfo = new StringBuffer();
+
+ moduleInfo.append("<module-info name=\"" + Configuration.getBuildTimeProperty("MODULE") + "\">");
+ moduleInfo.append("<source-identifier>" + Configuration.getBuildTimeProperty("SOURCEID") + "</source-identifier>");
+ moduleInfo.append("<build-information>" + Configuration.getBuildTimeProperty("BUILDINFO") + "</build-information>");
+ moduleInfo.append("<version>" + Configuration.getBuildTimeProperty("VERSION") + "</version>");
+ moduleInfo.append("<date>" + Configuration.getBuildTimeProperty("DATE") + "</date>");
+ moduleInfo.append("<notes>" + Configuration.getBuildTimeProperty("NOTES") + "</notes>");
+ moduleInfo.append("<configuration>");
+ moduleInfo.append("<config-file>"+Configuration.configFile()+"</config-file>");
+ moduleInfo.append("<config-file-root>"+Configuration.configFileRoot()+"</config-file-root>");
+ moduleInfo.append("<properties-file dir=\""+Configuration.propertiesDir()+"\">"+Configuration.propertiesFile()+"</properties-file>");
+ moduleInfo.append("<bind-default>"+Services.bindString(Configuration.bindDefault())+"</bind-default>");
+ moduleInfo.append("<orb-info>"+com.arjuna.orbportability.ORBInfo.getInfo()+"</orb-info>");
+ moduleInfo.append("</configuration>");
+ moduleInfo.append("</module-info>");
+
+ return(moduleInfo.toString());
+ }
+}
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/Info.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability;
-
-import com.arjuna.orbportability.common.Configuration;
-import com.arjuna.orbportability.Services;
-
-import java.io.*;
-import java.util.Hashtable;
-
-/**
- * Module specific implementation of the interface object.
- *
- * @author Richard Begg (richard_begg at hp.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since HPTS 3.0
- */
-
-public class Info
-{
- public String toString()
- {
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"@MODULE@\">");
- moduleInfo.append("<source-identifier>@SOURCEID@</source-identifier>");
- moduleInfo.append("<build-information>@BUILDINFO@</build-information>");
- moduleInfo.append("<version>@VERSION@</version>");
- moduleInfo.append("<date>@DATE@</date>");
- moduleInfo.append("<notes>@NOTES@</notes>");
- moduleInfo.append("<configuration>");
- moduleInfo.append("<config-file>"+Configuration.configFile()+"</config-file>");
- moduleInfo.append("<config-file-root>"+Configuration.configFileRoot()+"</config-file-root>");
- moduleInfo.append("<properties-file dir=\""+Configuration.propertiesDir()+"\">"+Configuration.propertiesFile()+"</properties-file>");
- moduleInfo.append("<bind-default>"+Services.bindString(Configuration.bindDefault())+"</bind-default>");
- moduleInfo.append("<orb-info>"+com.arjuna.orbportability.ORBInfo.getInfo()+"</orb-info>");
- moduleInfo.append("</configuration>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-}
Copied: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.java (from rev 6408, labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.javatmpl)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,314 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 1998, 1999, 2000, 2001,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.orbportability.common;
+
+import com.arjuna.orbportability.Services;
+
+import com.arjuna.common.util.logging.*;
+import com.arjuna.common.util.FileLocator;
+
+import com.arjuna.orbportability.logging.*;
+
+import java.io.File;
+
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Module specific configuration object.
+ *
+ * @author Mark Little (mark at arjuna.com)
+ * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since JTS 1.0.
+ */
+
+public class Configuration
+{
+
+ /**
+ * @return the name of the default orb configuration file.
+ */
+public static synchronized final String defaultORBConfiguration()
+ {
+ return _orbConfiguration;
+ }
+
+ /**
+ * @return the name of the module properties file to use.
+ */
+
+public static synchronized final String propertiesFile ()
+ {
+ return _propFile;
+ }
+
+ /**
+ * Set the name of the properties file.
+ */
+
+public static synchronized final void setPropertiesFile (String file)
+ {
+ _propFile = file;
+ }
+
+ /**
+ * Strip the directory from the given filename.
+ *
+ * @param filename The filename to strip the directory for.
+ * @return The directory the file exists in.
+ */
+private static final String stripDirectoryFromFilename( String filename )
+ {
+ String dir = ".";
+ /** Search the string for the last file separator char and the last slash **/
+ int lastSeparator = filename.lastIndexOf(File.separatorChar);
+ int lastSlash = filename.lastIndexOf('/');
+
+ /** If the last character is a file separator and it exists **/
+ if ( ( lastSeparator > lastSlash ) && ( lastSeparator != -1 ) )
+ {
+ /** Set the directory to the filename upto the last separator **/
+ dir = filename.substring( 0, lastSeparator );
+ }
+ else
+ {
+ /** If the last slash is further towards the end and it exists **/
+ if ( lastSlash != -1 )
+ {
+ dir = filename.substring( 0, lastSlash );
+ }
+ }
+
+ return dir;
+ }
+
+ /**
+ * @return the location of the module properties file to use.
+ * @message com.arjuna.orbportability.common.Configuration.cannotfindproperties {0} - Cannot find properties file {1}
+ */
+
+public static synchronized final String propertiesDir ()
+ {
+ String propDir = ".";
+
+ try
+ {
+ propDir = FileLocator.locateFile( propertiesFile() );
+
+ if ( propDir != null )
+ {
+ propDir = stripDirectoryFromFilename( propDir );
+ }
+ }
+ catch (java.io.FileNotFoundException e)
+ {
+ if (opLogger.loggerI18N.isWarnEnabled())
+ {
+ opLogger.loggerI18N.warn("com.arjuna.orbportability.common.Configuration.cannotfindproperties", new Object[] { "Configuration.propertiesDir()", propertiesFile() } );
+ }
+ }
+
+ return propDir;
+ }
+
+ /**
+ * @return the name of the file where <name, object IOR> may be stored.
+ */
+
+public static synchronized final String configFile ()
+ {
+ return _configFile;
+ }
+
+ /**
+ * Set the name of the file where <name, object IOR> may be stored.
+ */
+
+public static synchronized void setConfigFile (String s)
+ {
+ _configFile = s;
+ }
+
+ /**
+ * @return the location of the file where <name, object IOR> may be stored.
+ */
+
+public static synchronized final String configFileRoot ()
+ {
+ if (_configFileRoot == null)
+ {
+ /*
+ * Search for an old file.
+ */
+
+ String oldConfigFile = null;
+
+ try
+ {
+ oldConfigFile = FileLocator.locateFile(_configFile);
+ }
+ catch (FileNotFoundException e)
+ {
+ }
+
+ if (oldConfigFile != null)
+ {
+ _configFileRoot = stripDirectoryFromFilename(oldConfigFile);
+ }
+ else
+ {
+ _configFileRoot = com.arjuna.orbportability.common.Configuration.propertiesDir();
+ }
+ }
+
+ return _configFileRoot;
+ }
+
+ /**
+ * Set the location of the file where <name, object IOR> may be stored.
+ */
+
+public static synchronized void setConfigFileRoot (String s)
+ {
+ _configFileRoot = s;
+ }
+
+ /**
+ * @return the default bind mechanism.
+ * @message com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind {0} - invalid bind mechanism in properties file
+ */
+
+public static synchronized final int bindDefault ()
+ {
+ int bindMethod = _bindDefault;
+
+ if (!_bindDefaultSet)
+ {
+ String configuredMechanism = opPropertyManager.propertyManager.getProperty(Environment.BIND_MECHANISM);
+
+ if (configuredMechanism != null)
+ {
+ bindMethod = Services.bindValue(configuredMechanism);
+ }
+
+ if (bindMethod == -1)
+ {
+ if (opLogger.loggerI18N.isWarnEnabled())
+ {
+ opLogger.loggerI18N.warn("com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind", new Object[] { "com.arjuna.orbportability.common.Configuration.bindDefault()" } );
+ }
+ }
+ }
+
+ return bindMethod;
+ }
+
+ /**
+ * Set the default bind mechanism.
+ * @message com.arjuna.orbportability.common.Configuration.setBindDefault.invaliddefaultvalue {0} - invalid value {1}
+ */
+public static synchronized final void setBindDefault (int i)
+ {
+ if ((i < Services.CONFIGURATION_FILE) || (i > Services.NAMED_CONNECT))
+ {
+ if (opLogger.loggerI18N.isWarnEnabled())
+ {
+ opLogger.loggerI18N.warn( "com.arjuna.orbportability.common.Configuration.setBindDefault.invaliddefaultvalue", new Object[] {"com.arjuna.orbportability.common.Configuration.setBindDefault", ""+i} );
+ }
+ }
+ else
+ {
+ _bindDefaultSet = true;
+ _bindDefault = i;
+ }
+ }
+
+ /**
+ * @return the version of the module.
+ */
+
+public static final String version ()
+ {
+ return getBuildTimeProperty("ORBPORTABILITY_VERSION") ;
+ }
+ /**
+ * Get a build time property.
+ * @param name The name of the build time property.
+ * @return The build time property value.
+ */
+ public static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Configuration.class.getResourceAsStream("/arjuna.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+
+
+private static String _configFile = "CosServices.cfg";
+private static String _configFileRoot = null;
+private static int _bindDefault = Services.CONFIGURATION_FILE;
+private static boolean _bindDefaultSet = false;
+private static String _propFile = getBuildTimeProperty("PROPERTIES_FILE") ;
+private static String _orbConfiguration = getBuildTimeProperty("ORB_CONFIGURATION") ;
+
+}
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.javatmpl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/Configuration.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,271 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 1998, 1999, 2000, 2001,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.orbportability.common;
-
-import com.arjuna.orbportability.Services;
-
-import com.arjuna.common.util.logging.*;
-import com.arjuna.common.util.FileLocator;
-
-import com.arjuna.orbportability.logging.*;
-
-import java.io.File;
-
-import java.io.IOException;
-import java.io.FileNotFoundException;
-
-/**
- * Module specific configuration object.
- *
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: Configuration.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since JTS 1.0.
- */
-
-public class Configuration
-{
-
- /**
- * @return the name of the default orb configuration file.
- */
-public static synchronized final String defaultORBConfiguration()
- {
- return _orbConfiguration;
- }
-
- /**
- * @return the name of the module properties file to use.
- */
-
-public static synchronized final String propertiesFile ()
- {
- return _propFile;
- }
-
- /**
- * Set the name of the properties file.
- */
-
-public static synchronized final void setPropertiesFile (String file)
- {
- _propFile = file;
- }
-
- /**
- * Strip the directory from the given filename.
- *
- * @param filename The filename to strip the directory for.
- * @return The directory the file exists in.
- */
-private static final String stripDirectoryFromFilename( String filename )
- {
- String dir = ".";
- /** Search the string for the last file separator char and the last slash **/
- int lastSeparator = filename.lastIndexOf(File.separatorChar);
- int lastSlash = filename.lastIndexOf('/');
-
- /** If the last character is a file separator and it exists **/
- if ( ( lastSeparator > lastSlash ) && ( lastSeparator != -1 ) )
- {
- /** Set the directory to the filename upto the last separator **/
- dir = filename.substring( 0, lastSeparator );
- }
- else
- {
- /** If the last slash is further towards the end and it exists **/
- if ( lastSlash != -1 )
- {
- dir = filename.substring( 0, lastSlash );
- }
- }
-
- return dir;
- }
-
- /**
- * @return the location of the module properties file to use.
- * @message com.arjuna.orbportability.common.Configuration.cannotfindproperties {0} - Cannot find properties file {1}
- */
-
-public static synchronized final String propertiesDir ()
- {
- String propDir = ".";
-
- try
- {
- propDir = FileLocator.locateFile( propertiesFile() );
-
- if ( propDir != null )
- {
- propDir = stripDirectoryFromFilename( propDir );
- }
- }
- catch (java.io.FileNotFoundException e)
- {
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.common.Configuration.cannotfindproperties", new Object[] { "Configuration.propertiesDir()", propertiesFile() } );
- }
- }
-
- return propDir;
- }
-
- /**
- * @return the name of the file where <name, object IOR> may be stored.
- */
-
-public static synchronized final String configFile ()
- {
- return _configFile;
- }
-
- /**
- * Set the name of the file where <name, object IOR> may be stored.
- */
-
-public static synchronized void setConfigFile (String s)
- {
- _configFile = s;
- }
-
- /**
- * @return the location of the file where <name, object IOR> may be stored.
- */
-
-public static synchronized final String configFileRoot ()
- {
- if (_configFileRoot == null)
- {
- /*
- * Search for an old file.
- */
-
- String oldConfigFile = null;
-
- try
- {
- oldConfigFile = FileLocator.locateFile(_configFile);
- }
- catch (FileNotFoundException e)
- {
- }
-
- if (oldConfigFile != null)
- {
- _configFileRoot = stripDirectoryFromFilename(oldConfigFile);
- }
- else
- {
- _configFileRoot = com.arjuna.orbportability.common.Configuration.propertiesDir();
- }
- }
-
- return _configFileRoot;
- }
-
- /**
- * Set the location of the file where <name, object IOR> may be stored.
- */
-
-public static synchronized void setConfigFileRoot (String s)
- {
- _configFileRoot = s;
- }
-
- /**
- * @return the default bind mechanism.
- * @message com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind {0} - invalid bind mechanism in properties file
- */
-
-public static synchronized final int bindDefault ()
- {
- int bindMethod = _bindDefault;
-
- if (!_bindDefaultSet)
- {
- String configuredMechanism = opPropertyManager.propertyManager.getProperty(Environment.BIND_MECHANISM);
-
- if (configuredMechanism != null)
- {
- bindMethod = Services.bindValue(configuredMechanism);
- }
-
- if (bindMethod == -1)
- {
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn("com.arjuna.orbportability.common.Configuration.bindDefault.invalidbind", new Object[] { "com.arjuna.orbportability.common.Configuration.bindDefault()" } );
- }
- }
- }
-
- return bindMethod;
- }
-
- /**
- * Set the default bind mechanism.
- * @message com.arjuna.orbportability.common.Configuration.setBindDefault.invaliddefaultvalue {0} - invalid value {1}
- */
-public static synchronized final void setBindDefault (int i)
- {
- if ((i < Services.CONFIGURATION_FILE) || (i > Services.NAMED_CONNECT))
- {
- if (opLogger.loggerI18N.isWarnEnabled())
- {
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.common.Configuration.setBindDefault.invaliddefaultvalue", new Object[] {"com.arjuna.orbportability.common.Configuration.setBindDefault", ""+i} );
- }
- }
- else
- {
- _bindDefaultSet = true;
- _bindDefault = i;
- }
- }
-
- /**
- * @return the version of the module.
- */
-
-public static final String version ()
- {
- return "@ORBPORTABILITY_VERSION@";
- }
-
-private static String _configFile = "CosServices.cfg";
-private static String _configFileRoot = null;
-private static int _bindDefault = Services.CONFIGURATION_FILE;
-private static boolean _bindDefaultSet = false;
-private static String _propFile = "@PROPERTIES_FILE@";
-private static String _orbConfiguration = "@ORB_CONFIGURATION@";
-
-}
Modified: labs/jbosstm/trunk/antbuildsystem/build.xml
===================================================================
--- labs/jbosstm/trunk/antbuildsystem/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/antbuildsystem/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -46,12 +46,6 @@
</path>
<property name="com.hp.mwlabs.buildsystem.classpath" refid="com.hp.mwlabs.buildsystem.classpath"/>
- <!-- Files that need word substitutions -->
- <property name="com.hp.mwlabs.buildsystem.info.src" value="${com.hp.mwlabs.buildsystem.src}/com/hp/mw/ts/buildsystem/Info.javatmpl"/>
- <property name="com.hp.mwlabs.buildsystem.info.dest" value="${com.hp.mwlabs.buildsystem.src}/com/hp/mw/ts/buildsystem/Info.java"/>
- <property name="com.hp.mwlabs.buildsystem.properties.src" value="${com.hp.mwlabs.buildsystem.src}/com/hp/mw/ts/buildsystem/common/Configuration.javatmpl"/>
- <property name="com.hp.mwlabs.buildsystem.properties.dest" value="${com.hp.mwlabs.buildsystem.src}/com/hp/mw/ts/buildsystem/common/Configuration.java"/>
-
<!-- Initialisation -->
<target name="com.hp.mwlabs.buildsystem.init">
<!-- Define default build properties -->
Modified: labs/jbosstm/trunk/common/build.xml
===================================================================
--- labs/jbosstm/trunk/common/build.xml 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/common/build.xml 2006-09-27 16:09:02 UTC (rev 6441)
@@ -47,11 +47,11 @@
<property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
<property name="com.arjuna.common.src" location="classes"/>
+ <property name="com.arjuna.common.etc" location="etc"/>
<property name="com.hp.mwlabs.ts.common.tests.src" location="tests/"/>
<property name="com.arjuna.common.destroot" location="build"/>
<property name="com.hp.mwlabs.ts.common.jar.dest" location="${com.arjuna.common.destroot}/lib"/>
- <property name="com.hp.mwlabs.ts.common.src.dest" location="${com.arjuna.common.destroot}/src"/>
<property name="com.hp.mwlabs.ts.common.dest" location="${com.arjuna.common.destroot}/classes"/>
<property name="com.hp.mwlabs.ts.common.htdocs.dest" value="${com.arjuna.common.destroot}/htdocs"/>
<property name="com.hp.mwlabs.ts.common.tests.dest" location="${com.arjuna.common.destroot}/tests"/>
@@ -125,20 +125,6 @@
<!-- Build htdocs for which package? -->
<property name="com.arjuna.common.htdocs.list" value="com.arjuna.common.logging.*"/>
- <!-- Process the info class -->
- <copy todir="${com.hp.mwlabs.ts.common.src.dest}" overwrite="yes">
- <fileset dir="${com.arjuna.common.src}" includes="**/*.javatmpl"/>
- <mapper type="glob" from="*.javatmpl" to="*.java"/>
- <filterset>
- <filter token="MODULE" value="${com.arjuna.common.modulename}"/>
- <filter token="SOURCEID" value="${com.hp.mw.ts.common.sourceid}"/>
- <filter token="BUILDINFO" value="${com.arjuna.common.builder}"/>
- <filter token="VERSION" value="${com.hp.mw.ts.common.version}"/>
- <filter token="DATE" value="${com.hp.mw.ts.common.date}"/>
- <filter token="NOTES" value="${com.hp.mw.ts.common.notes}"/>
- </filterset>
- </copy>
-
<!-- Set the module property file details -->
<taskdef name="version-to-property" classname="com.hp.mw.buildsystem.ant.VersToProp" classpath="${com.arjuna.buildsystem.classpath}"/>
<version-to-property version="${com.hp.mw.ts.common.version}" property="com.hp.mwlabs.ts.common.propertyversion"/>
@@ -151,7 +137,6 @@
<!-- Make the destination directories -->
<mkdir dir="${com.arjuna.common.destroot}"/>
- <mkdir dir="${com.hp.mwlabs.ts.common.src.dest}"/>
<mkdir dir="${com.hp.mwlabs.ts.common.dest}"/>
</target>
@@ -164,7 +149,7 @@
<classpath-builder filename="${com.hp.mwlabs.classpathbuilderfilename}" inproperty="build.classpath"/>
- <javac srcdir="${com.arjuna.common.src}:${com.hp.mwlabs.ts.common.src.dest}"
+ <javac srcdir="${com.arjuna.common.src}"
destdir="${com.hp.mwlabs.ts.common.dest}"
classpath="${com.arjuna.common.src}"
excludes="${com.arjuna.common.compile.excludes}"
@@ -174,6 +159,18 @@
<path path="${com.arjuna.common.src}"/>
</classpath>
</javac>
+
+ <!-- Process the properties -->
+ <property name="property.file" value="common.properties"/>
+ <propertyfile file="${com.hp.mwlabs.ts.common.dest}/${property.file}">
+ <entry key="MODULE" value="${com.arjuna.common.modulename}"/>
+ <entry key="SOURCEID" value="${com.hp.mw.ts.common.sourceid}"/>
+ <entry key="BUILDINFO" value="${com.arjuna.common.builder}"/>
+ <entry key="VERSION" value="${com.hp.mw.ts.common.version}"/>
+ <entry key="DATE" value="${com.hp.mw.ts.common.date}"/>
+ <entry key="NOTES" value="${com.hp.mw.ts.common.notes}"/>
+ </propertyfile>
+
</target>
<!-- Jar targets -->
Copied: labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.java (from rev 6408, labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.javatmpl)
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.javatmpl 2006-09-25 09:42:28 UTC (rev 6408)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.java 2006-09-27 16:09:02 UTC (rev 6441)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2002,
+ *
+ * Arjuna Solutions Limited,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ */
+
+package com.arjuna.common;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+/**
+ * Module specific implementation of the interface object.
+ *
+ * @author Richard Begg (richard_begg at hp.com)
+ * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
+ * @since HPTS 3.0
+ */
+public class Info
+{
+ public String toString()
+ {
+ StringBuffer moduleInfo = new StringBuffer();
+
+ moduleInfo.append("<module-info name=\"" + getBuildTimeProperty("MODULE") + "\">");
+ moduleInfo.append("<source-identifier>" + getBuildTimeProperty("SOURCEID") + "</source-identifier>");
+ moduleInfo.append("<build-information>" + getBuildTimeProperty("BUILDINFO") + "</build-information>");
+ moduleInfo.append("<version>" + getBuildTimeProperty("VERSION") + "</version>");
+ moduleInfo.append("<date>" + getBuildTimeProperty("DATE") + "</date>");
+ moduleInfo.append("<notes>" + getBuildTimeProperty("NOTES") + "</notes>");
+ moduleInfo.append("</module-info>");
+
+ return(moduleInfo.toString());
+ }
+
+ private static String getBuildTimeProperty(final String name)
+ {
+ if (PROPS == null)
+ {
+ return "" ;
+ }
+ else
+ {
+ return PROPS.getProperty(name, "") ;
+ }
+ }
+
+ private static final Properties PROPS ;
+
+ static
+ {
+ final InputStream is = Info.class.getResourceAsStream("/common.properties") ;
+ if (is != null)
+ {
+ Properties props = new Properties() ;
+ try
+ {
+ props.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ props = null ;
+ }
+ PROPS = props ;
+ }
+ else
+ {
+ PROPS = null ;
+ }
+ }
+}
Deleted: labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.javatmpl
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.javatmpl 2006-09-27 14:05:01 UTC (rev 6440)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/Info.javatmpl 2006-09-27 16:09:02 UTC (rev 6441)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2002,
- *
- * Arjuna Solutions Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.common;
-
-import java.util.Hashtable;
-
-/**
- * Module specific implementation of the interface object.
- *
- * @author Richard Begg (richard_begg at hp.com)
- * @version $Id: Info.javatmpl 2342 2006-03-30 13:06:17Z $
- * @since HPTS 3.0
- */
-public class Info
-{
- public String toString()
- {
- StringBuffer moduleInfo = new StringBuffer();
-
- moduleInfo.append("<module-info name=\"@MODULE@\">");
- moduleInfo.append("<source-identifier>@SOURCEID@</source-identifier>");
- moduleInfo.append("<build-information>@BUILDINFO@</build-information>");
- moduleInfo.append("<version>@VERSION@</version>");
- moduleInfo.append("<date>@DATE@</date>");
- moduleInfo.append("<notes>@NOTES@</notes>");
- moduleInfo.append("</module-info>");
-
- return(moduleInfo.toString());
- }
-}
More information about the jboss-svn-commits
mailing list