Author: alex.guizar(a)jboss.com Date: 2008-11-18 13:47:41 -0500 (Tue, 18 Nov 2008) New Revision: 2987 Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/main/resources/jar/META-INF/jboss.xml jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AppServerConfigurationsTest.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerRepeatTest.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerTest.java jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/webapp/WEB-INF/web.xml Log: JBPM-1179: got JtaDbPersistenceTest to work on the soa branch moved local-jndi-names to the java: namespace Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/main/resources/jar/META-INF/jboss.xml =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/main/resources/jar/META-INF/jboss.xml 2008-11-18 14:24:01 UTC (rev 2986) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/main/resources/jar/META-INF/jboss.xml 2008-11-18 18:47:41 UTC (rev 2987) @@ -7,13 +7,13 @@ <session> <ejb-name>CommandServiceBean</ejb-name> <jndi-name>ejb/CommandServiceBean</jndi-name> - <local-jndi-name>CommandServiceBean</local-jndi-name> + <local-jndi-name>java:ejb/CommandServiceBean</local-jndi-name> </session> <entity> <ejb-name>TimerEntityBean</ejb-name> <jndi-name>ejb/TimerEntityBean</jndi-name> - <local-jndi-name>TimerEntityBean</local-jndi-name> + <local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name> </entity> <message-driven> Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AppServerConfigurationsTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AppServerConfigurationsTest.java 2008-11-18 14:24:01 UTC (rev 2986) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AppServerConfigurationsTest.java 2008-11-18 18:47:41 UTC (rev 2987) @@ -46,6 +46,6 @@ public void testTransactionsDisabled() { DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE); - assertTrue(dbPersistenceServiceFactory.isTransactionEnabled()); + assertFalse(dbPersistenceServiceFactory.isTransactionEnabled()); } } Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java 2008-11-18 14:24:01 UTC (rev 2986) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/AsyncProcessingTest.java 2008-11-18 18:47:41 UTC (rev 2987) @@ -74,7 +74,7 @@ Object returnValue; try { InitialContext initialContext = new InitialContext(); - LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("CommandServiceBean"); + LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); LocalCommandService localCommandService = localCommandServiceHome.create(); returnValue = localCommandService.execute(command); localCommandService.remove(); Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerRepeatTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerRepeatTest.java 2008-11-18 14:24:01 UTC (rev 2986) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerRepeatTest.java 2008-11-18 18:47:41 UTC (rev 2987) @@ -76,7 +76,7 @@ Object returnValue; try { InitialContext initialContext = new InitialContext(); - LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("CommandServiceBean"); + LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); LocalCommandService localCommandService = localCommandServiceHome.create(); returnValue = localCommandService.execute(command); localCommandService.remove(); Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerTest.java 2008-11-18 14:24:01 UTC (rev 2986) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/java/org/jbpm/msg/TimerTest.java 2008-11-18 18:47:41 UTC (rev 2987) @@ -50,7 +50,7 @@ Object returnValue; try { InitialContext initialContext = new InitialContext(); - LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("CommandServiceBean"); + LocalCommandServiceHome localCommandServiceHome = (LocalCommandServiceHome) initialContext.lookup("java:comp/env/ejb/LocalCommandServiceBean"); LocalCommandService localCommandService = localCommandServiceHome.create(); returnValue = localCommandService.execute(command); localCommandService.remove(); Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/webapp/WEB-INF/web.xml =================================================================== --- jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/webapp/WEB-INF/web.xml 2008-11-18 14:24:01 UTC (rev 2986) +++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/enterprise/src/test/webapp/WEB-INF/web.xml 2008-11-18 18:47:41 UTC (rev 2987) @@ -1,19 +1,35 @@ <?xml version="1.0"?> - -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd"> <web-app> - <servlet> - <servlet-name>ServletRedirector</servlet-name> - <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class> - </servlet> + <servlet> + <servlet-name>ServletRedirector</servlet-name> + <servlet-class> + org.apache.cactus.server.ServletTestRedirector + </servlet-class> + </servlet> - <servlet-mapping> - <servlet-name>ServletRedirector</servlet-name> - <url-pattern>/ServletRedirector</url-pattern> - </servlet-mapping> + <servlet-mapping> + <servlet-name>ServletRedirector</servlet-name> + <url-pattern>/ServletRedirector</url-pattern> + </servlet-mapping> + <ejb-local-ref> + <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> + <local>org.jbpm.ejb.LocalTimerEntity</local> + <ejb-link>TimerEntityBean</ejb-link> + </ejb-local-ref> + + <ejb-local-ref> + <ejb-ref-name>ejb/LocalCommandServiceBean</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <local-home>org.jbpm.ejb.LocalCommandServiceHome</local-home> + <local>org.jbpm.ejb.LocalCommandService</local> + <ejb-link>CommandServiceBean</ejb-link> + </ejb-local-ref> + </web-app> \ No newline at end of file