[jboss-cvs] JBossAS SVN: r106027 - in projects/jboss-jca/trunk: codegenerator/src/main/resources and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jun 14 08:49:04 EDT 2010


Author: jesper.pedersen
Date: 2010-06-14 08:49:03 -0400 (Mon, 14 Jun 2010)
New Revision: 106027

Removed:
   projects/jboss-jca/trunk/codegenerator/src/main/resources/jca.xml.template
   projects/jboss-jca/trunk/codegenerator/src/main/resources/naming.xml.template
   projects/jboss-jca/trunk/codegenerator/src/main/resources/stdio.xml.template
   projects/jboss-jca/trunk/codegenerator/src/main/resources/transaction.xml.template
Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
   projects/jboss-jca/trunk/sjc/build.xml
Log:
[JBJCA-356] Remove JCA container setup and copy all files

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2010-06-14 12:49:03 UTC (rev 106027)
@@ -254,10 +254,6 @@
          fw.flush();
          fw.close();
          
-         copyTestResourceFiles(def.getOutputDir(), "jca.xml");
-         copyTestResourceFiles(def.getOutputDir(), "naming.xml");
-         copyTestResourceFiles(def.getOutputDir(), "stdio.xml");
-         copyTestResourceFiles(def.getOutputDir(), "transaction.xml");
          copyTestResourceFiles(def.getOutputDir(), "logging.properties");
          copyTestResourceFiles(def.getOutputDir(), "jndi.properties");
       }

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-06-14 12:49:03 UTC (rev 106027)
@@ -327,9 +327,14 @@
    {
       File out = new File(outputDir);
       String path = out.getAbsolutePath();
-      String sourcePath = path + File.separatorChar + ".." + File.separatorChar + ".." + File.separatorChar + 
+      String targetPath = path + File.separatorChar + "lib";
+
+      String libPath = path + File.separatorChar + ".." + File.separatorChar + ".." + File.separatorChar + 
          ".." + File.separatorChar + "lib";
-      String targetPath = path + File.separatorChar + "lib";
+      Utils.copyFolder(libPath, targetPath, "jar");
+
+      String binPath = path + File.separatorChar + ".." + File.separatorChar + ".." + File.separatorChar + 
+         ".." + File.separatorChar + "lib";
       Utils.copyFolder(sourcePath, targetPath, "jar");
    }
 

Deleted: projects/jboss-jca/trunk/codegenerator/src/main/resources/jca.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/jca.xml.template	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/jca.xml.template	2010-06-14 12:49:03 UTC (rev 106027)
@@ -1,87 +0,0 @@
-<deployment>
-
-  <!-- Bean Validation -->
-  <bean name="BeanValidation" class="org.jboss.jca.core.bv.BeanValidation">
-    <depends>NamingServer</depends>
-  </bean>
-
-  <!-- Thread group -->
-  <bean name="ThreadGroup"
-        class="java.lang.ThreadGroup">
-    <constructor>
-      <parameter>workmanager</parameter>
-    </constructor>
-    <ignoreStop/>
-    <ignoreDestroy/>
-  </bean>
-
-  <!-- Thread factory -->
-  <bean name="ThreadFactory"
-        interface="java.util.concurrent.ThreadFactory"
-        class="org.jboss.threads.JBossThreadFactory">
-    <constructor>
-      <parameter><inject bean="ThreadGroup"/></parameter>
-      <parameter>false</parameter>
-      <parameter>5</parameter>
-      <parameter>work</parameter>
-      <parameter><null/></parameter>
-      <parameter><null/></parameter>
-    </constructor>
-  </bean>
-
-  <!-- Short running thread pool -->
-  <bean name="ShortRunningThreadPool">
-    <constructor factoryMethod="threadFactoryExecutor" 
-                 factoryClass="org.jboss.threads.JBossExecutors">
-      <parameter><inject bean="ThreadFactory"/></parameter>
-    </constructor>
-  </bean>
-
-  <!-- Long running thread pool -->
-  <bean name="LongRunningThreadPool">
-    <constructor factoryMethod="threadFactoryExecutor" 
-                 factoryClass="org.jboss.threads.JBossExecutors">
-      <parameter><inject bean="ThreadFactory"/></parameter>
-    </constructor>
-  </bean>
-
-  <!-- Work Manager -->
-  <bean name="WorkManager" interface="org.jboss.jca.core.api.WorkManager" class="org.jboss.jca.core.workmanager.WorkManagerImpl">
-    <!-- The short running thread pool -->
-    <property name="ShortRunningThreadPool"><inject bean="ShortRunningThreadPool"/></property>
-
-    <!-- The long running thread pool -->
-    <property name="LongRunningThreadPool"><inject bean="LongRunningThreadPool"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-  
-  <!-- Default Bootstrap context -->
-  <bean name="DefaultBootstrapContext" 
-        interface="org.jboss.jca.core.api.CloneableBootstrapContext"
-        class="org.jboss.jca.core.bootstrapcontext.BaseCloneableBootstrapContext">
-
-    <!-- The Transaction Synchronization Registry -->
-    <property name="TransactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
-
-    <!-- The Work Manager -->
-    <property name="WorkManager"><inject bean="WorkManager"/></property>
-
-    <!-- The XA terminator -->
-    <property name="XATerminator"><inject bean="TransactionManager" property="XATerminator"/></property>
-  </bean>
-
-  <!-- RA deployer -->
-  <bean name="RADeployer" interface="com.github.fungal.spi.deployers.Deployer" class="org.jboss.jca.deployers.fungal.RADeployer">
-    <property name="ArchiveValidation">true</property>
-    <property name="ArchiveValidationFailOnWarn">false</property>
-    <property name="ArchiveValidationFailOnError">true</property>
-    <property name="BeanValidation">true</property>
-    <property name="PrintStream"><inject bean="JBossStdioContext" property="Out"/></property>
-    <property name="DefaultBootstrapContext"><inject bean="DefaultBootstrapContext"/></property>
-    <depends>BeanValidation</depends>
-    <depends>JBossStdioContextSelector</depends>
-  </bean>
-
-</deployment>

