[jbpm-commits] JBoss JBPM SVN: r4753 - in jbpm4/trunk: modules/db and 26 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu May 7 03:54:19 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-05-07 03:54:18 -0400 (Thu, 07 May 2009)
New Revision: 4753

Added:
   jbpm4/trunk/modules/integration/form-plugin/
   jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
   jbpm4/trunk/modules/integration/form-plugin/pom.xml
   jbpm4/trunk/modules/integration/form-plugin/src/
   jbpm4/trunk/modules/integration/form-plugin/src/main/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin
Removed:
   jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
   jbpm4/trunk/modules/integration/form-plugin/pom.xml
   jbpm4/trunk/modules/integration/form-plugin/src/
   jbpm4/trunk/modules/integration/form-plugin/src/main/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/
   jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin
Modified:
   jbpm4/trunk/modules/db/jbpm4-db.iml
   jbpm4/trunk/modules/distro/pom.xml
   jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
   jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml
   jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml
   jbpm4/trunk/modules/examples/jbpm4-examples.iml
   jbpm4/trunk/modules/integration/console/pom.xml
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
   jbpm4/trunk/modules/integration/integration.iml
   jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml
   jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml
   jbpm4/trunk/modules/integration/pom.xml
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/AbstractServerConfig.java
   jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfig.java
   jbpm4/trunk/modules/test-base/test-base.iml
   jbpm4/trunk/modules/test-db/jbpm4-test-db.iml
   jbpm4/trunk/pom.xml
Log:
FormDispatcherPlugin Impl., first cut

Modified: jbpm4/trunk/modules/db/jbpm4-db.iml
===================================================================
--- jbpm4/trunk/modules/db/jbpm4-db.iml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/db/jbpm4-db.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -9,11 +9,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="toplevel" />
-    <orderEntry type="module" module-name="api" />
     <orderEntry type="module" module-name="jpdl" />
     <orderEntry type="module" module-name="test-base" />
     <orderEntry type="module" module-name="pvm" />
+    <orderEntry type="module" module-name="toplevel" />
     <orderEntry type="module-library" exported="">
       <library name="M2 Dep: junit:junit:jar:3.8.1:compile">
         <CLASSES>
@@ -24,24 +23,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
@@ -51,15 +32,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm:jar:1.5.3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
@@ -69,15 +41,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
@@ -89,33 +52,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
@@ -163,240 +99,224 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
+      <library name="M2 Dep: javassist:javassist:jar:3.4.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile">
+      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:compile">
+      <library name="M2 Dep: mysql:mysql-connector-java:jar:5.0.8:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/mysql/mysql-connector-java/5.0.8/mysql-connector-java-5.0.8.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+      <library name="M2 Dep: net.sourceforge.jtds:jtds:jar:1.2.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javassist:javassist:jar:3.4.GA:compile">
+      <library name="M2 Dep: postgresql:postgresql:jar:8.3-603.jdbc3:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: mysql:mysql-connector-java:jar:5.0.8:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/mysql/mysql-connector-java/5.0.8/mysql-connector-java-5.0.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sourceforge.jtds:jtds:jar:1.2.2:compile">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sourceforge/jtds/jtds/1.2.2/jtds-1.2.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: postgresql:postgresql:jar:8.3-603.jdbc3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
+      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile">
+      <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile">
+      <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.mail:mail:jar:1.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile">
+      <library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile">
+      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:compile">
+      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntryProperties />

Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/distro/pom.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -49,6 +49,17 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-console-form-plugin</artifactId>
+      <version>${version}</version>
+    </dependency>
+     <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-console-integration</artifactId>
+       <classifier>config</classifier>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-jboss4</artifactId>
       <version>${version}</version>
     </dependency>
@@ -83,6 +94,11 @@
     </dependency>
 
     <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <scope>test</scope>

Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -127,6 +127,8 @@
     <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true">
       <fileset dir="${jbpm.home}/lib">
         <include name="jbpm-console-integration.jar" />
+        <include name="jbpm-console-form-plugin.jar" />
+        <include name="freemarker.jar" />
         <include name="livetribe-jsr223.jar" />
         <include name="juel*.jar" />
       </fileset>

Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss4/deploy/jbpm/jbpm-service.sar/jboss-beans.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -24,7 +24,8 @@
      ServerConfig
   -->
   <bean name="org.jbpm:service=ServerConfig"
-        class="org.jbpm.integration.jboss4.mgmt.ServerConfig">    
+        class="org.jbpm.integration.jboss4.mgmt.ServerConfig">
+    <property name="webServiceHost">${jboss.bind.address}</property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/config.jboss5/deploy/jbpm/jbpm-service.sar/jbpm-service-jboss-beans.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -16,6 +16,7 @@
   <bean name="org.jbpm:service=ServerConfig"
         class="org.jbpm.integration.jboss5.mgmt.ServerConfig">
     <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+    <property name="webServiceHost">${jboss.bind.address}</property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml
===================================================================
--- jbpm4/trunk/modules/examples/jbpm4-examples.iml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/examples/jbpm4-examples.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -10,10 +10,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="test-base" exported="" />
-    <orderEntry type="module" module-name="toplevel" exported="" />
-    <orderEntry type="module" module-name="api" exported="" />
     <orderEntry type="module" module-name="jpdl" exported="" />
     <orderEntry type="module" module-name="pvm" exported="" />
+    <orderEntry type="module" module-name="toplevel" />
     <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
         <CLASSES>
@@ -80,15 +79,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: junit:junit:jar:3.8.1:runtime">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -98,343 +88,327 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:runtime">
+      <library name="M2 Dep: juel:juel-engine:jar:2.1.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:runtime">
+      <library name="M2 Dep: javassist:javassist:jar:3.4.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:runtime">
+      <library name="M2 Dep: juel:juel:jar:2.1.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:runtime">
+      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel-engine:jar:2.1.0:runtime">
+      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javassist:javassist:jar:3.4.GA:runtime">
+      <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:runtime">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.1:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel:jar:2.1.0:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:runtime">
+      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.subethamail:subethasmtp-wiser:jar:1.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: logkit:logkit:jar:1.0.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/logkit/logkit/1.0.1/logkit-1.0.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:test">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: antlr:antlr:jar:2.7.6:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: log4j:log4j:jar:1.2.14:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: avalon-framework:avalon-framework:jar:4.1.3:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.transaction:jta:jar:1.1:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm:jar:1.5.3:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1/commons-logging-1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.subethamail:subethasmtp-smtp:jar:1.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: cglib:cglib:jar:2.1_3:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.mail:mail:jar:1.4:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntryProperties />

Modified: jbpm4/trunk/modules/integration/console/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/console/pom.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/console/pom.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.jboss.bpm</groupId>
       <artifactId>gwt-console-server-integration</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ManagementFactoryImpl.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -44,8 +44,9 @@
         InvocationProxy.newInstance(new TaskManagementImpl());
   }
 
+
   public UserManagement createUserManagement()
   {
-    throw new RuntimeException("Not implemented");
+    throw new IllegalArgumentException("Not implemented");
   }
 }

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -98,7 +98,9 @@
     OpenExecution openTopLevelExecution = (OpenExecution) topLevelExecution;
     for(Transition t : openTopLevelExecution.getActivity().getOutgoingTransitions())
     {
-      availableSignals.add(t.getName());
+      // TODO: Fix when https://jira.jboss.org/jira/browse/JBPM-2220 is done
+      String transitionName = t.getName()!=null ? t.getName() : "to_"+t.getDestination().getName();
+      availableSignals.add(transitionName);
     }
 
     tok.setAvailableSignals(availableSignals);
@@ -119,7 +121,7 @@
     task.setProcessInstanceId( cast.getProcessInstance().getId() );
 
     // TODO: weird API
