7:33 a.m.
Author: heiko.braun(a)jboss.com
Date: 2009-02-13 08:33:58 -0500 (Fri, 13 Feb 2009)
New Revision: 3868
Modified:
jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml
jbpm4/trunk/modules/enterprise/pom.xml
jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml
jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
jbpm4/trunk/modules/enterprise/src/test/resources/META-INF/application.xml
jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml
jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml
Log:
Use global JNDI names in enterprise tests to avoid juggling with resource ref's in AS
5
Modified: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml
===================================================================
--- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-13 13:25:32 UTC (rev
3867)
+++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-02-13 13:33:58 UTC (rev
3868)
@@ -11,12 +11,12 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="jbpm4-toplevel"
exported="" />
- <orderEntry type="module" module-name="jbpm4-api"
exported="" />
+ <orderEntry type="module" module-name="gwt-rpc"
exported="" />
<orderEntry type="module" module-name="gwt-parent"
exported="" />
<orderEntry type="module" module-name="jbpm4-pvm"
exported="" />
- <orderEntry type="module" module-name="gwt-rpc" />
- <orderEntry type="module" module-name="gwt-server-integration"
/>
+ <orderEntry type="module" module-name="jbpm4-test-base"
exported="" />
+ <orderEntry type="module" module-name="gwt-server-integration"
exported="" />
+ <orderEntry type="module" module-name="jbpm4-toplevel"
exported="" />
<orderEntry type="module-library" exported="">
<library name="M2 Dep: cargo:cargo:jar:0.5:test">
<CLASSES>
@@ -479,16 +479,18 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep:
com.google.gwt:gwt-servlet:jar:1.5.2:runtime">
+ <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/"
/>
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/"
/>
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep:
com.google.code.gson:gson:jar:1.2.2:compile">
+ <library name="M2 Dep:
com.google.code.gson:gson:jar:1.2.2:provided">
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/"
/>
</CLASSES>
@@ -496,17 +498,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
- <CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root
url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/"
/>
- </SOURCES>
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: jbpm4/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/pom.xml 2009-02-13 13:25:32 UTC (rev 3867)
+++ jbpm4/trunk/modules/enterprise/pom.xml 2009-02-13 13:33:58 UTC (rev 3868)
@@ -134,7 +134,7 @@
<executions>
<execution>
<id>build-test-jars</id>
- <phase>pre-integration-test</phase>
+ <phase>process-test-classes</phase>
<goals>
<goal>run</goal>
</goals>
Modified: jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2009-02-13 13:25:32 UTC
(rev 3867)
+++ jbpm4/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2009-02-13 13:33:58 UTC
(rev 3868)
@@ -45,12 +45,7 @@
<!-- test modules -->
<fileset dir="${build.dir}/test-libs"
includes="jbpm-enterprise-test.war" />
<zipfileset dir="${build.dir}/test-libs"
includes="jbpm-enterprise-test.jar" prefix="lib" />
- <!-- dependencies -->
- <zipfileset dir="${build.dir}/test-dependencies"
prefix="lib">
- <include name="jbpm-api*.jar" />
- <include name="jbpm-pvm*.jar" />
- <include name="jbpm-log*.jar" />
- </zipfileset>
+
</ear>
<!-- Please add alphabetically -->
Modified: jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-13
13:25:32 UTC (rev 3867)
+++ jbpm4/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-13
13:33:58 UTC (rev 3868)
@@ -16,9 +16,6 @@
<include>aspectj:aspectjrt:jar</include>
<include>cactus:cactus</include>
<include>junit:junit</include>
- <!--include>org.jbpm.jbpm4:jbpm-api</include>
- <include>org.jbpm.jbpm4:jbpm-pvm</include>
- <include>org.jbpm.jbpm4:jbpm-log</include-->
</includes>
<unpack>false</unpack>
<scope>test</scope>
Modified:
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
===================================================================
---
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-13
13:25:32 UTC (rev 3867)
+++
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-13
13:33:58 UTC (rev 3868)
@@ -65,7 +65,7 @@
InitialContext initialContext = new InitialContext();
try {
commandExecutorHome = (LocalCommandExecutorHome) initialContext
- .lookup("java:comp/env/ejb/LocalCommandExecutor");
+ .lookup("java:jbpm/CommandExecutor");
}
finally {
initialContext.close();
Modified:
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
---
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-13
13:25:32 UTC (rev 3867)
+++
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-13
13:33:58 UTC (rev 3868)
@@ -71,8 +71,8 @@
Context initial = new InitialContext();
try {
jmsConnectionFactory = (ConnectionFactory) initial
- .lookup("java:comp/env/jms/JbpmConnectionFactory");
- commandQueue = (Destination)
initial.lookup("java:comp/env/jms/CommandQueue");
+ .lookup("ConnectionFactory");
+ commandQueue = (Destination) initial.lookup("queue/JbpmCommandQueue");
}
finally {
initial.close();
Modified: jbpm4/trunk/modules/enterprise/src/test/resources/META-INF/application.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/resources/META-INF/application.xml 2009-02-13
13:25:32 UTC (rev 3867)
+++ jbpm4/trunk/modules/enterprise/src/test/resources/META-INF/application.xml 2009-02-13
13:33:58 UTC (rev 3868)
@@ -7,10 +7,6 @@
<display-name>JBoss jBPM enterprise beans</display-name>
<module>
- <ejb>${project.build.finalName}.jar</ejb>
- </module>
-
- <module>
<web>
<web-uri>jbpm-enterprise-test.war</web-uri>
<context-root>/jbpm-enterprise-test</context-root>
Modified: jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml 2009-02-13
13:25:32 UTC (rev 3867)
+++ jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml 2009-02-13
13:33:58 UTC (rev 3868)
@@ -3,9 +3,9 @@
"http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" >
<jboss-web>
- <resource-ref>
+ <!--resource-ref>
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
<jndi-name>java:ConnectionFactory</jndi-name>
- </resource-ref>
+ </resource-ref-->
</jboss-web>
Modified: jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml 2009-02-13 13:25:32
UTC (rev 3867)
+++ jbpm4/trunk/modules/enterprise/src/test/resources/WEB-INF/web.xml 2009-02-13 13:33:58
UTC (rev 3868)
@@ -11,7 +11,7 @@
<url-pattern>/ServletRedirector</url-pattern>
</servlet-mapping>
- <ejb-local-ref>
+ <!--ejb-local-ref>
<ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<local-home>org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome</local-home>
@@ -39,5 +39,5 @@
<message-destination-type>javax.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
<message-destination-link>CommandQueue</message-destination-link>
- </message-destination-ref>
+ </message-destination-ref-->
</web-app>