Deleted: projects/jboss-jca/trunk/codegenerator/src/main/resources/naming.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/naming.xml.template	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/naming.xml.template	2010-06-14 12:49:03 UTC (rev 106027)
@@ -1,49 +0,0 @@
-<deployment>
-
-  <!-- Naming -->
-  <bean name="LookupPool">
-    <constructor factoryMethod="newFixedThreadPool"
-                 factoryClass="java.util.concurrent.Executors">
-      <parameter>2</parameter>
-    </constructor>
-  </bean>
-
-  <bean name="NamingBeanImpl" class="org.jnp.server.NamingBeanImpl">
-    <!-- Install this bean as the global JVM NamingServer -->
-    <property name="installGlobalService">true</property>
-    
-    <property name="useGlobalService">false</property>
-  </bean>
-
-  <bean name="NamingServer" class="org.jnp.server.Main">
-    <property name="namingInfo"><inject bean="NamingBeanImpl"/></property>
-
-    <!-- The call by value mode. true if all lookups are unmarshalled using
-         the caller's TCL, false if in VM lookups return the value by reference.
-      -->
-    <property name="callByValue">false</property>
-    
-    <!-- The listening port for the bootstrap JNP service. Set this to -1
-         to run the NamingService without the JNP invoker listening port.
-      -->
-    <property name="port">1099</property>
-    
-    <!-- The bootstrap JNP server bind address. This also sets the default
-         RMI service bind address. Empty == all addresses
-      -->
-    <property name="bindAddress">${jboss.jca.bindaddress:localhost}</property>
-
-    <!-- The port of the RMI naming service, 0 == anonymous -->
-    <property name="rmiPort">0</property>
-
-    <!-- The RMI service bind address. Empty == all addresses -->
-    <property name="rmiBindAddress">${jboss.jca.bindaddress:localhost}</property>
-
-    <!-- Set the java.rmi.server.hostname system property to rmiBindAddress -->
-    <property name="enableRmiServerHostname">true</property>
-
-    <!-- The thread pool service used to control the bootstrap lookups -->
-    <property name="lookupExector"><inject bean="LookupPool"/></property>
-  </bean>
-
-</deployment>

