Author: alex.guizar(a)jboss.com Date: 2011-01-26 02:23:02 -0500 (Wed, 26 Jan 2011) New Revision: 6886 Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-clustered-jbm-service.xml jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml Log: remove references to soa and esb from enterprise module, second take Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-clustered-jbm-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-clustered-jbm-service.xml 2011-01-22 09:16:50 UTC (rev 6885) +++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-clustered-jbm-service.xml 2011-01-26 07:23:02 UTC (rev 6886) @@ -1,33 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <server> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.jbpm.destination:service=Queue,name=JbpmDLQ" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="Clustered">true</attribute> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmDLQ" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="Clustered">true</attribute> - </mbean> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="Clustered">true</attribute> - <attribute name="RedeliveryDelay">60000</attribute> - <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> - </mbean> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmJobQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="Clustered">true</attribute> - <attribute name="RedeliveryDelay">60000</attribute> - <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> - </mbean> - + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.jbpm.destination:service=Queue,name=JbpmCommandQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="Clustered">true</attribute> + <attribute name="RedeliveryDelay">60000</attribute> + <attribute name="DLQ">jboss.jbpm.destination:service=Queue,name=JbpmDLQ</attribute> + </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.jbpm.destination:service=Queue,name=JbpmJobQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="Clustered">true</attribute> + <attribute name="RedeliveryDelay">60000</attribute> + <attribute name="DLQ">jboss.jbpm.destination:service=Queue,name=JbpmDLQ</attribute> + </mbean> </server> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml 2011-01-22 09:16:50 UTC (rev 6885) +++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml 2011-01-26 07:23:02 UTC (rev 6886) @@ -12,29 +12,29 @@ <server> <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmDLQ" + name="jboss.jbpm.destination:service=Queue,name=JbpmDLQ" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <depends>jboss.messaging:service=PostOffice</depends> </mbean> <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmJobQueue" + name="jboss.jbpm.destination:service=Queue,name=JbpmJobQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <depends>jboss.messaging:service=PostOffice</depends> <!-- JBPM-1952 a small redelivery delay goes a long way towards mitigating stale state exceptions and deadlocks under heavy concurrency conditions --> <attribute name="RedeliveryDelay">5000</attribute> - <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> + <attribute name="DLQ">jboss.jbpm.destination:service=Queue,name=JbpmDLQ</attribute> </mbean> <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue" + name="jboss.jbpm.destination:service=Queue,name=JbpmCommandQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <depends>jboss.messaging:service=PostOffice</depends> <attribute name="RedeliveryDelay">5000</attribute> - <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> + <attribute name="DLQ">jboss.jbpm.destination:service=Queue,name=JbpmDLQ</attribute> </mbean> </server> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2011-01-22 09:16:50 UTC (rev 6885) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2011-01-26 07:23:02 UTC (rev 6886) @@ -45,14 +45,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> </build> Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2011-01-22 09:16:50 UTC (rev 6885) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2011-01-26 07:23:02 UTC (rev 6886) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"> <enterprise-beans> @@ -8,7 +7,7 @@ <description>Executes commands in a separate context.</description> <display-name>jBPM Command Service</display-name> <ejb-name>CommandServiceBean</ejb-name> - + <resource-ref> <description> Data source that provides the persistence service with connections. @@ -52,14 +51,14 @@ <activation-config-property-value>150</activation-config-property-value> </activation-config-property> <activation-config-property> - <activation-config-property-name>dLQJNDIName</activation-config-property-name> - <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value> - </activation-config-property> - <activation-config-property> - <activation-config-property-name>destination</activation-config-property-name> - <activation-config-property-value>queue/JbpmCommandQueue</activation-config-property-value> - </activation-config-property> + <activation-config-property-name>dLQJNDIName</activation-config-property-name> + <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value> + </activation-config-property> <activation-config-property> + <activation-config-property-name>destination</activation-config-property-name> + <activation-config-property-value>queue/JbpmCommandQueue</activation-config-property-value> + </activation-config-property> + <activation-config-property> <activation-config-property-name>destinationType</activation-config-property-name> <activation-config-property-value>javax.jms.Queue</activation-config-property-value> </activation-config-property> @@ -88,14 +87,14 @@ <activation-config-property-value>150</activation-config-property-value> </activation-config-property> <activation-config-property> - <activation-config-property-name>dLQJNDIName</activation-config-property-name> - <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value> - </activation-config-property> + <activation-config-property-name>dLQJNDIName</activation-config-property-name> + <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value> + </activation-config-property> <activation-config-property> - <activation-config-property-name>destination</activation-config-property-name> - <activation-config-property-value>queue/JbpmJobQueue</activation-config-property-value> - </activation-config-property> - <activation-config-property> + <activation-config-property-name>destination</activation-config-property-name> + <activation-config-property-value>queue/JbpmJobQueue</activation-config-property-value> + </activation-config-property> + <activation-config-property> <activation-config-property-name>destinationType</activation-config-property-name> <activation-config-property-value>javax.jms.Queue</activation-config-property-value> </activation-config-property>