-    task.setProcessId( execution.getProcessInstance().getProcessInstance().getId() );
+    task.setProcessId( execution.getProcessInstance().getProcessDefinition().getId() );
 
     // participations
     for(Participation p0 : cast.getParticipations())

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -24,15 +24,18 @@
 import org.jboss.bpm.console.client.model.TaskRef;
 import org.jboss.bpm.console.server.integration.TaskManagement;
 import org.jbpm.api.IdentityService;
-import org.jbpm.api.TaskQuery;
 import org.jbpm.api.TaskService;
+import org.jbpm.api.env.Environment;
+import org.jbpm.api.env.EnvironmentFactory;
 import org.jbpm.api.task.GroupRef;
 import org.jbpm.api.task.Participation;
 import org.jbpm.api.task.Task;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
+
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
@@ -50,25 +53,33 @@
 
   private List<TaskRef> internalGetTaskForIdentity(String idRef, String participationType)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    List<TaskRef> results = new ArrayList<TaskRef>();
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
-    if(null==participationType || participationType.equals(Participation.CANDIDATE))
+    try
     {
-      TaskQuery query = taskService.createTaskQuery();
-      query.unassigned();
-      List<Task> openTasks = query.list();
-      List<Task> assignedtasks = taskService.findAssignedTasks(idRef);
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      List<TaskRef> results = new ArrayList<TaskRef>();
 
-      adoptTasks(openTasks, results);
-      adoptTasks(assignedtasks, results);
+      if(null==participationType || participationType.equals(Participation.CANDIDATE))
+      {
+        // TODO: Paging
+        List<Task> assignedTasks = taskService.findAssignedTasks(idRef);
+        List<Task> takableTasks = taskService.findTakableTasks(idRef);
+
+        adoptTasks(assignedTasks, results);
+        adoptTasks(takableTasks, results);
+      }
+      else
+      {
+        throw new IllegalArgumentException("Unknown participation type: " +participationType);
+      }
+
+      return results;
     }
-    else
+    finally
     {
-      throw new IllegalArgumentException("Unknown participation type: " +participationType);
+      env.close();
     }
-
-    return new ArrayList<TaskRef>(results);
   }
 
   private void adoptTasks(List<Task> tasks, List<TaskRef> results)
@@ -96,38 +107,94 @@
 
   public TaskRef getTaskById(long taskId)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    Task t0 = taskService.getTask(taskId);
-    return ModelAdaptor.adoptTask(t0);
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      Task t0 = taskService.getTask(taskId);
+      return ModelAdaptor.adoptTask(t0);
+    }
+    finally{
+      env.close();
+    }
   }
 
   public void takeTask(long taskId, String idRef)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    taskService.takeTask(taskId, idRef);
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      taskService.takeTask(taskId, idRef);
+    }
+    finally{
+      env.close();
+    }
   }
 
   public void assignTask(long taskId, String idRef)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    taskService.assignTask(taskId, idRef);
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      taskService.assignTask(taskId, idRef);
+    }
+    finally{
+      env.close();
+    }
   }
 
   public void releaseTask(long taskId)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    taskService.assignTask(taskId, null);
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      taskService.assignTask(taskId, null);
+    }
+    finally{
+      env.close();
+    }
   }
 
-  public void completeTask(long taskId, String outcome)
+  public void completeTask(long taskId, Map data)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    taskService.completeTask(taskId, outcome);
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      if(data!=null)
+        taskService.setVariables(taskId, data);
+      
+      taskService.completeTask(taskId);
+    }
+    finally{
+      env.close();
+    }
   }
 
-  public void completeTask(long taskId)
+  public void completeTask(long taskId, String outcome, Map data)
   {
-    TaskService taskService = this.processEngine.get(TaskService.class);
-    taskService.completeTask(taskId);
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    try
+    {
+      TaskService taskService = this.processEngine.get(TaskService.class);
+      if(data!=null)
+        taskService.setVariables(taskId, data);
+
+      taskService.completeTask(taskId, outcome);
+    }
+    finally
+    {
+      env.close();
+    }
   }
+
 }

Copied: jbpm4/trunk/modules/integration/form-plugin (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin)

Deleted: jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jpdl" exported="" />
-    <orderEntry type="module" module-name="api" exported="" />
-    <orderEntry type="module" module-name="pvm" exported="" />
-    <orderEntry type="module" module-name="integration" exported="" />
-    <orderEntry type="module" module-name="test-base" exported="" />
-    <orderEntry type="module" module-name="gwt-rpc" exported="" />
-    <orderEntry type="module" module-name="server-integration" exported="" />
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: junit:junit:jar:3.8.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm:jar:1.5.3:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" />
-        </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-</module>
-