Deleted: projects/jboss-jca/trunk/codegenerator/src/main/resources/stdio.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/stdio.xml.template	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/stdio.xml.template	2010-06-14 12:49:03 UTC (rev 106027)
@@ -1,46 +0,0 @@
-<deployment>
-
-  <bean name="JBossStdioSystemOutStream" class="org.jboss.stdio.LoggingOutputStream">
-    <constructor>
-      <parameter>STDOUT</parameter>
-      <parameter>INFO</parameter>
-    </constructor>
-  </bean>
-
-  <bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
-    <constructor>
-      <parameter>STDERR</parameter>
-      <parameter>ERROR</parameter>
-    </constructor>
-  </bean>
-
-  <bean name="JBossStdioSystemInStream" class="org.jboss.stdio.NullInputStream">
-    <constructor factoryMethod="getInstance"/>
-  </bean>
-
-  <bean name="JBossStdioContext" class="org.jboss.stdio.StdioContext">
-    <constructor factoryMethod="create">
-      <parameter>
-        <inject bean="JBossStdioSystemInStream"/>
-      </parameter>
-      <parameter class="java.io.OutputStream">
-        <inject bean="JBossStdioSystemOutStream"/>
-      </parameter>
-      <parameter>
-        <inject bean="JBossStdioSystemErrStream"/>
-      </parameter>
-    </constructor>
-  </bean>
-
-  <bean name="JBossStdioService" class="org.jboss.stdio.StdioService">
-    <depends>JBossStdioContext</depends>
-  </bean>
-
-  <bean name="JBossStdioContextSelector" class="org.jboss.stdio.SimpleStdioContextSelector">
-    <constructor>
-      <parameter><inject bean="JBossStdioContext"/></parameter>
-    </constructor>
-    <install method="install"/>
-  </bean>
-
-</deployment>

