[jbpm-commits] JBoss JBPM SVN: r3867 - in jbpm4/branches/hbraun/modules/enterprise: scripts and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 13 08:25:32 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-02-13 08:25:32 -0500 (Fri, 13 Feb 2009)
New Revision: 3867
Modified:
jbpm4/branches/hbraun/modules/enterprise/pom.xml
jbpm4/branches/hbraun/modules/enterprise/scripts/antrun-test-jars.xml
jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml
jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
jbpm4/branches/hbraun/modules/enterprise/src/test/resources/META-INF/application.xml
jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml
jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/web.xml
Log:
Use global JNDI names in enterprise tests to avoid resource-ref juggling in AS 5
Modified: jbpm4/branches/hbraun/modules/enterprise/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/pom.xml 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/scripts/antrun-test-jars.xml 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/scripts/antrun-test-jars.xml 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/scripts/assembly-test-dependencies.xml 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandExecutorTest.java 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/CommandReceiverTest.java 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/src/test/resources/META-INF/application.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/test/resources/META-INF/application.xml 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/META-INF/application.xml 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/jboss-web.xml 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/web.xml
===================================================================
--- jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/web.xml 2009-02-13 11:13:34 UTC (rev 3866)
+++ jbpm4/branches/hbraun/modules/enterprise/src/test/resources/WEB-INF/web.xml 2009-02-13 13:25:32 UTC (rev 3867)
@@ -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>
More information about the jbpm-commits
mailing list