[jboss-cvs] JBossAS SVN: r84124 - in projects/ejb3/trunk/jta-profile: .settings and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 12 09:02:14 EST 2009
Author: wolfc
Date: 2009-02-12 09:02:13 -0500 (Thu, 12 Feb 2009)
New Revision: 84124
Added:
projects/ejb3/trunk/jta-profile/.classpath
projects/ejb3/trunk/jta-profile/.project
projects/ejb3/trunk/jta-profile/.settings/
projects/ejb3/trunk/jta-profile/.settings/org.eclipse.jdt.core.prefs
projects/ejb3/trunk/jta-profile/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/trunk/jta-profile/pom.xml
projects/ejb3/trunk/jta-profile/src/
projects/ejb3/trunk/jta-profile/src/main/
projects/ejb3/trunk/jta-profile/src/main/resources/
projects/ejb3/trunk/jta-profile/src/main/resources/META-INF/
projects/ejb3/trunk/jta-profile/src/main/resources/META-INF/jboss-beans.xml
projects/ejb3/trunk/jta-profile/src/test/
projects/ejb3/trunk/jta-profile/src/test/java/
projects/ejb3/trunk/jta-profile/src/test/java/org/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/common/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/common/SimpleClassLoaderDeployer.java
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/
projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java
projects/ejb3/trunk/jta-profile/src/test/resources/
projects/ejb3/trunk/jta-profile/src/test/resources/conf/
projects/ejb3/trunk/jta-profile/src/test/resources/jndi.properties
projects/ejb3/trunk/jta-profile/src/test/resources/log4j.xml
Removed:
projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/derby.xml
projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/hsqldb.xml
projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/transactionmanager.xml
Modified:
projects/ejb3/trunk/jta-profile/
projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap.xml
projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/maindeployer.xml
Log:
EJBTHREE-1728: a JTA profile using JBossTS
Property changes on: projects/ejb3/trunk/jta-profile
___________________________________________________________________
Name: svn:ignore
+ eclipse-target
FileHandler@*
Added: projects/ejb3/trunk/jta-profile/.classpath
===================================================================
--- projects/ejb3/trunk/jta-profile/.classpath (rev 0)
+++ projects/ejb3/trunk/jta-profile/.classpath 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,50 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="eclipse-target/tests-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="eclipse-target/tests-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="eclipse-target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" sourcepath="M2_REPO/apache-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/0.1.0-SNAPSHOT/jboss-bootstrap-0.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/0.1.0-SNAPSHOT/jboss-bootstrap-0.1.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.CR5/jboss-classloader-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.0.CR5/jboss-classloader-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.CR5/jboss-classloading-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.0.CR5/jboss-classloading-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.CR5/jboss-classloading-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.0.CR5/jboss-classloading-vfs-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.CR5/jboss-dependency-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.CR5/jboss-deployers-client-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.0.CR5/jboss-deployers-client-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.CR5/jboss-deployers-client-spi-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.CR5/jboss-deployers-core-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.0.CR5/jboss-deployers-core-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.CR5/jboss-deployers-core-spi-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.CR5/jboss-deployers-impl-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.0.CR5/jboss-deployers-impl-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.0.CR5/jboss-deployers-spi-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.CR5/jboss-deployers-structure-spi-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.CR5/jboss-deployers-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.0.CR5/jboss-deployers-vfs-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.CR5/jboss-deployers-vfs-spi-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.CR5/jboss-deployers-vfs-spi-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR1/jboss-jca-api-1.5.0.CR1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.CR1/jboss-jca-api-1.5.0.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.CR5/jboss-kernel-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.CR4/jboss-managed-2.0.0.CR4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.CR3/jboss-mdr-2.0.0.CR3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR4/jboss-metatype-2.0.0.CR4.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.CR4/jboss-metatype-2.0.0.CR4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR5/jboss-vfs-2.0.0.CR5.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR5/jboss-vfs-2.0.0.CR5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossjta/4.4.0.GA/jbossjta-4.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossjta-integration/4.4.0.GA/jbossjta-integration-4.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+</classpath>
\ No newline at end of file
Added: projects/ejb3/trunk/jta-profile/.project
===================================================================
--- projects/ejb3/trunk/jta-profile/.project (rev 0)
+++ projects/ejb3/trunk/jta-profile/.project 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,17 @@
+<projectDescription>
+ <name>jboss-ejb3-jta-profile</name>
+ <comment>For internal consumption: expose a JTA profile.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: projects/ejb3/trunk/jta-profile/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/ejb3/trunk/jta-profile/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/ejb3/trunk/jta-profile/.settings/org.eclipse.jdt.core.prefs 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,5 @@
+#Thu Feb 12 13:27:48 CET 2009
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added: projects/ejb3/trunk/jta-profile/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/trunk/jta-profile/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/ejb3/trunk/jta-profile/.settings/org.maven.ide.eclipse.prefs 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,8 @@
+#Thu Feb 12 13:34:27 CET 2009
+activeProfiles=eclipse
+eclipse.preferences.version=1
+fullBuildGoals=
+includeModules=false
+resolveWorkspaceProjects=false
+resourceFilterGoals=
+version=1
Added: projects/ejb3/trunk/jta-profile/pom.xml
===================================================================
--- projects/ejb3/trunk/jta-profile/pom.xml (rev 0)
+++ projects/ejb3/trunk/jta-profile/pom.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ vi:ts=2:sw=2:expandtab:
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-build</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../build/pom.xml</relativePath>
+ </parent>
+
+ <!-- Maven POM Model Version -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Artifact Information -->
+ <artifactId>jboss-ejb3-jta-profile</artifactId>
+ <packaging>jar</packaging>
+ <version>0.1.0-SNAPSHOT</version>
+ <name>JBoss EJB 3.x JTA Profile</name>
+ <description>
+ For internal consumption: expose a JTA profile.
+
+ The goal is to provide runtime configuration which boots up the transaction manager
+ and a runtime dependency tree for use within Maven.
+ </description>
+ <url>http://labs.jboss.com/jbossejb3/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjta-integration</artifactId>
+ <version>4.4.0.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- For Arjuna -->
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.0.jboss</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjta</artifactId>
+ <version>4.4.0.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.4.0.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>5.0.3.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss-update1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: projects/ejb3/trunk/jta-profile/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/jta-profile/src/main/resources/META-INF/jboss-beans.xml (rev 0)
+++ projects/ejb3/trunk/jta-profile/src/main/resources/META-INF/jboss-beans.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <!-- JTA -->
+ <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
+ <!-- TODO: re-enable
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager",exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class,registerDirectly=true)</annotation>
+ -->
+
+ <property name="transactionTimeout">300</property>
+ <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
+ <property name="mbeanServer"><inject bean="MBeanServer"/></property>
+
+ <!-- TODO: use service binding manager -->
+
+ <property name="transactionStatusManagerInetAddress">localhost</property>
+ <property name="transactionStatusManagerPort">5712</property>
+
+ <property name="recoveryInetAddress">localhost</property>
+ <property name="recoveryPort">5713</property>
+
+ <property name="socketProcessIdPort">0</property>
+
+ </bean>
+
+ <!-- expose javax.transaction.TransactionManager -->
+ <bean name="RealTransactionManager">
+ <constructor factoryMethod="getTransactionManager">
+ <factory bean="TransactionManager"/>
+ </constructor>
+ </bean>
+</deployment>
Copied: projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/common/SimpleClassLoaderDeployer.java (from rev 84119, projects/ejb3/trunk/timerservice-quartz/src/test/java/org/jboss/ejb3/timerservice/quartz/test/common/SimpleClassLoaderDeployer.java)
===================================================================
--- projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/common/SimpleClassLoaderDeployer.java (rev 0)
+++ projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/common/SimpleClassLoaderDeployer.java 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.jta.profile.test.common;
+
+import org.jboss.deployers.spi.deployer.helpers.AbstractTopLevelClassLoaderDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class SimpleClassLoaderDeployer extends AbstractTopLevelClassLoaderDeployer
+{
+ @Override
+ protected ClassLoader createTopLevelClassLoader(DeploymentUnit unit) throws Exception
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+}
Property changes on: projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/common/SimpleClassLoaderDeployer.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java
===================================================================
--- projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java (rev 0)
+++ projects/ejb3/trunk/jta-profile/src/test/java/org/jboss/ejb3/jta/profile/test/lookup/unit/LookupTransactionManagerTestCase.java 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.jta.profile.test.lookup.unit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.transaction.TransactionManager;
+
+import org.jboss.bootstrap.microcontainer.ServerImpl;
+import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.bootstrap.spi.microcontainer.MCServer;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class LookupTransactionManagerTestCase
+{
+ private static Logger log = Logger.getLogger(LookupTransactionManagerTestCase.class);
+
+ private static MCServer server;
+
+ @AfterClass
+ public static void afterClass() throws Exception
+ {
+ if(server != null)
+ server.shutdown();
+ }
+
+ @BeforeClass
+ public static void beforeClass() throws Exception
+ {
+ server = new ServerImpl();
+
+ Properties props = new Properties();
+ String dir = mkdir("target/bootstrap");
+ mkdir("target/bootstrap/server/default");
+ //mkdir("target/bootstrap/server/default/deploy");
+ mkdir("target/bootstrap/server/default/data");
+ mkdir("target/bootstrap/server/default/log");
+ mkdir("target/bootstrap/server/default/tmp");
+ mkdir("target/bootstrap/server/default/tmp/deploy");
+ mkdir("target/bootstrap/server/default/tmp/native");
+ log.info("dir = " + dir);
+ props.put(ServerConfig.HOME_DIR, dir);
+ props.put(ServerConfig.SERVER_CONFIG_URL, findDir("src/test/resources/conf"));
+ server.init(props);
+
+ server.start();
+
+ MainDeployer mainDeployer = (MainDeployer) server.getKernel().getController().getContext("MainDeployer", ControllerState.INSTALLED).getTarget();
+
+ URL url = new File("src/main/resources").toURI().toURL();
+ log.debug("url = " + url);
+ VirtualFile root = VFS.getRoot(url);
+ VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
+ mainDeployer.deploy(deployment);
+ mainDeployer.checkComplete(deployment);
+ }
+
+ private static String findDir(String path) throws IOException
+ {
+ File file = new File(path);
+ boolean success = file.isDirectory();
+ if(!success)
+ throw new IOException("failed to find " + path);
+ return file.toURI().toString();
+ }
+
+ private static String mkdir(String path) throws IOException
+ {
+ File file = new File(path);
+ boolean success = file.mkdirs() || file.isDirectory();
+ if(!success)
+ throw new IOException("failed to create " + path);
+ return file.toURI().toURL().toString();
+ }
+
+ @Test
+ public void testJNDI() throws NamingException
+ {
+ InitialContext ctx = new InitialContext();
+ TransactionManager tm = (TransactionManager) ctx.lookup("java:/TransactionManager");
+ assertNotNull(tm);
+ }
+
+ @Test
+ public void testMC()
+ {
+ Set<KernelControllerContext> candidates = server.getKernel().getController().getContexts(TransactionManager.class, ControllerState.INSTALLED);
+ assertEquals(candidates.toString(), 1, candidates.size());
+ TransactionManager tm = (TransactionManager) candidates.iterator().next().getTarget();
+ assertNotNull(tm);
+ }
+}
Copied: projects/ejb3/trunk/jta-profile/src/test/resources/conf (from rev 84119, projects/ejb3/trunk/timerservice-quartz/src/test/resources/conf)
Property changes on: projects/ejb3/trunk/jta-profile/src/test/resources/conf
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/derby.xml
===================================================================
--- projects/ejb3/trunk/timerservice-quartz/src/test/resources/conf/bootstrap/derby.xml 2009-02-12 10:22:55 UTC (rev 84119)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/derby.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- As a 'mock' DataSource we use Derby -->
- <bean name="DerbyService" class="org.jboss.ejb3.timerservice.quartz.test.common.DerbyService">
- <depends>NamingServer</depends>
- </bean>
-</deployment>
Deleted: projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/hsqldb.xml
===================================================================
--- projects/ejb3/trunk/timerservice-quartz/src/test/resources/conf/bootstrap/hsqldb.xml 2009-02-12 10:22:55 UTC (rev 84119)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/hsqldb.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- As a 'mock' DataSource we use HSQLDB -->
- <bean name="HSQLDBService" class="org.jboss.ejb3.timerservice.quartz.test.common.HSQLDBService">
- <depends>NamingServer</depends>
- </bean>
-</deployment>
Modified: projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/maindeployer.xml
===================================================================
--- projects/ejb3/trunk/timerservice-quartz/src/test/resources/conf/bootstrap/maindeployer.xml 2009-02-12 10:22:55 UTC (rev 84119)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/maindeployer.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="SimpleClassLoaderDeployer" class="org.jboss.ejb3.timerservice.quartz.test.common.SimpleClassLoaderDeployer"/>
+ <bean name="SimpleClassLoaderDeployer" class="org.jboss.ejb3.jta.profile.test.common.SimpleClassLoaderDeployer"/>
<!-- The MainDeployer -->
<bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
@@ -29,7 +29,15 @@
</bean>
<!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"/>
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-beans.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
<!-- File Structure -->
<bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"/>
Deleted: projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/transactionmanager.xml
===================================================================
--- projects/ejb3/trunk/timerservice-quartz/src/test/resources/conf/bootstrap/transactionmanager.xml 2009-02-12 10:22:55 UTC (rev 84119)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap/transactionmanager.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- JTA -->
- <!--
- <bean name="TransactionManager" class="org.jboss.ejb3.embedded.service.SimpleTransactionService">
- <depends>NamingServer</depends>
- </bean>
- -->
-
- <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
- <!--
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager",exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class,registerDirectly=true)</annotation>
- -->
-
- <property name="transactionTimeout">300</property>
- <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
- <property name="mbeanServer"><inject bean="MBeanServer"/></property>
-
- <property name="transactionStatusManagerInetAddress">localhost</property>
- <property name="transactionStatusManagerPort">5712</property>
-
- <property name="recoveryInetAddress">localhost</property>
- <property name="recoveryPort">5713</property>
-
- <property name="socketProcessIdPort">0</property>
-
- </bean>
-
- <bean name="RealTransactionManager">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManager"/>
- </constructor>
- </bean>
-</deployment>
Modified: projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap.xml
===================================================================
--- projects/ejb3/trunk/timerservice-quartz/src/test/resources/conf/bootstrap.xml 2009-02-12 10:22:55 UTC (rev 84119)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/conf/bootstrap.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -11,7 +11,5 @@
-->
<url>bootstrap/naming.xml</url>
<url>bootstrap/jmx-jdk.xml</url>
- <url>bootstrap/transactionmanager.xml</url>
<url>bootstrap/maindeployer.xml</url>
- <url>bootstrap/hsqldb.xml</url>
</bootstrap>
Copied: projects/ejb3/trunk/jta-profile/src/test/resources/jndi.properties (from rev 84119, projects/ejb3/trunk/timerservice-quartz/src/test/resources/jndi.properties)
===================================================================
--- projects/ejb3/trunk/jta-profile/src/test/resources/jndi.properties (rev 0)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/jndi.properties 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.LocalOnlyContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Property changes on: projects/ejb3/trunk/jta-profile/src/test/resources/jndi.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/ejb3/trunk/jta-profile/src/test/resources/log4j.xml (from rev 84119, projects/ejb3/trunk/timerservice-quartz/src/test/resources/log4j.xml)
===================================================================
--- projects/ejb3/trunk/jta-profile/src/test/resources/log4j.xml (rev 0)
+++ projects/ejb3/trunk/jta-profile/src/test/resources/log4j.xml 2009-02-12 14:02:13 UTC (rev 84124)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 68671 2008-01-08 10:04:25Z wolfc $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="target/test.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="ALL"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit JBoss categories to INFO
+ <category name="org.jboss">
+ <priority value="INFO" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- Increase the priority threshold for the DefaultDS category
+ <category name="DefaultDS">
+ <priority value="FATAL"/>
+ </category>
+ -->
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <priority value="WARN" />
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: projects/ejb3/trunk/jta-profile/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the jboss-cvs-commits
mailing list