Deleted: projects/jboss-jca/trunk/codegenerator/src/main/resources/transaction.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/transaction.xml.template	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/transaction.xml.template	2010-06-14 12:49:03 UTC (rev 106027)
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment>
-
-  <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
-    <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>        
-    <property name="loggingFactory">com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger</property>
-  </bean>
-
-  <bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.recoveryPropertyManager" factoryMethod="getRecoveryEnvironmentBean"/>
-    <property name="recoveryInetAddress">localhost</property>
-    <property name="recoveryPort">4712</property>
-    <property name="transactionStatusManagerInetAddress">localhost</property>
-    <property name="transactionStatusManagerPort">4713</property>
-    <property name="recoveryExtensions">
-      <list elementClass="java.lang.String">
-        <value>com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule</value>
-        <value>com.arjuna.ats.internal.txoj.recovery.TORecoveryModule</value>
-        <value>com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule</value>
-      </list>
-    </property>
-    <property name="expiryScanners">
-      <list elementClass="java.lang.String">
-        <value>com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner</value>
-      </list>
-    </property>
-    <property name="recoveryActivators">
-      <null/>
-    </property>
-  </bean>
-
-  <bean name="CoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoreEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoreEnvironmentBean"/>
-    <property name="socketProcessIdPort">0</property>
-    <property name="nodeIdentifier">1</property>
-    <property name="socketProcessIdMaxPorts">10</property>
-  </bean>
-
-  <bean name="CoordinatorEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getCoordinatorEnvironmentBean"/>
-    <property name="enableStatistics">false</property>
-    <property name="defaultTimeout">300</property>
-  </bean>
-
-  <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
-    <property name="objectStoreDir">${jboss.jca.home}/tmp/tx-object-store</property>
-  </bean>
-
-  <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
-    <constructor factoryClass="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean" factoryMethod="getObjectStoreBrowserBean"/>
-    <depends>ObjectStoreEnvironmentBean</depends>
-  </bean>
-
-  <bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
-    <constructor factoryClass="com.arjuna.ats.jta.common.jtaPropertyManager" factoryMethod="getJTAEnvironmentBean"/>
-    <property name="lastResourceOptimisationInterface">org.jboss.tm.LastResource</property>
-    <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate</property>
-    <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple</property>
-    <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple</property>
-    <property name="xaRecoveryNodes">
-      <list elementClass="java.lang.String">
-        <value>1</value>
-      </list>
-    </property>
-    <property name="xaResourceOrphanFilterClassNames">
-      <list elementClass="java.lang.String">
-        <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
-        <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
-      </list>
-    </property>
-  </bean>
-
-  <bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
-    <depends>LoggingEnvironmentBean</depends>
-    <depends>RecoveryEnvironmentBean</depends>
-  </bean>
-
-  <bean name="XATerminator" class="com.arjuna.ats.internal.jbossatx.jta.jca.XATerminator"/>
-
-  <bean name="TransactionSynchronizationRegistry" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple"/>
-
-  <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
-    <property name="jbossXATerminator"><inject bean="XATerminator"/></property>
-    <property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
-    <depends>LoggingEnvironmentBean</depends>
-    <depends>RecoveryEnvironmentBean</depends>
-    <depends>CoreEnvironmentBean</depends>
-    <depends>CoordinatorEnvironmentBean</depends>
-    <depends>ObjectStoreEnvironmentBean</depends>
-    <depends>JTAEnvironmentBean</depends>
-    <depends>RecoveryManager</depends>
-    <depends>TransactionManagerJNDIBinding</depends>
-    <depends>TransactionSynchronizationRegistryJNDIBinding</depends>
-    <depends>TransactionPropagationContextImporterJNDIBinding</depends>
-    <depends>TransactionPropagationContextExporterJNDIBinding</depends>
-  </bean>
-
-  <bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
-    <constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
-  </bean>
-
-  <bean name="TransactionManagerJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-    <property name="bindName">java:/TransactionManager</property>
-    <property name="className">
-      <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
-    </property>
-    <property name="factory">
-      <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
-    </property>
-
-    <install method="bind"/>
-    <uninstall method="unbind"/>
-
-    <depends>NamingServer</depends>
-  </bean>
-
-  <bean name="TransactionSynchronizationRegistryJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-    <property name="bindName">java:/TransactionSynchronizationRegistry</property>
-    <property name="className">
-      <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
-    </property>
-    <property name="factory">
-      <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
-    </property>
-
-    <install method="bind"/>
-    <uninstall method="unbind"/>
-
-    <depends>NamingServer</depends>
-  </bean>
-
-  <bean name="TransactionPropagationContextImporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-    <property name="bindName">java:/TransactionPropagationContextImporter</property>
-    <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-    <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-
-    <install method="bind"/>
-    <uninstall method="unbind"/>
-
-    <depends>NamingServer</depends>
-  </bean>
-
-  <bean name="TransactionPropagationContextExporterJNDIBinding" class="com.arjuna.ats.jta.utils.JNDIReferenceBindingBean">
-    <property name="bindName">java:/TransactionPropagationContextExporter</property>
-    <property name="className">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-    <property name="factory">com.arjuna.ats.internal.jbossatx.jta.PropagationContextManager</property>
-
-    <install method="bind"/>
-    <uninstall method="unbind"/>
-
-    <depends>NamingServer</depends>
-  </bean>
-
-  <!-- Ensure TransactionPropagationContextUtil's ref to TransactionPropagationContextFactory is set. See JBAS-7784. -->
-  <bean name="TransactionPropagationContextFactory" class="org.jboss.tm.TransactionPropagationContextFactory">
-    <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
-    <!--  The factory method looks up the JNDI binding, so we depend on it -->
-    <depends>TransactionPropagationContextExporterJNDIBinding</depends>
-  </bean>
-
-  <!-- Make javax.transaction.TransactionManager available for injection -->
-  <bean name="RealTransactionManager">
-    <constructor factoryMethod="getTransactionManager">
-      <factory bean="TransactionManager"/>
-    </constructor>
-  </bean>
-
-  <!-- Handles user transaction providers and listeners -->
-  <bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
-    <!-- Register providers -->
-    <incallback method="addProvider"/>
-    <uncallback method="removeProvider"/>
-
-    <!-- Register listeners -->
-    <incallback method="addListener"/>
-    <uncallback method="removeListener"/>
-  </bean>
-  
-  <!-- The provider for default in process UserTransactions -->
-  <bean name="DefaultUserTransactionprovider" class="org.jboss.tm.usertx.client.ServerVMClientUserTransaction">
-    <constructor factoryClass="org.jboss.tm.usertx.client.ServerVMClientUserTransaction" factoryMethod="getSingleton"/>
-    <depends>TransactionManager</depends>
-  </bean>
-  
-</deployment>

Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml	2010-06-14 11:33:08 UTC (rev 106026)
+++ projects/jboss-jca/trunk/sjc/build.xml	2010-06-14 12:49:03 UTC (rev 106027)
@@ -176,6 +176,13 @@
       </fileset>
     </copy>
 
+    <!-- HACK: remove -->
+    <copy todir="${target.dir}/sjc/lib">
+      <fileset dir="${lib.dir}/test">
+        <include name="junit.jar"/>
+      </fileset>
+    </copy>
+
     <copy todir="${target.dir}/sjc/system">
       <fileset dir="${target.dir}">
         <include name="*.war"/>



More information about the jboss-cvs-commits mailing list