[jbpm-commits] JBoss JBPM SVN: r3568 - in jbpm4/trunk/modules: enterprise/scripts and 15 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-12-29 04:27:38 -0500 (Mon, 29 Dec 2008) New Revision: 3568 Added: jbpm4/trunk/modules/enterprise/scripts/ jbpm4/trunk/modules/enterprise/src/main/etc/ jbpm4/trunk/modules/enterprise/src/main/etc/ear/ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml jbpm4/trunk/modules/enterprise/src/main/etc/war/ jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/ jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties Removed: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ejb-jar.xml jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jboss.xml jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jbosscmp-jdbc.xml jbpm4/trunk/modules/pvm/scripts/ jbpm4/trunk/modules/pvm/src/main/docs/ jbpm4/trunk/modules/pvm/src/main/etc/ jbpm4/trunk/modules/pvm/src/test/config/ jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/ jbpm4/trunk/modules/pvm/src/test/resources/enterprise/WEB-INF/ Modified: jbpm4/trunk/modules/enterprise/pom.xml jbpm4/trunk/modules/examples/src/test/resources/logging.properties jbpm4/trunk/modules/pvm/pom.xml Log: moved enterprise stuff to enterprise module Modified: jbpm4/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm4/trunk/modules/enterprise/pom.xml 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/enterprise/pom.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -102,12 +102,33 @@ <showDeprecation>false</showDeprecation> </configuration> </plugin> + <!-- <plugin> <artifactId>maven-ear-plugin</artifactId> <configuration> <applicationXml>${basedir}/src/main/etc/ear/META-INF/application.xml</applicationXml> </configuration> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <ant antfile="scripts/build-jars-pvm.xml" target="build-jars-pvm" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + --> </plugins> </build> @@ -115,20 +136,4 @@ <profiles> </profiles> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <source>1.5</source> - <verbose>false</verbose> - <noqualifier>all</noqualifier> - <excludePackageNames>*.internal:*.test</excludePackageNames> - </configuration> - </plugin> - </plugins> - </reporting> - </project> \ No newline at end of file Copied: jbpm4/trunk/modules/enterprise/scripts (from rev 3567, jbpm4/trunk/modules/pvm/scripts) Property changes on: jbpm4/trunk/modules/enterprise/scripts ___________________________________________________________________ Name: svn:mergeinfo + Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF) Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ejb-jar.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/ejb-jar.xml 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/ejb-jar.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<ejb-jar version="2.1" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee"> - - <description>JBoss jBPM enterprise beans</description> - <display-name>JBoss jBPM enterprise beans</display-name> - - <enterprise-beans> - - <session> - <description>JBoss jBPM Command Executor SLSB</description> - <display-name>JBoss jBPM Command Executor SLSB</display-name> - <ejb-name>CommandExecutor</ejb-name> - <home>org.jbpm.pvm.internal.ejb.RemoteCommandExecutorHome</home> - <remote>org.jbpm.pvm.internal.ejb.RemoteCommandExecutor</remote> - <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> - <ejb-class>org.jbpm.pvm.internal.ejb.CommandExecutorSLSB</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - <ejb-local-ref> - <ejb-ref-name>ejb/LocalTimer</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalTimer</local> - <ejb-link>Timer</ejb-link> - </ejb-local-ref> - </session> - - <message-driven> - <description>JBoss jBPM Command Receiver MDB</description> - <ejb-name>CommandReceiver</ejb-name> - <ejb-class>org.jbpm.pvm.internal.ejb.CommandReceiverMDB</ejb-class> - <transaction-type>Container</transaction-type> - <message-destination-type>javax.jms.Queue</message-destination-type> - <ejb-local-ref> - <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> - <ejb-link>CommandExecutor</ejb-link> - </ejb-local-ref> - <resource-ref> - <res-ref-name>jms/CommandConnectionFactory</res-ref-name> - <res-type>javax.jms.ConnectionFactory</res-type> - <res-auth>Container</res-auth> - <res-sharing-scope>Shareable</res-sharing-scope> - </resource-ref> - <message-destination-ref> - <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> - <message-destination-type>javax.jms.Queue</message-destination-type> - <message-destination-usage>Produces</message-destination-usage> - </message-destination-ref> - </message-driven> - - <entity> - <display-name>JBoss jBPM Timer EB</display-name> - <ejb-name>Timer</ejb-name> - <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalTimer</local> - <ejb-class>org.jbpm.pvm.internal.ejb.TimerEB</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Long</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>pvm</abstract-schema-name> - <cmp-field> - <field-name>dbid</field-name> - </cmp-field> - <cmp-field> - <field-name>dueDate</field-name> - </cmp-field> - <!-- - <cmp-field> - <field-name>dbversion</field-name> - </cmp-field> - --> - <primkey-field>dbid</primkey-field> - <ejb-local-ref> - <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> - <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> - <ejb-link>CommandExecutor</ejb-link> - </ejb-local-ref> - </entity> - - </enterprise-beans> - - <assembly-descriptor> - - <container-transaction> - <method> - <ejb-name>CommandExecutor</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - - <container-transaction> - <method> - <ejb-name>CommandReceiver</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - - <container-transaction> - <method> - <ejb-name>Timer</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - - </assembly-descriptor> - -</ejb-jar> Deleted: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jboss.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jboss.xml 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jboss.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <enterprise-beans> - - <session> - <ejb-name>CommandExecutor</ejb-name> - <jndi-name>jbpm/CommandExecutor</jndi-name> - <local-jndi-name>java:jbpm/CommandExecutor</local-jndi-name> - </session> - - <message-driven> - <ejb-name>CommandReceiver</ejb-name> - <destination-jndi-name>queue/JbpmCommandQueue</destination-jndi-name> - <resource-ref> - <res-ref-name>jms/CommandConnectionFactory</res-ref-name> - <jndi-name>java:JmsXA</jndi-name> - </resource-ref> - <message-destination-ref> - <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> - <jndi-name>queue/DLQ</jndi-name> - </message-destination-ref> - </message-driven> - - <entity> - <ejb-name>Timer</ejb-name> - <local-jndi-name>java:jbpm/Timer</local-jndi-name> - </entity> - - </enterprise-beans> - -</jboss> Deleted: jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jbosscmp-jdbc.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jbosscmp-jdbc.xml 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/enterprise/src/main/etc/ear/META-INF/jbosscmp-jdbc.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -1,35 +0,0 @@ -<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd"> - -<jbosscmp-jdbc> - <defaults> - <datasource>java:DefaultDS</datasource> - <datasource-mapping>Hypersonic SQL</datasource-mapping> - <create-table>false</create-table> - </defaults> - <enterprise-beans> - <entity> - <ejb-name>Timer</ejb-name> - <!-- - <read-only>true</read-only> - --> - <table-name>JBPM_JOB</table-name> - <cmp-field> - <field-name>dbid</field-name> - <column-name>DBID_</column-name> - <auto-increment/> - </cmp-field> - <cmp-field> - <field-name>dueDate</field-name> - <column-name>DUEDATE_</column-name> - </cmp-field> - <!-- - <optimistic-locking> - <version-column /> - <field-name>dbversion</field-name> - <column-name>DBVERSION_</column-name> - </optimistic-locking> - --> - </entity> - </enterprise-beans> -</jbosscmp-jdbc> \ No newline at end of file Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/ejb-jar.xml) =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<ejb-jar version="2.1" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee"> + + <description>JBoss jBPM enterprise beans</description> + <display-name>JBoss jBPM enterprise beans</display-name> + + <enterprise-beans> + + <session> + <description>JBoss jBPM Command Executor SLSB</description> + <display-name>JBoss jBPM Command Executor SLSB</display-name> + <ejb-name>CommandExecutor</ejb-name> + <home>org.jbpm.pvm.internal.ejb.RemoteCommandExecutorHome</home> + <remote>org.jbpm.pvm.internal.ejb.RemoteCommandExecutor</remote> + <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> + <ejb-class>org.jbpm.pvm.internal.ejb.CommandExecutorSLSB</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + <ejb-local-ref> + <ejb-ref-name>ejb/LocalTimer</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalTimer</local> + <ejb-link>Timer</ejb-link> + </ejb-local-ref> + </session> + + <message-driven> + <description>JBoss jBPM Command Receiver MDB</description> + <ejb-name>CommandReceiver</ejb-name> + <ejb-class>org.jbpm.pvm.internal.ejb.CommandReceiverMDB</ejb-class> + <transaction-type>Container</transaction-type> + <message-destination-type>javax.jms.Queue</message-destination-type> + <ejb-local-ref> + <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> + <ejb-link>CommandExecutor</ejb-link> + </ejb-local-ref> + <resource-ref> + <res-ref-name>jms/CommandConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnectionFactory</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> + <message-destination-ref> + <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + </message-destination-ref> + </message-driven> + + <entity> + <display-name>JBoss jBPM Timer EB</display-name> + <ejb-name>Timer</ejb-name> + <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalTimer</local> + <ejb-class>org.jbpm.pvm.internal.ejb.TimerEB</ejb-class> + <persistence-type>Container</persistence-type> + <prim-key-class>java.lang.Long</prim-key-class> + <reentrant>false</reentrant> + <cmp-version>2.x</cmp-version> + <abstract-schema-name>pvm</abstract-schema-name> + <cmp-field> + <field-name>dbid</field-name> + </cmp-field> + <cmp-field> + <field-name>dueDate</field-name> + </cmp-field> + <!-- + <cmp-field> + <field-name>dbversion</field-name> + </cmp-field> + --> + <primkey-field>dbid</primkey-field> + <ejb-local-ref> + <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> + <ejb-link>CommandExecutor</ejb-link> + </ejb-local-ref> + </entity> + + </enterprise-beans> + + <assembly-descriptor> + + <container-transaction> + <method> + <ejb-name>CommandExecutor</ejb-name> + <method-name>*</method-name> + </method> + <trans-attribute>Required</trans-attribute> + </container-transaction> + + <container-transaction> + <method> + <ejb-name>CommandReceiver</ejb-name> + <method-name>*</method-name> + </method> + <trans-attribute>Required</trans-attribute> + </container-transaction> + + <container-transaction> + <method> + <ejb-name>Timer</ejb-name> + <method-name>*</method-name> + </method> + <trans-attribute>Required</trans-attribute> + </container-transaction> + + </assembly-descriptor> + +</ejb-jar> Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/ejb-jar.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jboss.xml) =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <enterprise-beans> + + <session> + <ejb-name>CommandExecutor</ejb-name> + <jndi-name>jbpm/CommandExecutor</jndi-name> + <local-jndi-name>java:jbpm/CommandExecutor</local-jndi-name> + </session> + + <message-driven> + <ejb-name>CommandReceiver</ejb-name> + <destination-jndi-name>queue/JbpmCommandQueue</destination-jndi-name> + <resource-ref> + <res-ref-name>jms/CommandConnectionFactory</res-ref-name> + <jndi-name>java:JmsXA</jndi-name> + </resource-ref> + <message-destination-ref> + <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> + <jndi-name>queue/DLQ</jndi-name> + </message-destination-ref> + </message-driven> + + <entity> + <ejb-name>Timer</ejb-name> + <local-jndi-name>java:jbpm/Timer</local-jndi-name> + </entity> + + </enterprise-beans> + +</jboss> Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/enterprise/META-INF/jbosscmp-jdbc.xml) =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -0,0 +1,35 @@ +<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_4_0.dtd"> + +<jbosscmp-jdbc> + <defaults> + <datasource>java:DefaultDS</datasource> + <datasource-mapping>Hypersonic SQL</datasource-mapping> + <create-table>false</create-table> + </defaults> + <enterprise-beans> + <entity> + <ejb-name>Timer</ejb-name> + <!-- + <read-only>true</read-only> + --> + <table-name>JBPM_JOB</table-name> + <cmp-field> + <field-name>dbid</field-name> + <column-name>DBID_</column-name> + <auto-increment/> + </cmp-field> + <cmp-field> + <field-name>dueDate</field-name> + <column-name>DUEDATE_</column-name> + </cmp-field> + <!-- + <optimistic-locking> + <version-column /> + <field-name>dbversion</field-name> + <column-name>DBVERSION_</column-name> + </optimistic-locking> + --> + </entity> + </enterprise-beans> +</jbosscmp-jdbc> \ No newline at end of file Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/ejbjar/META-INF/jbosscmp-jdbc.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Property changes on: jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF ___________________________________________________________________ Name: svn:mergeinfo + Added: jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/jboss-web.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd" > +<jboss-web> + + <resource-ref> + <res-ref-name>jms/CommandConnectionFactory</res-ref-name> + <jndi-name>java:ConnectionFactory</jndi-name> + </resource-ref> + + <message-destination-ref> + <message-destination-ref-name>jms/CommandQueue</message-destination-ref-name> + <jndi-name>queue/JbpmCommandQueue</jndi-name> + </message-destination-ref> + +</jboss-web> Added: jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml =================================================================== --- jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml (rev 0) +++ jbpm4/trunk/modules/enterprise/src/main/etc/war/WEB-INF/web.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -0,0 +1,46 @@ +<?xml version="1.0"?> + +<web-app version="2.4" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee"> + + <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> + + <ejb-local-ref> + <ejb-ref-name>ejb/LocalCommandExecutor</ejb-ref-name> + <ejb-ref-type>Session</ejb-ref-type> + <local-home>org.jbpm.pvm.internal.ejb.LocalCommandExecutorHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalCommandExecutor</local> + <ejb-link>CommandExecutor</ejb-link> + </ejb-local-ref> + + <ejb-local-ref> + <ejb-ref-name>ejb/LocalTimer</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <local-home>org.jbpm.pvm.internal.ejb.LocalTimerHome</local-home> + <local>org.jbpm.pvm.internal.ejb.LocalTimer</local> + <ejb-link>Timer</ejb-link> + </ejb-local-ref> + + <resource-ref> + <res-ref-name>jms/CommandConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnectionFactory</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> + + <message-destination-ref> + <message-destination-ref-name>jms/CommandQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + </message-destination-ref> + +</web-app> \ No newline at end of file Copied: jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties (from rev 3567, jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties) =================================================================== --- jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties (rev 0) +++ jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties 2008-12-29 09:27:38 UTC (rev 3568) @@ -0,0 +1 @@ +cactus.contextURL = http://localhost:8080/pvm-enterprise-test \ No newline at end of file Property changes on: jbpm4/trunk/modules/enterprise/src/test/resources/cactus.properties ___________________________________________________________________ Name: svn:mergeinfo + Modified: jbpm4/trunk/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2008-12-29 09:27:38 UTC (rev 3568) @@ -14,7 +14,7 @@ # For example, set the com.xyz.foo logger to only log SEVERE messages: # com.xyz.foo.level = SEVERE -org.jbpm.level=FINEST +org.jbpm.level=INFO org.jbpm.pvm.internal.tx.level=FINE org.jbpm.pvm.internal.wire.level=FINE org.jbpm.pvm.internal.util.level=FINE @@ -22,7 +22,7 @@ org.hibernate.level=INFO org.hibernate.cfg.HbmBinder.level=SEVERE org.hibernate.cfg.SettingsFactory.level=SEVERE -org.hibernate.SQL.level=FINEST +# org.hibernate.SQL.level=FINEST # org.hibernate.type.level=FINEST # org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST # org.hibernate.transaction.level=FINEST Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/pvm/pom.xml 2008-12-29 09:27:38 UTC (rev 3568) @@ -95,49 +95,12 @@ <build> <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> - <ant antfile="scripts/build-jars-pvm.xml" target="build-jars-pvm" /> - </tasks> - </configuration> - </execution> - <execution> - <id>rename-tables</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <replace dir="target/classes" includes="**/hibernate.*.hbm.xml" token="table=&quot;JBPM_" value="table=&quot;${table.prefix}" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> <showDeprecation>false</showDeprecation> </configuration> </plugin> <plugin> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <applicationXml>${basedir}/src/main/etc/ear/META-INF/application.xml</applicationXml> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties 2008-12-29 01:26:51 UTC (rev 3567) +++ jbpm4/trunk/modules/pvm/src/test/resources/cactus.properties 2008-12-29 09:27:38 UTC (rev 3568) @@ -1 +0,0 @@ -cactus.contextURL = http://localhost:8080/pvm-enterprise-test \ No newline at end of file