[jboss-svn-commits] JBL Code SVN: r38308 - in labs/jbosstm/branches/JBOSSTS_4_16: ArjunaJTS/jtax/src/test/resources and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ochaloup
Date: 2013-04-03 04:07:39 -0400 (Wed, 03 Apr 2013)
New Revision: 38308

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/src/test/resources/jbossts-properties.xml
   labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml
Log:
JBTM-1481: fix for jbossts-properties.xml being on classpath of tests

Modified: labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/src/test/resources/jbossts-properties.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/src/test/resources/jbossts-properties.xml	2013-03-21 20:49:21 UTC (rev 38307)
+++ labs/jbosstm/branches/JBOSSTS_4_16/ArjunaJTS/jtax/src/test/resources/jbossts-properties.xml	2013-04-03 08:07:39 UTC (rev 38308)
@@ -1 +1,15 @@
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties/>
\ No newline at end of file
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry>
+
+    <entry key="OrbPortabilityEnvironmentBean.orbInitializationProperties">
+        <!-- This class handles context propagation issues, and should never be commented out or removed. -->
+        com.arjuna.orbportability.orb.PreInit1=com.arjuna.ats.internal.jts.context.ContextPropagationManager
+        <!-- This property ensures the JTS knows which ORB to use and should never be commented out or removed -->
+        com.arjuna.orbportability.orb.PostInit=com.arjuna.ats.jts.utils.ORBSetup
+        <!-- This property ensures the crash recovery is initialised correctly and should never be commented out or removed -->
+        
+        <!-- This property ensures the JTS knows which ORB to use and should never be commented out or removed -->
+        com.arjuna.orbportability.orb.PostSet1=com.arjuna.ats.jts.utils.ORBSetup
+    </entry>
+</properties>

Modified: labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml	2013-03-21 20:49:21 UTC (rev 38307)
+++ labs/jbosstm/branches/JBOSSTS_4_16/sharedbuild.xml	2013-04-03 08:07:39 UTC (rev 38308)
@@ -509,8 +509,22 @@
 
         <sequential>
 
-        <echo file="${build.dir}/tests/jbossts-properties.xml"
+        <if>
+          <not>
+            <available file="jbossts-properties.xml" filepath="src/test/resources" />
+          </not>
+          <then>
+            <echo message="jboss-properties.xml was not found at src/test/resources  - creating empty new one in ${build.dir}/tests" />
+            <echo file="${build.dir}/tests/jbossts-properties.xml"
                 message="&lt;!DOCTYPE properties SYSTEM &quot;http://java.sun.com/dtd/properties.dtd&quot;&gt;&lt;properties/&gt;"/>
+          </then>
+          <else>
+            <echo message="jboss-properties.xml found at src/test/resources - copying to ${build.dir}/tests" />
+            <copy todir="${build.dir}/tests" flatten="true">
+              <fileset dir="src/test" includes="**/jbossts-properties.xml" />
+            </copy>
+          </else>
+        </if>
 
         <copy file="${sharedbuild.base.dir}/ArjunaCore/arjuna/etc/log4j.properties" todir="${build.dir}/classes"/>