Copied: jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/form-plugin.iml)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/form-plugin.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jpdl" exported="" />
+    <orderEntry type="module" module-name="test-base" exported="" />
+    <orderEntry type="module" module-name="gwt-rpc" exported="" />
+    <orderEntry type="module" module-name="server-integration" exported="" />
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: junit:junit:jar:3.8.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: asm:asm:jar:1.5.3:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="api" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Deleted: jbpm4/trunk/modules/integration/form-plugin/pom.xml
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/pom.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>jBPM 4 - Integration Form Plugin</name>
-  <description>JBoss jBPM - GWT console Task Form Plugin</description>
-
-  <groupId>org.jbpm.jbpm4</groupId>
-  <artifactId>jbpm-console-form-plugin</artifactId>
-  <packaging>jar</packaging>
-
-  <parent>
-    <groupId>org.jbpm.jbpm4</groupId>
-    <artifactId>jbpm-integration</artifactId>
-    <version>4.0.0.Beta1</version>
-  </parent>
-
-  <!-- Dependencies -->
-  <dependencies>
-    <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-api</artifactId>
-      <version>${version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-pvm</artifactId>
-      <version>${version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-spi</artifactId>
-      <scope>provided</scope>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.bpm</groupId>
-      <artifactId>gwt-console-server-integration</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-    </dependency>
-  </dependencies>
-</project>

Copied: jbpm4/trunk/modules/integration/form-plugin/pom.xml (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/pom.xml)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/pom.xml	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/pom.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <name>jBPM 4 - Integration Form Plugin</name>
+  <description>JBoss jBPM - GWT console Task Form Plugin</description>
+
+  <groupId>org.jbpm.jbpm4</groupId>
+  <artifactId>jbpm-console-form-plugin</artifactId>
+  <packaging>jar</packaging>
+
+  <parent>
+    <groupId>org.jbpm.jbpm4</groupId>
+    <artifactId>jbpm-integration</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- Dependencies -->
+  <dependencies>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-api</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-pvm</artifactId>
+      <version>${version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-spi</artifactId>
+      <scope>provided</scope>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>gwt-console-server-integration</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Copied: jbpm4/trunk/modules/integration/form-plugin/src (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms)

Deleted: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.integration.console.forms;
-
-public class FormDirective
-{
-  private String action;
-  private String method = "POST";
-
-  public FormDirective()
-  {
-  }
-
-  public FormDirective(String action)
-  {
-    this.action = action;
-  }
-
-  public String getAction()
-  {
-    return action;
-  }
-
-  public void setAction(String action)
-  {
-    this.action = action;
-  }
-
-  public String getMethod()
-  {
-    return method;
-  }
-
-  public void setMethod(String method)
-  {
-    this.method = method;
-  }
-}
\ No newline at end of file

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/FormDirective.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.integration.console.forms;
+
+public class FormDirective
+{
+  private String action;
+  private String method = "POST";
+
+  public FormDirective()
+  {
+  }
+
+  public FormDirective(String action)
+  {
+    this.action = action;
+  }
+
+  public String getAction()
+  {
+    return action;
+  }
+
+  public void setAction(String action)
+  {
+    this.action = action;
+  }
+
+  public String getMethod()
+  {
+    return method;
+  }
+
+  public void setMethod(String method)
+  {
+    this.method = method;
+  }
+}
\ No newline at end of file

Deleted: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.integration.console.forms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class OutcomeDirective
-{
-  private List<String> values = new ArrayList<String>();
-
-  public List<String> getValues()
-  {
-    return values;
-  }
-}

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/OutcomeDirective.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.integration.console.forms;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class OutcomeDirective
+{
+  private List<String> values = new ArrayList<String>();
+
+  public List<String> getValues()
+  {
+    return values;
+  }
+}

Deleted: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.integration.console.forms;
-
-import freemarker.template.DefaultObjectWrapper;
-import freemarker.template.Template;
-
-import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class Runner
-{
-  static String template = "<html>\n" +
-      "<body>\n" +
-      "\n" +
-      "<h2>Please enter your name</h2>\n" +
-      "<form action=\"${form.action}\" method=\"POST\" enctype=\"multipart/form-data\">\n" +
-      "<input type=\"text\" name=\"name\" value=\"\"><br/>\n" +
-      "Outcomes:<br/>\n" +
-      "<ul>\n" +
-      "<#list outcome.values as transition>\n" +
-      "  <li>${transition}  \n" +
-      "</#list>\n" +
-      "</ul> \n" +
-      "<input type=\"submit\">\n" +
-      "</form>\n" +
-      "</body>\n" +
-      "</html>";
-
-  public static void main(String[] args)
-  {
-    Runner r = new Runner();
-
-    Map<String,Object> ctx = new HashMap<String,Object>();
-    FormDirective f = new FormDirective("http://localhost:8080/");
-    OutcomeDirective o = new OutcomeDirective();
-    o.getValues().add("transition1");
-    o.getValues().add("transition2");
-
-    ctx.put("form", f);
-    ctx.put("outcome", o);
-
-    r.execute(ctx, "testRun", new ByteArrayInputStream(template.getBytes()));
-  }
-
-  private void execute(Map<String, Object> renderContext, String name, InputStream src)
-  {
-    try
-    {
-      freemarker.template.Configuration cfg = new freemarker.template.Configuration();
-      cfg.setObjectWrapper(new DefaultObjectWrapper());
-      cfg.setTemplateUpdateDelay(0);
-
-      Template temp = new Template(name, new InputStreamReader(src), cfg);
-      temp.dump(System.out);
-      
-      final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      Writer out = new OutputStreamWriter(bout);
-      temp.process(renderContext, out);
-      out.flush();
-
-      System.out.println(new String(bout.toByteArray()));
-    }
-    catch (Exception e)
-    {
-      throw new RuntimeException(e);
-    }   
-  }
-
-
-}

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/Runner.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.integration.console.forms;
+
+import freemarker.template.DefaultObjectWrapper;
+import freemarker.template.Template;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class Runner
+{
+  static String template = "<html>\n" +
+      "<body>\n" +
+      "\n" +
+      "<h2>Please enter your name</h2>\n" +
+      "<form action=\"${form.action}\" method=\"POST\" enctype=\"multipart/form-data\">\n" +
+      "<input type=\"text\" name=\"name\" value=\"\"><br/>\n" +
+      "Outcomes:<br/>\n" +
+      "<ul>\n" +
+      "<#list outcome.values as transition>\n" +
+      "  <li>${transition}  \n" +
+      "</#list>\n" +
+      "</ul> \n" +
+      "<input type=\"submit\">\n" +
+      "</form>\n" +
+      "</body>\n" +
+      "</html>";
+
+  public static void main(String[] args)
+  {
+    Runner r = new Runner();
+
+    Map<String,Object> ctx = new HashMap<String,Object>();
+    FormDirective f = new FormDirective("http://localhost:8080/");
+    OutcomeDirective o = new OutcomeDirective();
+    o.getValues().add("transition1");
+    o.getValues().add("transition2");
+
+    ctx.put("form", f);
+    ctx.put("outcome", o);
+
+    r.execute(ctx, "testRun", new ByteArrayInputStream(template.getBytes()));
+  }
+
+  private void execute(Map<String, Object> renderContext, String name, InputStream src)
+  {
+    try
+    {
+      freemarker.template.Configuration cfg = new freemarker.template.Configuration();
+      cfg.setObjectWrapper(new DefaultObjectWrapper());
+      cfg.setTemplateUpdateDelay(0);
+
+      Template temp = new Template(name, new InputStreamReader(src), cfg);
+      temp.dump(System.out);
+      
+      final ByteArrayOutputStream bout = new ByteArrayOutputStream();
+      Writer out = new OutputStreamWriter(bout);
+      temp.process(renderContext, out);
+      out.flush();
+
+      System.out.println(new String(bout.toByteArray()));
+    }
+    catch (Exception e)
+    {
+      throw new RuntimeException(e);
+    }   
+  }
+
+
+}

Deleted: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1,250 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.integration.console.forms;
-
-import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin;
-import org.jbpm.*;
-import org.jbpm.model.OpenExecution;
-import org.jbpm.model.Transition;
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.integration.spi.mgmt.ServerConfig;
-import org.jbpm.integration.spi.mgmt.ServerConfigFactory;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.internal.task.TaskImpl;
-import org.jbpm.task.Task;
-
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.naming.InitialContext;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.List;
-
-import freemarker.template.DefaultObjectWrapper;
-import freemarker.template.Template;
-
-/**
- * @author Heiko.Braun <heiko.braun at jboss.com>
- */
-public class TaskDispatcherPluginImpl implements TaskDispatcherPlugin
-{
-  private ProcessEngine processEngine;
-
-  private ServerConfig serverConfig = null;
-
-  public TaskDispatcherPluginImpl()
-  {
-    initializeProcessEngine();
-  }
-
-  public URL getDispatchUrl(long taskId)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append("http://");
-    sb.append(getServerConfig().getWebServiceHost());
-    sb.append(":").append(getServerConfig().getWebServicePort());
-    sb.append("/gwt-console-server/rs/task/");
-    sb.append( taskId );
-    sb.append("/render");
-
-    try
-    {
-      return new URL(sb.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      throw new RuntimeException("Failed to resolve task dispatch url", e);
-    }
-  }
-
-
-  private ServerConfig getServerConfig()
-  {
-    if(null==serverConfig)
-    {
-      serverConfig = ServerConfigFactory.getServerConfig();
-    }
-    return serverConfig;
-  }
-
-  public DataHandler provideTaskUI(long taskId)
-  {
-    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
-
-    DataHandler result = null;
-
-    try
-    {
-      TaskService taskService = processEngine.getTaskService();
-      Task task = taskService.getTask(taskId);
-
-      // access the processdefition
-      TaskImpl cast = ((TaskImpl) task);
-      ExecutionImpl processInstance = cast.getProcessInstance();
-      String processInstanceId =  processInstance.getId();
-      String processId =  processInstance.getProcessDefinition().getId();
-
-      RepositoryService repoService = processEngine.getRepositoryService();
-      ProcessDefinitionQuery query = repoService.createProcessDefinitionQuery();
-      query.id(processId);
-      ProcessDefinition procDef = query.uniqueResult();
-
-      // check if a template exists
-      String name = task.getName() + ".ftl";
-      InputStream template = repoService.getResourceAsStream(
-          procDef.getDeploymentDbid(), name
-      );
-
-      // merge template with process variables
-      if(template!=null)
-      {
-        ExecutionService execService = processEngine.getExecutionService();
-
-        Set<String> varNames = execService.getVariableNames(processInstanceId);
-        if(varNames!=null)
-        {
-          Map<String, Object> processContext = execService.getVariables(processInstanceId, varNames);
-
-          // plugin context
-
-          StringBuffer sb = new StringBuffer();
-          sb.append("http://");
-          sb.append(getServerConfig().getWebServiceHost());
-          sb.append(":").append(getServerConfig().getWebServicePort());
-          sb.append("/gwt-console-server/rs/task/");
-          sb.append( taskId );
-          sb.append("/process");
-
-          Map<String, Object> renderContext = new HashMap<String,Object>();
-
-          // form directive
-          FormDirective formDirective = new FormDirective();
-          formDirective.setAction( sb.toString() );
-          renderContext.put("form", formDirective);
-
-          // outcome directive
-          OutcomeDirective outcomeDirective = new OutcomeDirective();
-          List<Transition> transitions =
-              ((OpenExecution) processInstance).getActivity().getOutgoingTransitions();
-          for(Transition t : transitions)
-          {
-            String outcomeName = t.getName()!=null ? t.getName() : "to_"+t.getDestination().getName();
-            outcomeDirective.getValues().add(outcomeName);
-          }
-          renderContext.put("outcome",outcomeDirective);          
-
-          // process variables
-          renderContext.putAll(processContext);
-
-
-          result = processTemplate(name, template, renderContext);
-        }
-      }
-
-      return result;
-    }
-    finally{
-      env.close();
-    }
-  }
-
-  private DataHandler processTemplate(
-      final String name, InputStream src,
-      Map<String, Object> renderContext
-      )
-  {
-    DataHandler merged = null;
-
-    try
-    {
-      freemarker.template.Configuration cfg = new freemarker.template.Configuration();      
-      cfg.setObjectWrapper(new DefaultObjectWrapper());
-      cfg.setTemplateUpdateDelay(0);
-
-      Template temp = new Template(name, new InputStreamReader(src), cfg);
-      temp.dump(System.out);
-
-      final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      Writer out = new OutputStreamWriter(bout);
-      temp.process(renderContext, out);
-      out.flush();
-       
-      merged = new DataHandler(
-
-          new DataSource()
-          {
-
-            public InputStream getInputStream() throws IOException
-            {
-              return new ByteArrayInputStream(bout.toByteArray());
-            }
-
-            public OutputStream getOutputStream() throws IOException
-            {
-              return bout;
-            }
-
-            public String getContentType()
-            {
-              return "*/*";
-            }
-
-            public String getName()
-            {
-              return name + "_DataSource";
-            }
-          }
-      );
-
-    }
-    catch (Exception e)
-    {
-      throw new RuntimeException("Failed to process task template", e);
-    }
-
-    return merged;
-  }
-
-  public void processCompletion(long taskId, String outcome, InputStream payload)
-  {
-
-  }
-
-  protected void initializeProcessEngine()
-  {
-    try
-    {
-      InitialContext ctx = new InitialContext();
-      this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine");
-    }
-    catch (Exception e)
-    {
-      throw new RuntimeException("Failed to lookup process engine", e);
-    }
-  }
-
-}

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.integration.console.forms;
+
+import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin;
+import org.jbpm.api.*;
+import org.jbpm.api.model.Transition;
+import org.jbpm.api.model.OpenExecution;
+import org.jbpm.api.task.Task;
+import org.jbpm.api.env.EnvironmentFactory;
+import org.jbpm.api.env.Environment;
+import org.jbpm.integration.spi.mgmt.ServerConfig;
+import org.jbpm.integration.spi.mgmt.ServerConfigFactory;
+import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import javax.naming.InitialContext;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.io.*;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+import freemarker.template.Template;
+import freemarker.template.DefaultObjectWrapper;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class TaskDispatcherPluginImpl implements TaskDispatcherPlugin
+{
+  private ProcessEngine processEngine;
+
+  private ServerConfig serverConfig = null;
+
+  public TaskDispatcherPluginImpl()
+  {
+    initializeProcessEngine();
+  }
+
+  public URL getDispatchUrl(long taskId)
+  {
+    StringBuffer sb = new StringBuffer();
+    sb.append("http://");
+    sb.append(getServerConfig().getWebServiceHost());
+    sb.append(":").append(getServerConfig().getWebServicePort());
+    sb.append("/gwt-console-server/rs/task/");
+    sb.append( taskId );
+    sb.append("/render");
+
+    try
+    {
+      return new URL(sb.toString());
+    }
+    catch (MalformedURLException e)
+    {
+      throw new RuntimeException("Failed to resolve task dispatch url", e);
+    }
+  }
+
+
+  private ServerConfig getServerConfig()
+  {
+    if(null==serverConfig)
+    {
+      serverConfig = ServerConfigFactory.getServerConfig();
+    }
+    return serverConfig;
+  }
+
+  public DataHandler provideTaskUI(long taskId)
+  {
+    Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
+
+    DataHandler result = null;
+
+    try
+    {
+      TaskService taskService = processEngine.getTaskService();
+      Task task = taskService.getTask(taskId);
+
+      // access the processdefition
+      TaskImpl cast = ((TaskImpl) task);
+      ExecutionImpl processInstance = cast.getProcessInstance();
+      String processInstanceId =  processInstance.getId();
+      String processId =  processInstance.getProcessDefinition().getId();
+
+      RepositoryService repoService = processEngine.getRepositoryService();
+      ProcessDefinitionQuery query = repoService.createProcessDefinitionQuery();
+      query.id(processId);
+      ProcessDefinition procDef = query.uniqueResult();
+
+      // check if a template exists
+      String name = task.getName() + ".ftl";
+      InputStream template = repoService.getResourceAsStream(
+          procDef.getDeploymentDbid(), name
+      );
+
+      // merge template with process variables
+      if(template!=null)
+      {
+        ExecutionService execService = processEngine.getExecutionService();
+
+        Set<String> varNames = execService.getVariableNames(processInstanceId);
+        if(varNames!=null)
+        {
+          Map<String, Object> processContext = execService.getVariables(processInstanceId, varNames);
+
+          // plugin context
+
+          StringBuffer sb = new StringBuffer();
+          sb.append("http://");
+          sb.append(getServerConfig().getWebServiceHost());
+          sb.append(":").append(getServerConfig().getWebServicePort());
+          sb.append("/gwt-console-server/rs/task/");
+          sb.append( taskId );
+          sb.append("/process");
+
+          Map<String, Object> renderContext = new HashMap<String,Object>();
+
+          // form directive
+          FormDirective formDirective = new FormDirective();
+          formDirective.setAction( sb.toString() );
+          renderContext.put("form", formDirective);
+
+          // outcome directive
+          // TODO: Fix when https://jira.jboss.org/jira/browse/JBPM-2220 is done
+          OutcomeDirective outcomeDirective = new OutcomeDirective();
+          List<Transition> transitions =
+              ((OpenExecution) processInstance).getActivity().getOutgoingTransitions();
+          for(Transition t : transitions)
+          {
+            String outcomeName = t.getName()!=null ? t.getName() : "to_"+t.getDestination().getName();
+            outcomeDirective.getValues().add(outcomeName);
+          }
+          renderContext.put("outcome",outcomeDirective);          
+
+          // process variables
+          renderContext.putAll(processContext);
+
+
+          result = processTemplate(name, template, renderContext);
+        }
+      }
+
+      return result;
+    }
+    finally{
+      env.close();
+    }
+  }
+
+  private DataHandler processTemplate(
+      final String name, InputStream src,
+      Map<String, Object> renderContext
+      )
+  {
+    DataHandler merged = null;
+
+    try
+    {
+      freemarker.template.Configuration cfg = new freemarker.template.Configuration();      
+      cfg.setObjectWrapper(new DefaultObjectWrapper());
+      cfg.setTemplateUpdateDelay(0);
+
+      Template temp = new Template(name, new InputStreamReader(src), cfg);
+      temp.dump(System.out);
+
+      final ByteArrayOutputStream bout = new ByteArrayOutputStream();
+      Writer out = new OutputStreamWriter(bout);
+      temp.process(renderContext, out);
+      out.flush();
+       
+      merged = new DataHandler(
+
+          new DataSource()
+          {
+
+            public InputStream getInputStream() throws IOException
+            {
+              return new ByteArrayInputStream(bout.toByteArray());
+            }
+
+            public OutputStream getOutputStream() throws IOException
+            {
+              return bout;
+            }
+
+            public String getContentType()
+            {
+              return "*/*";
+            }
+
+            public String getName()
+            {
+              return name + "_DataSource";
+            }
+          }
+      );
+
+    }
+    catch (Exception e)
+    {
+      throw new RuntimeException("Failed to process task template", e);
+    }
+
+    return merged;
+  }
+
+  public void processCompletion(long taskId, String outcome, InputStream payload)
+  {
+
+  }
+
+  protected void initializeProcessEngine()
+  {
+    try
+    {
+      InitialContext ctx = new InitialContext();
+      this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine");
+    }
+    catch (Exception e)
+    {
+      throw new RuntimeException("Failed to lookup process engine", e);
+    }
+  }
+
+}

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/resources (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF)

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services)

Deleted: jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin
===================================================================
--- jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin	2009-05-05 13:35:22 UTC (rev 4727)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin	2009-05-07 07:54:18 UTC (rev 4753)
@@ -1 +0,0 @@
-org.jbpm.integration.console.forms.TaskDispatcherPluginImpl
\ No newline at end of file

Copied: jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin (from rev 4727, jbpm4/branches/hbraun/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin)
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin	                        (rev 0)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/resources/META-INF/services/org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin	2009-05-07 07:54:18 UTC (rev 4753)
@@ -0,0 +1 @@
+org.jbpm.integration.console.forms.TaskDispatcherPluginImpl
\ No newline at end of file

Modified: jbpm4/trunk/modules/integration/integration.iml
===================================================================
--- jbpm4/trunk/modules/integration/integration.iml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/integration.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -4,6 +4,12 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/console/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/console/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/form-plugin/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/form-plugin/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/jboss4/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/jboss4/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/jboss5/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/jboss5/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/spi/src/main/java" isTestSource="false" />
@@ -11,1179 +17,1200 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jbpm4-jpdl" />
-    <orderEntry type="module" module-name="jbpm4-pvm" />
-    <orderEntry type="module" module-name="jbpm4-test-base" />
-    <orderEntry type="module" module-name="jbpm4-task" />
-    <orderEntry type="module" module-name="jbpm4-toplevel" />
-    <orderEntry type="module-library">
+    <orderEntry type="module" module-name="jbpm4-jpdl" exported="" />
+    <orderEntry type="module" module-name="jbpm4-pvm" exported="" />
+    <orderEntry type="module" module-name="jbpm4-test-base" exported="" />
+    <orderEntry type="module" module-name="jbpm4-task" exported="" />
+    <orderEntry type="module" module-name="jbpm4-toplevel" exported="" />
+    <orderEntry type="module" module-name="jpdl" exported="" />
+    <orderEntry type="module" module-name="api" exported="" />
+    <orderEntry type="module" module-name="pvm" exported="" />
+    <orderEntry type="module" module-name="test-base" exported="" />
+    <orderEntry type="module" module-name="gwt-rpc" exported="" />
+    <orderEntry type="module" module-name="server-integration" exported="" />
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.security:jbosssx:jar:2.0.2.CR6:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/security/jbosssx/2.0.2.CR6/jbosssx-2.0.2.CR6.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/security/jbosssx/2.0.2.CR6/jbosssx-2.0.2.CR6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.security:jboss-security-spi:jar:2.0.2.CR9:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/security/jboss-security-spi/2.0.2.CR9/jboss-security-spi-2.0.2.CR9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/security/jboss-security-spi/2.0.2.CR9/jboss-security-spi-2.0.2.CR9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.2.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.2.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.security:jbosssx-client:jar:2.0.2.CR9:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/security/jbosssx-client/2.0.2.CR9/jbosssx-client-2.0.2.CR9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/security/jbosssx-client/2.0.2.CR9/jbosssx-client-2.0.2.CR9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:jmx-invoker-adaptor-client:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-jmx-invoker-adaptor-client.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-jmx-invoker-adaptor-client.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-system-jmx:jar:5.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.GA/jboss-as-system-jmx-5.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.GA/jboss-as-system-jmx-5.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.man:jboss-managed:jar:2.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-spi:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-client:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: stax:stax-api:jar:1.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: log4j:log4j:jar:1.2.14:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:client:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-client.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-client.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.man:jboss-metatype:jar:2.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-vfs:jar:2.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javassist:javassist:jar:3.9.0.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-servlet-api:jar:2.5.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.ws.native:jbossws-native-saaj:jar:3.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cl:jboss-classloading-vfs:jar:2.0.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-bootstrap:jar:5.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.GA/jboss-as-bootstrap-5.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.GA/jboss-as-bootstrap-5.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-vfs:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.logging:jboss-logging-log4j:jar:2.0.5.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-core:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-ejb-api:jar:3.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-ejb-api/3.0.0.CR2/jboss-ejb-api-3.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-ejb-api/3.0.0.CR2/jboss-ejb-api-3.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.remoting:jboss-remoting:jar:2.5.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/remoting/jboss-remoting/2.5.0.GA/jboss-remoting-2.5.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/remoting/jboss-remoting/2.5.0.GA/jboss-remoting-2.5.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.2.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-security:jar:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-security/5.0.0.CR2/jboss-as-security-5.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-security/5.0.0.CR2/jboss-as-security-5.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jms-api:jar:1.1.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-jms-api/1.1.0.CR2/jboss-jms-api-1.1.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jms-api/1.1.0.CR2/jboss-jms-api-1.1.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.security:jaas:jar:1.0.01:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/security/jaas/1.0.01/jaas-1.0.01.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/security/jaas/1.0.01/jaas-1.0.01.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-j2se:jar:5.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-j2se/5.0.0.GA/jboss-as-j2se-5.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-j2se/5.0.0.GA/jboss-as-j2se-5.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.aop:jboss-aop:jar:2.0.0.SP1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.apache.ant:ant-junit:jar:1.7.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: asm:asm:jar:1.5.3:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.test:jboss-test:jar:1.1.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: sun-jaxb:jaxb-api:jar:2.1.4:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: trove:trove:jar:2.1.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/trove/trove/2.1.1/trove-2.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/trove/trove/2.1.1/trove-2.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jpl-pattern:jpl-pattern:jar:1.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-transaction-spi:jar:5.0.0.Beta4:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-client-spi:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: cglib:cglib:jar:2.1_3:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.13:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-server-manager:jar:1.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: bcel:bcel:jar:5.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jpl-util:jpl-util:jar:1.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jpl-util/jpl-util/1.0/jpl-util-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jpl-util/jpl-util/1.0/jpl-util-1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-transaction-spi:jar:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/integration/jboss-transaction-spi/5.0.0.CR2/jboss-transaction-spi-5.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-transaction-spi/5.0.0.CR2/jboss-transaction-spi-5.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-deployment:jar:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-deployment/5.0.0.CR2/jboss-as-deployment-5.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-deployment/5.0.0.CR2/jboss-as-deployment-5.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-system:jar:5.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system/5.0.0.GA/jboss-as-system-5.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system/5.0.0.GA/jboss-as-system-5.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-structure-spi:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.GA/jboss-reflect-2.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.GA/jboss-reflect-2.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-jmx:jar:5.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-jmx/5.0.0.GA/jboss-as-jmx-5.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-jmx/5.0.0.GA/jboss-as-jmx-5.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: junit:junit:jar:3.8.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss:jboss-common-logging-spi:jar:2.0.4.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-mdr:jar:2.0.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-deployment-spi:jar:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/integration/jboss-deployment-spi/5.0.0.CR2/jboss-deployment-spi-5.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-deployment-spi/5.0.0.CR2/jboss-deployment-spi-5.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cl:jboss-classloading:jar:2.0.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.naming:jnp-client:jar:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: antlr:antlr:jar:2.7.6:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-mbeans:jar:5.0.0.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-mbeans/5.0.0.GA/jboss-as-mbeans-5.0.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-mbeans/5.0.0.GA/jboss-as-mbeans-5.0.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-impl:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-ext-api:jar:0.4:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1.1:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jca-api:jar:1.5.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-jca-api/1.5.0.CR2/jboss-jca-api-1.5.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jca-api/1.5.0.CR2/jboss-jca-api-1.5.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-core-spi:jar:2.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jad-api:jar:1.2.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-jad-api/1.2.0.CR2/jboss-jad-api-1.2.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jad-api/1.2.0.CR2/jboss-jad-api-1.2.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cl:jboss-classloader:jar:2.0.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-classloading-spi:jar:5.0.0.CR2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss.jbossws:jboss-jaxrpc:jar:1.0.4.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.ws:jbossws-spi:jar:1.0.6.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.metadata:jboss-metadata:jar:1.0.0.CR11:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: qdox:qdox:jar:1.6.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jpa:jboss-jpa-deployers:jar:0.1.2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jpa/jboss-jpa-deployers/0.1.2/jboss-jpa-deployers-0.1.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jpa/jboss-jpa-deployers/0.1.2/jboss-jpa-deployers-0.1.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-profileservice-spi:jar:5.0.3.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: juel:juel-engine:jar:2.1.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javassist:javassist:jar:3.4.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: stax:stax:jar:1.2.0:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/stax/stax/1.2.0/stax-1.2.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:test-util:jar:4.4.0.GA:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/test-util/4.4.0.GA/test-util-4.4.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.client:jbossall-client:jar:4.2.2.GA:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javassist:javassist:jar:3.9.0.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/client/jbossall-client/4.2.2.GA/jbossall-client-4.2.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jbpm.jbpm4:jbpm-log:jar:4.0.0.Beta1:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1.jar!/" />
+        </CLASSES>
+        <JAVADOC>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1-javadoc.jar!/" />
+        </JAVADOC>
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jbpm/jbpm4/jbpm-log/4.0.0.Beta1/jbpm-log-4.0.0.Beta1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: stax:stax-api:jar:1.0.1:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.9.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jbpm.jbpm4.dependencies.esb:jbossesb-rosetta:jar:4.4.0.GA:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jbpm/jbpm4/dependencies/esb/jbossesb-rosetta/4.4.0.GA/jbossesb-rosetta-4.4.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: juel:juel:jar:2.1.0:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.freemarker:freemarker:jar:2.3.15:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: jboss.jbossts:jbossts-common:jar:4.4.0.GA:provided">
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:provided">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/jboss/jbossts/jbossts-common/4.4.0.GA/jbossts-common-4.4.0.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

Modified: jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml
===================================================================
--- jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/jboss4/integration-jboss4.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -5,43 +5,16 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jpdl" exported="" />
+    <orderEntry type="module" module-name="pvm" exported="" />
+    <orderEntry type="module" module-name="integration" exported="" />
+    <orderEntry type="module" module-name="test-base" exported="" />
     <orderEntry type="module" module-name="toplevel" />
-    <orderEntry type="module" module-name="jpdl" />
-    <orderEntry type="module" module-name="integration-spi" />
-    <orderEntry type="module" module-name="pvm" />
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar!/" />
@@ -49,28 +22,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.security:jbosssx:jar:2.0.2.CR6:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/security/jbosssx/2.0.2.CR6/jbosssx-2.0.2.CR6.jar!/" />
@@ -79,7 +35,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.security:jboss-security-spi:jar:2.0.2.CR9:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/security/jboss-security-spi/2.0.2.CR9/jboss-security-spi-2.0.2.CR9.jar!/" />
@@ -88,7 +44,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.2.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA.jar!/" />
@@ -96,10 +52,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.2.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA.jar!/" />
@@ -107,10 +64,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.security:jbosssx-client:jar:2.0.2.CR9:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/security/jbosssx-client/2.0.2.CR9/jbosssx-client-2.0.2.CR9.jar!/" />
@@ -119,7 +77,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:jmx-invoker-adaptor-client:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-jmx-invoker-adaptor-client.jar!/" />
@@ -128,16 +86,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-system-jmx:jar:5.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system-jmx/5.0.0.GA/jboss-as-system-jmx-5.0.0.GA.jar!/" />
@@ -146,7 +95,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.man:jboss-managed:jar:2.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar!/" />
@@ -154,10 +103,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-spi:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA.jar!/" />
@@ -165,10 +115,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.3.GA/jboss-deployers-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-client:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA.jar!/" />
@@ -176,19 +127,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.3.GA/jboss-deployers-client-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" />
@@ -197,7 +140,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: stax:stax-api:jar:1.0:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar!/" />
@@ -206,16 +149,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar!/" />
@@ -224,7 +158,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
@@ -232,19 +166,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:client:5.0.0.CR2:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.0.CR2/jboss-as-server-5.0.0.CR2-client.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.man:jboss-metatype:jar:2.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar!/" />
@@ -252,10 +178,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-vfs:jar:2.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA.jar!/" />
@@ -263,19 +190,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jboss-vfs/2.0.0.GA/jboss-vfs-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javassist:javassist:jar:3.9.0.GA:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar!/" />
@@ -283,10 +202,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-servlet-api:jar:2.5.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA.jar!/" />
@@ -294,10 +214,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/javaee/jboss-servlet-api/2.5.0.GA/jboss-servlet-api-2.5.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
@@ -306,7 +227,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.ws.native:jbossws-native-saaj:jar:3.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA.jar!/" />
@@ -315,7 +236,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cl:jboss-classloading-vfs:jar:2.0.1.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA.jar!/" />
@@ -323,39 +244,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.1.GA/jboss-classloading-vfs-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-bootstrap:jar:5.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-bootstrap/5.0.0.GA/jboss-as-bootstrap-5.0.0.GA.jar!/" />
@@ -364,7 +257,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
@@ -373,7 +266,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-vfs:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA.jar!/" />
@@ -381,10 +274,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.3.GA/jboss-deployers-vfs-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
@@ -392,10 +286,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar!/" />
@@ -403,21 +298,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.logging:jboss-logging-log4j:jar:2.0.5.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar!/" />
@@ -425,10 +310,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-core:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA.jar!/" />
@@ -436,10 +322,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.3.GA/jboss-deployers-core-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-ejb-api:jar:3.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-ejb-api/3.0.0.CR2/jboss-ejb-api-3.0.0.CR2.jar!/" />
@@ -448,7 +335,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.remoting:jboss-remoting:jar:2.5.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/remoting/jboss-remoting/2.5.0.GA/jboss-remoting-2.5.0.GA.jar!/" />
@@ -457,7 +344,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.2.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA.jar!/" />
@@ -465,10 +352,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.2.GA/jboss-aop-mc-int-2.0.2.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-security:jar:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-security/5.0.0.CR2/jboss-as-security-5.0.0.CR2.jar!/" />
@@ -477,7 +365,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jms-api:jar:1.1.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jms-api/1.1.0.CR2/jboss-jms-api-1.1.0.CR2.jar!/" />
@@ -486,7 +374,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.security:jaas:jar:1.0.01:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/security/jaas/1.0.01/jaas-1.0.01.jar!/" />
@@ -495,16 +383,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.aop:jboss-aop:jar:2.0.0.SP1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1.jar!/" />
@@ -512,10 +391,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-j2se:jar:5.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-j2se/5.0.0.GA/jboss-as-j2se-5.0.0.GA.jar!/" />
@@ -524,7 +404,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.apache.ant:ant-junit:jar:1.7.0:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar!/" />
@@ -533,25 +413,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: asm:asm:jar:1.5.3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.test:jboss-test:jar:1.1.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA.jar!/" />
@@ -559,10 +421,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: trove:trove:jar:2.1.1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/trove/trove/2.1.1/trove-2.1.1.jar!/" />
@@ -571,7 +434,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: sun-jaxb:jaxb-api:jar:2.1.4:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar!/" />
@@ -580,16 +443,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jpl-pattern:jpl-pattern:jar:1.0:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar!/" />
@@ -598,7 +452,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
@@ -607,7 +461,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-transaction-spi:jar:5.0.0.Beta4:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4.jar!/" />
@@ -616,25 +470,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
@@ -643,7 +479,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-client-spi:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA.jar!/" />
@@ -651,10 +487,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.3.GA/jboss-deployers-client-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" />
@@ -663,16 +500,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.13:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
@@ -681,7 +509,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-server-manager:jar:1.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA.jar!/" />
@@ -689,19 +517,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA.jar!/" />
@@ -709,10 +529,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.3.GA/jboss-deployers-vfs-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: bcel:bcel:jar:5.1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1.jar!/" />
@@ -720,10 +541,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jpl-util:jpl-util:jar:1.0:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jpl-util/jpl-util/1.0/jpl-util-1.0.jar!/" />
@@ -732,7 +554,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-transaction-spi:jar:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-transaction-spi/5.0.0.CR2/jboss-transaction-spi-5.0.0.CR2.jar!/" />
@@ -741,7 +563,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-deployment:jar:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-deployment/5.0.0.CR2/jboss-as-deployment-5.0.0.CR2.jar!/" />
@@ -750,7 +572,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-system:jar:5.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system/5.0.0.GA/jboss-as-system-5.0.0.GA.jar!/" />
@@ -759,18 +581,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-structure-spi:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA.jar!/" />
@@ -778,19 +589,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.3.GA/jboss-deployers-structure-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.GA/jboss-reflect-2.0.0.GA.jar!/" />
@@ -799,7 +602,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-jmx:jar:5.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-jmx/5.0.0.GA/jboss-as-jmx-5.0.0.GA.jar!/" />
@@ -808,16 +611,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: junit:junit:jar:3.8.1:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -826,7 +620,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss:jboss-common-logging-spi:jar:2.0.4.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" />
@@ -835,16 +629,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss:jboss-mdr:jar:2.0.1.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar!/" />
@@ -852,10 +637,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-deployment-spi:jar:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-deployment-spi/5.0.0.CR2/jboss-deployment-spi-5.0.0.CR2.jar!/" />
@@ -864,7 +650,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA.jar!/" />
@@ -872,10 +658,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA/jboss-jacc-api-1.1.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cl:jboss-classloading:jar:2.0.1.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA.jar!/" />
@@ -883,10 +670,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.1.GA/jboss-classloading-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.naming:jnp-client:jar:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2.jar!/" />
@@ -895,7 +683,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
@@ -904,7 +692,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jbossas:jboss-as-mbeans:jar:5.0.0.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-mbeans/5.0.0.GA/jboss-as-mbeans-5.0.0.GA.jar!/" />
@@ -913,7 +701,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-impl:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA.jar!/" />
@@ -921,10 +709,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.3.GA/jboss-deployers-impl-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
@@ -933,7 +722,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-ext-api:jar:0.4:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4.jar!/" />
@@ -941,10 +730,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/0.4/jboss-ejb3-ext-api-0.4-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
@@ -953,7 +743,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jca-api:jar:1.5.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jca-api/1.5.0.CR2/jboss-jca-api-1.5.0.CR2.jar!/" />
@@ -962,7 +752,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: juel:juel:jar:2.1.0:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
@@ -971,7 +761,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.deployers:jboss-deployers-core-spi:jar:2.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA.jar!/" />
@@ -979,10 +769,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.3.GA/jboss-deployers-core-spi-2.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
@@ -991,16 +782,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-jad-api:jar:1.2.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-jad-api/1.2.0.CR2/jboss-jad-api-1.2.0.CR2.jar!/" />
@@ -1009,7 +791,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar!/" />
@@ -1017,10 +799,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.cl:jboss-classloader:jar:2.0.1.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA.jar!/" />
@@ -1028,10 +811,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.1.GA/jboss-classloader-2.0.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-classloading-spi:jar:5.0.0.CR2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-classloading-spi/5.0.0.CR2/jboss-classloading-spi-5.0.0.CR2.jar!/" />
@@ -1040,7 +824,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.ws:jbossws-spi:jar:1.0.6.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA.jar!/" />
@@ -1048,10 +832,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss.jbossws:jboss-jaxrpc:jar:1.0.4.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jboss/jbossws/jboss-jaxrpc/1.0.4.GA/jboss-jaxrpc-1.0.4.GA.jar!/" />
@@ -1060,7 +845,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.metadata:jboss-metadata:jar:1.0.0.CR11:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11.jar!/" />
@@ -1068,10 +853,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR11/jboss-metadata-1.0.0.CR11-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: qdox:qdox:jar:1.6.1:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1.jar!/" />
@@ -1079,10 +865,11 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.jpa:jboss-jpa-deployers:jar:0.1.2:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jpa/jboss-jpa-deployers/0.1.2/jboss-jpa-deployers-0.1.2.jar!/" />
@@ -1091,7 +878,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: org.jboss.integration:jboss-profileservice-spi:jar:5.0.3.GA:provided">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA.jar!/" />
@@ -1099,9 +886,199 @@
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.mail:mail:jar:1.4.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml
===================================================================
--- jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/jboss4/src/main/resources/jbpm.beans/META-INF/jboss-beans.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -24,7 +24,8 @@
      ServerConfig
   -->
   <bean name="org.jbpm:service=ServerConfig"
-        class="org.jbpm.integration.jboss4.mgmt.ServerConfig">    
+        class="org.jbpm.integration.jboss4.mgmt.ServerConfig">
+    <property name="webServiceHost">${jboss.bind.address}</property>
   </bean>
 
 </deployment>
\ No newline at end of file

Modified: jbpm4/trunk/modules/integration/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/pom.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/pom.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -121,6 +121,7 @@
     <module>jboss5</module>
     <module>jboss4</module>
     <module>console</module>
+    <module>form-plugin</module>
   </modules>
 
 </project>

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/DeploymentAdaptor.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -23,6 +23,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.zip.ZipInputStream;
 
 import javax.naming.InitialContext;
 import javax.transaction.SystemException;
@@ -59,7 +60,8 @@
       File deploymentFile = new File(deploymentName);
 
       long deploymentDbid = repositoryService.createDeployment()
-          .addResourceFromUrl(deploymentMetData.getProcessDescriptor())
+          .addResourcesFromZipInputStream(new ZipInputStream(deploymentMetData.getWatch().openStream()))
+          //.addResourceFromUrl(deploymentMetData.getProcessDescriptor())
           .setTimestamp(deploymentFile.lastModified())
           .setName(deploymentName)
           .deploy();

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/AbstractServerConfig.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/AbstractServerConfig.java	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/AbstractServerConfig.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -27,7 +27,11 @@
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.management.AttributeNotFoundException;
 import java.io.File;
+import java.net.UnknownHostException;
+import java.net.InetAddress;
+import java.util.Set;
 
 /**
  * Basic implementation of a ServerConfig.
@@ -36,7 +40,7 @@
  * @author Thomas.Diesler at jboss.org
  * @author darran.lofthouse at jboss.com
  * @author Heiko.Braun at jboss.com
- * 
+ *
  * @since 08-May-2006
  */
 public abstract class AbstractServerConfig implements AbstractServerConfigMBean
@@ -45,7 +49,16 @@
 
   // The MBeanServer
   private MBeanServer mbeanServer;
-  
+
+  private final static String UNDEFINED_HOSTNAME = "undefined.host";
+
+  // The webservice host name that will be used when updating the wsdl
+  private String webServiceHost = UNDEFINED_HOSTNAME;
+  // The webservice port that will be used when updating the wsdl
+  private int webServicePort;
+  // The webservice port that will be used when updating the wsdl
+  private int webServiceSecurePort;
+
   public MBeanServer getMbeanServer()
   {
     return mbeanServer;
@@ -60,6 +73,114 @@
 
   public abstract String getImplementationVersion();
 
+  public String getWebServiceHost()
+  {
+    return webServiceHost;
+  }
+
+  public void setWebServiceHost(String host) throws UnknownHostException
+  {
+    if (host == null || host.trim().length() == 0)
+    {
+      log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
+      host = UNDEFINED_HOSTNAME;
+    }
+    if ("0.0.0.0".equals(host))
+    {
+      InetAddress localHost = InetAddress.getLocalHost();
+      log.debug("Using local host: " + localHost.getHostName());
+      host = localHost.getHostName();
+    }
+    this.webServiceHost = host;
+  }
+
+  public void setWebServicePort(int port)
+  {
+    this.webServicePort = port;
+  }
+
+  public void setWebServiceSecurePort(int port)
+  {
+    this.webServiceSecurePort = port;
+  }
+
+  public int getWebServicePort()
+  {
+    if (webServicePort <= 0)
+      webServicePort = getConnectorPort("HTTP/1.1", false);
+
+    int localPort = webServicePort;
+    if (localPort <= 0)
+    {
+      // Do not initialize webServicePort with the default, the connector port may become available later
+      log.warn("Unable to calculate 'WebServicePort', using default '8080'");
+      localPort = 8080;
+    }
+
+    return localPort;
+  }
+
+  public int getWebServiceSecurePort()
+  {
+    if (webServiceSecurePort <= 0)
+      webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
+
+    int localPort = webServiceSecurePort;
+    if (localPort <= 0)
+    {
+      // Do not initialize webServiceSecurePort with the default, the connector port may become available later
+      log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'");
+      localPort = 8443;
+    }
+
+    return localPort;
+  }
+
+  @SuppressWarnings("unchecked")
+  private int getConnectorPort(final String protocol, final boolean secure)
+  {
+    int port = -1;
+
+    try
+    {
+      ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
+
+      Set connectorNames = getMbeanServer().queryNames(connectors, null);
+      for (Object current : connectorNames)
+      {
+        ObjectName currentName = (ObjectName)current;
+
+        try
+        {
+          int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port");
+          boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure");
+          String connectorProtocol = (String)getMbeanServer().getAttribute(currentName, "protocol");
+
+          if (protocol.equals(connectorProtocol) && secure == connectorSecure)
+          {
+            if (port > -1)
+            {
+              log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'");
+            }
+            else
+            {
+              port = connectorPort;
+            }
+          }
+        }
+        catch (AttributeNotFoundException ignored)
+        {
+        }
+      }
+
+      return port;
+    }
+    catch (JMException e)
+    {
+      return -1;
+    }
+  }
+
   public File getServerTempDir()
   {
     try
@@ -100,7 +221,7 @@
     {
       return null;
     }
-  }  
+  }
 
   public void create() throws Exception
   {

Modified: jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfig.java
===================================================================
--- jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfig.java	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/integration/spi/src/main/java/org/jbpm/integration/spi/mgmt/ServerConfig.java	2009-05-07 07:54:18 UTC (rev 4753)
@@ -42,5 +42,12 @@
 
   File getServerTempDir();
 
-  File getServerDataDir(); 
+  File getServerDataDir();
+
+  String getWebServiceHost();
+
+  int getWebServicePort();
+
+  int getWebServiceSecurePort();
+
 }
\ No newline at end of file

Modified: jbpm4/trunk/modules/test-base/test-base.iml
===================================================================
--- jbpm4/trunk/modules/test-base/test-base.iml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/test-base/test-base.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -9,17 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="toplevel" exported="" />
-    <orderEntry type="module" module-name="api" exported="" />
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: junit:junit:jar:3.8.1:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -29,112 +19,111 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile">
+      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile">
+      <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
+      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile">
+      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile">
+      <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile">
+      <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm:jar:1.5.3:compile">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
+      <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
+      <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile">
+      <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:compile">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

Modified: jbpm4/trunk/modules/test-db/jbpm4-test-db.iml
===================================================================
--- jbpm4/trunk/modules/test-db/jbpm4-test-db.iml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/modules/test-db/jbpm4-test-db.iml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -10,10 +10,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="test-base" exported="" />
-    <orderEntry type="module" module-name="toplevel" exported="" />
-    <orderEntry type="module" module-name="api" exported="" />
     <orderEntry type="module" module-name="jpdl" exported="" />
     <orderEntry type="module" module-name="pvm" exported="" />
+    <orderEntry type="module" module-name="toplevel" />
     <orderEntry type="module-library" exported="">
       <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile">
         <CLASSES>
@@ -33,15 +32,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javax.transaction:jta:jar:1.1:runtime">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" />
@@ -62,60 +52,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.2.GA:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.2.GA/jbosscache-core-3.0.2.GA.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: juel:juel-engine:jar:2.1.0:runtime">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" />
@@ -125,15 +61,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm:jar:1.5.3:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
       <library name="M2 Dep: javassist:javassist:jar:3.4.GA:runtime">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.4.GA/javassist-3.4.GA.jar!/" />
@@ -143,233 +70,226 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:runtime">
+      <library name="M2 Dep: juel:juel:jar:2.1.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel:jar:2.1.0:runtime">
+      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:runtime">
+      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.activation:activation:jar:1.1:runtime">
+      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:runtime">
+      <library name="M2 Dep: log4j:log4j:jar:1.2.14:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: juel:juel-impl:jar:2.1.0:runtime">
+      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: antlr:antlr:jar:2.7.6:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: cglib:cglib:jar:2.1_3:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.1:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.activation:activation:jar:1.1.1:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.10.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-jdk14:jar:1.5.2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.3.2.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.2.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: log4j:log4j:jar:1.2.14:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.1.0.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:test">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: javax.mail:mail:jar:1.4:runtime">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: javax.mail:mail:jar:1.4.1:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4.1/mail-1.4.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:runtime">
+    <orderEntry type="module-library">
+      <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.4.0.GA:runtime">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntryProperties />

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-05-07 07:34:08 UTC (rev 4752)
+++ jbpm4/trunk/pom.xml	2009-05-07 07:54:18 UTC (rev 4753)
@@ -46,6 +46,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <apache.ant.version>1.7.0</apache.ant.version>
     <cactus.version>13-1.7.1</cactus.version>
+    <freemarker.version>2.3.15</freemarker.version>
     <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
     <hibernate.version>3.3.1.GA</hibernate.version>
     <slf4j.version>1.5.2</slf4j.version>
@@ -193,6 +194,11 @@
         <version>${cactus.version}</version>
       </dependency>
       <dependency>
+       <groupId>org.freemarker</groupId>
+       <artifactId>freemarker</artifactId>
+       <version>${freemarker.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
         <version>${hibernate.version}</version>




More information about the jbpm-commits mailing list