[jbpm-commits] JBoss JBPM SVN: r4397 - in jbpm4/trunk/modules: examples/scripts and 24 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Apr 2 17:06:11 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-04-02 17:06:11 -0400 (Thu, 02 Apr 2009)
New Revision: 4397
Added:
jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml
Modified:
jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
jbpm4/trunk/modules/integration/jboss5/pom.xml
jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml
jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml
Log:
Fix JBPM-2141: Use same deployment archive suffixes across target containers
Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-04-02 21:06:11 UTC (rev 4397)
@@ -247,7 +247,7 @@
</fileset>
<!--
==============================
- JBoss 5
+ JBoss 500
==============================
-->
@@ -273,6 +273,13 @@
<include name="jbpm-service-jboss-beans.xml"/>
</fileset>
+ <!-- JBPM-2141 -->
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jboss5-config"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/conf/bootstrap"
+ override="true"
+ condition="isJBoss500">
+ <include name="deployers.xml"/>
+ </fileset>
<!--
==============================
Modified: jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml
===================================================================
--- jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml 2009-04-02 21:06:11 UTC (rev 4397)
@@ -12,20 +12,8 @@
<description>Example test archives</description>
- <!--
-
- Currently the JBPMDeployer in AS 4 and AS 5 uses different
- archives suffixes, hence we need to distinguish here
- -->
-
- <condition property="archive.suffix" value="jar" else="jpdl">
- <equals arg1="${jbpm.target.container}" arg2="jboss500"/>
- </condition>
-
<target name="build-jars" description="Build the test modules.">
- <echo>FIXME JBPM-2141: Deployment suffix ${archive.suffix} ***</echo>
-
<mkdir dir="${build.dir}/test-libs"/>
<!-- ConcurrencyGraphBasedTest -->
@@ -96,7 +84,7 @@
<attribute name="pkg"/>
<sequential>
- <jar destfile="${build.dir}/test-libs/jbpm-@{name}.${archive.suffix}">
+ <jar destfile="${build.dir}/test-libs/jbpm-@{name}.jpdl">
<fileset dir="${build.dir}/test-classes">
<include name="org/jbpm/examples/@{pkg}/**/*" />
<exclude name="**/process.jpdl.xml"/>
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -37,14 +37,14 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-ConcurrencyGraphBasedTest.jar");
+ deploy("jbpm-ConcurrencyGraphBasedTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-ConcurrencyGraphBasedTest.jar");
+ undeploy("jbpm-ConcurrencyGraphBasedTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -33,13 +33,13 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-EndMultipleTest.jar");
+ deploy("jbpm-EndMultipleTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-EndMultipleTest.jar");
+ undeploy("jbpm-EndMultipleTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -33,12 +33,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-EndProcessInstanceTest.jar");
+ deploy("jbpm-EndProcessInstanceTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-EndProcessInstanceTest.jar");
+ undeploy("jbpm-EndProcessInstanceTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -34,13 +34,13 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-EndStateTest.jar");
+ deploy("jbpm-EndStateTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-EndStateTest.jar");
+ undeploy("jbpm-EndStateTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -50,12 +50,12 @@
courier = new JbpmMockCourier();
MockRegistry.register("orderProcessing", "bookSold", epr, courier);
- deploy("jbpm-EsbTest.jar");
+ deploy("jbpm-EsbTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-EsbTest.jar");
+ undeploy("jbpm-EsbTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -36,13 +36,13 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-ExclusiveConditionsTest.jar");
+ deploy("jbpm-ExclusiveConditionsTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-ExclusiveConditionsTest.jar");
+ undeploy("jbpm-ExclusiveConditionsTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -36,13 +36,13 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-ExclusiveExpressionTest.jar");
+ deploy("jbpm-ExclusiveExpressionTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-ExclusiveExpressionTest.jar");
+ undeploy("jbpm-ExclusiveExpressionTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -36,12 +36,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-ExclusiveHandlerTest.jar");
+ deploy("jbpm-ExclusiveHandlerTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-ExclusiveHandlerTest.jar");
+ undeploy("jbpm-ExclusiveHandlerTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -39,12 +39,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-HqlTest.jar");
+ deploy("jbpm-HqlTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-HqlTest.jar");
+ undeploy("jbpm-HqlTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -33,12 +33,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-JavaInstantiateTest.jar");
+ deploy("jbpm-JavaInstantiateTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-JavaInstantiateTest.jar");
+ undeploy("jbpm-JavaInstantiateTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -37,13 +37,13 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-ScriptExpressionTest.jar");
+ deploy("jbpm-ScriptExpressionTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-ScriptExpressionTest.jar");
+ undeploy("jbpm-ScriptExpressionTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -36,12 +36,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-ScriptTextTest.jar");
+ deploy("jbpm-ScriptTextTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-ScriptTextTest.jar");
+ undeploy("jbpm-ScriptTextTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -39,12 +39,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-SqlTest.jar");
+ deploy("jbpm-SqlTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-SqlTest.jar");
+ undeploy("jbpm-SqlTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -33,12 +33,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-StateChoiceTest.jar");
+ deploy("jbpm-StateChoiceTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-StateChoiceTest.jar");
+ undeploy("jbpm-StateChoiceTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -33,12 +33,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-StateSequenceTest.jar");
+ deploy("jbpm-StateSequenceTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-StateSequenceTest.jar");
+ undeploy("jbpm-StateSequenceTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -38,12 +38,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-TaskAssigneeTest.jar");
+ deploy("jbpm-TaskAssigneeTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-TaskAssigneeTest.jar");
+ undeploy("jbpm-TaskAssigneeTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -34,12 +34,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-TaskAssignmentHandlerTest.jar");
+ deploy("jbpm-TaskAssignmentHandlerTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-TaskAssignmentHandlerTest.jar");
+ undeploy("jbpm-TaskAssignmentHandlerTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -37,7 +37,7 @@
{
super.setUp();
- deploy("jbpm-TaskCandidatesTest.jar");
+ deploy("jbpm-TaskCandidatesTest.jpdl");
if(identityService.findGroupById("sales-test-group")==null)
{
@@ -54,7 +54,7 @@
protected void tearDown() throws Exception
{
- undeploy("jbpm-TaskCandidatesTest.jar");
+ undeploy("jbpm-TaskCandidatesTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -35,7 +35,7 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-TaskSwimlaneTest.jar");
+ deploy("jbpm-TaskSwimlaneTest.jpdl");
if(identityService.findGroupById("sales-test-group")==null)
{
@@ -49,7 +49,7 @@
protected void tearDown() throws Exception
{
- undeploy("jbpm-TaskSwimlaneTest.jar");
+ undeploy("jbpm-TaskSwimlaneTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-04-02 21:06:11 UTC (rev 4397)
@@ -41,12 +41,12 @@
protected void setUp() throws Exception
{
super.setUp();
- deploy("jbpm-TaskVariablesTest.jar");
+ deploy("jbpm-TaskVariablesTest.jpdl");
}
protected void tearDown() throws Exception
{
- undeploy("jbpm-TaskVariablesTest.jar");
+ undeploy("jbpm-TaskVariablesTest.jpdl");
super.tearDown();
}
Modified: jbpm4/trunk/modules/integration/jboss5/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/jboss5/pom.xml 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/integration/jboss5/pom.xml 2009-04-02 21:06:11 UTC (rev 4397)
@@ -60,7 +60,8 @@
<excludes>
<exclude>META-INF/jbpm-service-jboss-beans.xml</exclude>
<exclude>META-INF/jbpm-deployers-jboss-beans.xml</exclude>
- <exclude>META-INF/jbpm.deployer.cfg.xml</exclude>
+ <exclude>META-INF/jbpm.deployer.cfg.xml</exclude>
+ <exclude>deployers.xml</exclude>
</excludes>
</configuration>
</plugin>
Modified: jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml
===================================================================
--- jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml 2009-04-02 21:06:11 UTC (rev 4397)
@@ -12,6 +12,7 @@
<includes>
<include>**/*beans.xml</include>
<include>**/jbpm.deployer.cfg.xml</include>
+ <include>deployers.xml</include>
</includes>
</fileSet>
</fileSets>
Modified: jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml
===================================================================
--- jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml 2009-04-02 20:21:54 UTC (rev 4396)
+++ jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml 2009-04-02 21:06:11 UTC (rev 4397)
@@ -28,7 +28,7 @@
<property name="suffix">.jpdl.xml</property>
<!-- Move to .par when https://jira.jboss.org/jira/browse/JBAS-6274 is done -->
- <property name="jarExtension">jar</property>
+ <property name="jarExtension">jpdl</property>
<property name="allowMultipleFiles">true</property>
Added: jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml
===================================================================
--- jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml (rev 0)
+++ jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml 2009-04-02 21:06:11 UTC (rev 4397)
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The base deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="deployers-classloader:0.0.0"/></classloader>
+
+ <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-core.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-client.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
+ <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
+
+ <!-- JAXB impl here, api is in endorsed -->
+ <root>${jboss.lib.url}jaxb-impl.jar</root>
+ <!-- STAX2 impl here, api is in endorsed -->
+ <root>${jboss.lib.url}wstx.jar</root>
+ </classloader>
+
+ <!-- use legacy ordering -->
+ <bean name="topContextComparator">
+ <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The ManagedObjectFactory -->
+ <bean name="ManagedObjectFactory">
+ <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+ <!-- Accept any implementor of InstanceClassFactory -->
+ <incallback method="addInstanceClassFactory"/>
+ <uncallback method="removeInstanceClassFactory"/>
+ <!-- Accept any ManagedObjectDefinition -->
+ <incallback method="addManagedObjectDefinition"/>
+ <uncallback method="removeManagedObjectDefinition"/>
+ </bean>
+ <!-- The ManagedObjectCreator implementation -->
+ <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
+ <property name="mof"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
+
+ <!-- The MainDeployer -->
+ <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+ <property name="deployers"><inject bean="Deployers"/></property>
+ <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+ <property name="comparator"><inject bean="topContextComparator"/></property>
+ </bean>
+
+ <!-- The ManagedDeploymentCreator implementation that supports mapping
+ attachment types to ManagedDeployment#getTypes
+ -->
+ <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
+
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
+ </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation>
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
+ </bean>
+
+ <!-- A declared structure descriptor deployer -->
+ <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>.zip</value>
+ <value>.ear</value>
+ <value>.jar</value>
+ <value>.rar</value>
+ <value>.war</value>
+ <value>.sar</value>
+ <value>.har</value>
+ <value>.aop</value>
+ <value>.deployer</value>
+ <value>.beans</value>
+
+ <!-- FIXME remove this once JBAS-6274 is done -->
+ <value>.spring</value>
+ <value>.rails</value>
+ <value>.esb</value>
+ <value>.jpdl</value>
+ </set>
+ </parameter>
+ </constructor>
+ <property name="candidateStructureVisitorFactory">
+ <!-- Any file that is not an ordinary directory is a candidate -->
+ <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+ <!-- A filter to exclude some obvious non-subdeployments -->
+ <property name="filter">
+ <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+ <constructor><parameter>
+ <list elementClass="java.lang.String">
+ <!-- Exclude class files as subdeployments -->
+ <value>.class</value>
+ </list>
+ </parameter></constructor>
+ </bean>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-service.xml</value>
+ <value>-beans.xml</value>
+ <value>-ds.xml</value>
+ <value>-aop.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- Old AOP deployment
+ <bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
+ <bean name="AspectDeployer" class="org.jboss.aop.asintegration.jboss5.AspectDeployer">
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+ -->
+
+ <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter>
+ </constructor>
+ <property name="suffix">-aop.xml</property>
+ </bean>
+ <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
+ <constructor>
+ <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+ <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+ <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
+ </bean>
+
+ <!-- POJO Deployment -->
+ <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
+ <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
+ </bean>
+ <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
+ <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
+ </bean>
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="suffix">jboss-beans.xml</property>
+ </bean>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
+ </parameter>
+ <parameter>
+ <value>beans</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
+ </parameter>
+ </uninstall>
+ <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
+ </bean>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ </bean>
+
+ <!-- JMX Deployment -->
+ <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+ <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
+ </bean>
+ <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/>
+ <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
+ </bean>
+ <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
+ <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
+ </bean>
+
+ <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+ <constructor>
+ <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+ </constructor>
+ <property name="name">jboss-classloading.xml</property>
+ <property name="buildManagedObject">true</property>
+ </bean>
+ <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+ <property name="defaultMetaData">
+ <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
+ </property>
+ </bean>
+ <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
+ <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ </bean>
+ <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
+ <property name="system"><inject bean="ClassLoaderSystem"/></property>
+ </bean>
+
+</deployment>
More information about the jbpm-commits
mailing list