moved xsd's to converter project + added missing modules to distro build

distro/build.xml

@@ -62,15 +62,27 @@
       </fileset>
 			<fileset dir="../modules/activiti-bpmn-converter/target">
         <include name="activiti-bpmn-converter-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-bpmn-layout/target">
+        <include name="activiti-bpmn-layout-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-json-converter/target">
         <include name="activiti-json-converter-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-simple-workflow/target">
+        <include name="activiti-simple-workflow-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-explorer/target">
         <include name="activiti-explorer-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-common-rest/target">
+        <include name="activiti-common-rest-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-modeler/target">
         <include name="activiti-modeler-*.jar" />
+      </fileset>
+			<fileset dir="../modules/activiti-diagram-rest/target">
+        <include name="activiti-diagram-rest-*.jar" />
       </fileset>
 			<fileset dir="../modules/activiti-rest/target">
         <include name="activiti-rest-*.jar" />
@@ -130,7 +142,7 @@
 	<target name="copy.docs" depends="build.docs" unless="nodocs">
 		<!-- COPY XSD -->
 		<copy todir="${target.distro.root}/docs/xsd">
-			<fileset dir="../modules/activiti-engine/src/main/resources/org/activiti/impl/bpmn/parser">
+			<fileset dir="../modules/activiti-bpmn-converter/src/main/resources/org/activiti/impl/bpmn/parser">
 				<include name="*.xsd" />
 			</fileset>
 		</copy>

modules/activiti-bpmn-converter/pom.xml

@@ -18,7 +18,7 @@
       org.activiti.bpmn.converter
     </activiti.artifact>
     <activiti.osgi.export.additional>
-      org.activiti.bpmn.constants
+      org.activiti.bpmn.constants,org.activiti.bpmn.util
     </activiti.osgi.export.additional>
   </properties>
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParser.java

@@ -30,21 +30,6 @@ import org.activiti.engine.impl.el.ExpressionManager;
  */
 public class BpmnParser {
   
-  /**
-   * The BPMN 2.0 namespace
-   */
-  public static final String BPMN20_NS = "http://www.omg.org/spec/BPMN/20100524/MODEL";
-  
-  /**
-   * The location of the BPMN 2.0 XML schema.
-   */
-  public static final String BPMN_20_SCHEMA_LOCATION = "org/activiti/impl/bpmn/parser/BPMN20.xsd";
-
-  /**
-   * The namespace of the Activiti custom BPMN extensions.
-   */
-  public static final String ACTIVITI_BPMN_EXTENSIONS_NS = "http://activiti.org/bpmn";
-  
   /**
    * The namepace of the BPMN 2.0 diagram interchange elements.
    */
@@ -60,11 +45,6 @@ public class BpmnParser {
    */
   public static final String OMG_DI_NS = "http://www.omg.org/spec/DD/20100524/DI";
 
-  /**
-   * The Schema-Instance namespace.
-   */
-  public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-
   protected ExpressionManager expressionManager;
   protected ActivityBehaviorFactory activityBehaviorFactory;
   protected ListenerFactory listenerFactory;