[jbpm-commits] JBoss JBPM SVN: r1663 - in api/trunk/modules: dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10 and 5 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jul 17 05:27:03 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-07-17 05:27:02 -0400 (Thu, 17 Jul 2008)
New Revision: 1663

Added:
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessAdapter.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/
Removed:
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java
   api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/
Modified:
   api/trunk/modules/dialects/jpdl32/
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessUnmarshaller.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BindingType.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BooleanType.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ConfigType.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Assignment.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CancelTimer.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CreateTimer.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Swimlane.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Timer.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ObjectFactory.java
   api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/package-info.java
   api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
Log:
rename dialect packages

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/DialectHandlerImpl.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.net.URL;
+
+import javax.xml.bind.JAXBException;
+
+import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.client.DialectHandler;
+import org.jboss.bpm.dialect.api10.model.JAXBProcess;
+import org.jboss.bpm.model.Process;
+
+/**
+ * The DialectHandler converts a supported dialect to the internal Process model.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public class DialectHandlerImpl implements DialectHandler
+{
+  
+  public Process createProcess(String pXML)
+  {
+    try
+    {
+      ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+      JAXBProcess jaxbProc = unmarschaller.unmarshallProcess(new StringReader(pXML));
+      Process proc = new ProcessAdapter().adaptProcess(jaxbProc);
+      return proc;
+    }
+    catch (JAXBException ex)
+    {
+      throw new InvalidProcessException("Cannot unmarschall: " + pXML, ex);
+    }
+  }
+
+  public Process createProcess(URL pURL) throws IOException
+  {
+    try
+    {
+      ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+      JAXBProcess jaxbProc = unmarschaller.unmarshallProcess(new InputStreamReader(pURL.openStream()));
+      Process proc = new ProcessAdapter().adaptProcess(jaxbProc);
+      return proc;
+    }
+    catch (JAXBException ex)
+    {
+      throw new InvalidProcessException("Cannot unmarschall: " + pURL, ex);
+    }
+  }
+}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessAdapter.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessAdapter.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessAdapter.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessAdapter.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,176 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10;
+
+// $Id$
+
+import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.NotImplementedException;
+import org.jboss.bpm.dialect.api10.model.JAXBComplexGateway;
+import org.jboss.bpm.dialect.api10.model.JAXBEndEvent;
+import org.jboss.bpm.dialect.api10.model.JAXBExclusiveGateway;
+import org.jboss.bpm.dialect.api10.model.JAXBFlow;
+import org.jboss.bpm.dialect.api10.model.JAXBFlowObject;
+import org.jboss.bpm.dialect.api10.model.JAXBHandler;
+import org.jboss.bpm.dialect.api10.model.JAXBInclusiveGateway;
+import org.jboss.bpm.dialect.api10.model.JAXBIntermediateEvent;
+import org.jboss.bpm.dialect.api10.model.JAXBParallelGateway;
+import org.jboss.bpm.dialect.api10.model.JAXBProcess;
+import org.jboss.bpm.dialect.api10.model.JAXBStartEvent;
+import org.jboss.bpm.dialect.api10.model.JAXBSubProcess;
+import org.jboss.bpm.dialect.api10.model.JAXBTask;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
+
+/**
+ * Adapt the JAXBProcess to the API Process
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 18-Jun-2008
+ */
+public class ProcessAdapter
+{
+  public Process adaptProcess(JAXBProcess jaxbProc)
+  {
+    ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(jaxbProc.getName());
+    for (JAXBFlowObject jaxbFlowObject : jaxbProc.getFlowObjects())
+    {
+      if (jaxbFlowObject instanceof JAXBStartEvent)
+      {
+        adaptStartEvent(builder, (JAXBStartEvent)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBIntermediateEvent)
+      {
+        adaptIntermediateEvent(builder, (JAXBIntermediateEvent)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBEndEvent)
+      {
+        adaptEndEvent(builder, (JAXBEndEvent)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBSubProcess)
+      {
+        adaptSubProcess(builder, (JAXBSubProcess)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBTask)
+      {
+        adaptTask(builder, (JAXBTask)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBExclusiveGateway)
+      {
+        adaptExclusiveGateway(builder, (JAXBExclusiveGateway)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBInclusiveGateway)
+      {
+        adaptInclusiveGateway(builder, (JAXBInclusiveGateway)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBComplexGateway)
+      {
+        adaptComplexGateway(builder, (JAXBComplexGateway)jaxbFlowObject);
+      }
+      else if (jaxbFlowObject instanceof JAXBParallelGateway)
+      {
+        adaptParallelGateway(builder, (JAXBParallelGateway)jaxbFlowObject);
+      }
+      else
+      {
+        throw new InvalidProcessException("Unsupported type: " + jaxbFlowObject);
+      }
+    }
+
+    Process proc = builder.getProcess();
+    return proc;
+  }
+
+  private void adaptExclusiveGateway(ProcessBuilder builder, JAXBExclusiveGateway jaxb)
+  {
+    builder.addExclusiveGateway(jaxb.getName());
+    for(JAXBFlow flow : jaxb.getOutFlows())
+      builder.addSequenceFlow(flow.getTargetName());
+  }
+
+  private void adaptInclusiveGateway(ProcessBuilder builder, JAXBInclusiveGateway jaxb)
+  {
+    builder.addInclusiveGateway(jaxb.getName());
+    for(JAXBFlow flow : jaxb.getOutFlows())
+      builder.addSequenceFlow(flow.getTargetName());
+  }
+
+  private void adaptComplexGateway(ProcessBuilder builder, JAXBComplexGateway jaxb)
+  {
+    builder.addComplexGateway(jaxb.getName());
+    for(JAXBFlow flow : jaxb.getOutFlows())
+      builder.addSequenceFlow(flow.getTargetName());
+  }
+
+  private void adaptParallelGateway(ProcessBuilder builder, JAXBParallelGateway jaxb)
+  {
+    builder.addParallelGateway(jaxb.getName());
+    for(JAXBFlow flow : jaxb.getOutFlows())
+      builder.addSequenceFlow(flow.getTargetName());
+  }
+
+  private void adaptTask(ProcessBuilder builder, JAXBTask jaxb)
+  {
+    String targetName = jaxb.getOutFlow().getTargetName();
+    builder.addTask(jaxb.getName()).addSequenceFlow(targetName);
+    
+    JAXBHandler jaxbHandler = jaxb.getExecutionHandler();
+    if (jaxbHandler != null)
+      builder.addExecutionHandler(loadHandler(jaxbHandler.getClassName()));
+  }
+
+  private void adaptStartEvent(ProcessBuilder builder, JAXBStartEvent jaxb)
+  {
+    String targetName = jaxb.getOutFlow().getTargetName();
+    builder.addStartEvent().addSequenceFlow(targetName);
+  }
+
+  private void adaptIntermediateEvent(ProcessBuilder builder, JAXBIntermediateEvent jaxb)
+  {
+    String targetName = jaxb.getOutFlow().getTargetName();
+    builder.addItermediateEvent(jaxb.getName()).addSequenceFlow(targetName);
+  }
+
+  private void adaptEndEvent(ProcessBuilder builder, JAXBEndEvent jaxb)
+  {
+    builder.addEndEvent(jaxb.getName());
+  }
+
+  private void adaptSubProcess(ProcessBuilder builder, JAXBSubProcess jaxb)
+  {
+    throw new NotImplementedException();
+  }
+
+  private Class<?> loadHandler(String className)
+  {
+    try
+    {
+      ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+      return ctxLoader.loadClass(className);
+    }
+    catch (ClassNotFoundException e)
+    {
+      throw new IllegalStateException("Cannot load handler class: " + className);
+    }
+  }
+}

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java (from rev 1661, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessMarshaller.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+
+import org.jboss.bpm.dialect.api10.model.JAXBProcess;
+import org.jboss.bpm.dialect.api10.model.ObjectFactory;
+
+
+/**
+ * A JAXB marshaller for a Process
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessMarshaller
+{
+  public void marshallProcess(JAXBProcess proc, Writer out) throws JAXBException, IOException
+  {
+    JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+    Marshaller marshaller = jaxbContext.createMarshaller();
+    marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+    marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+
+    marshaller.marshal(proc, out);
+
+    // Add xmlns:xsi to the top level element and remove it from all others
+    // StringWriter strwr = new StringWriter();
+    // marshaller.marshal(proc, strwr);
+    // String str = strwr.toString();
+    // String xsi = " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+    // str = new StringBuilder(str.replace(xsi, "")).insert(str.indexOf(">"), xsi).toString();
+    // out.write(str);
+  }
+}

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java (from rev 1661, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/ProcessUnmarshaller.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10;
+
+// $Id$
+
+import java.io.Reader;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.jboss.bpm.dialect.api10.model.JAXBProcess;
+import org.jboss.bpm.dialect.api10.model.ObjectFactory;
+
+
+/**
+ * A JAXB unmarshaller for a Process 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessUnmarshaller 
+{
+  public JAXBProcess unmarshallProcess(Reader xml) throws JAXBException 
+  {
+    JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+    Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+    unmarshaller.setProperty("com.sun.xml.bind.ObjectFactory",new ObjectFactory());
+    JAXBProcess proc = (JAXBProcess)unmarshaller.unmarshal(xml);
+    return proc;
+  }
+}

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model (from rev 1661, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model)

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBActivity.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * An activity is a generic term for work that a company or organization performs via business processes. 
- * An activity can be atomic or non-atomic (compound). 
- * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="Activity")
-public class JAXBActivity extends JAXBFlowObject
-{
-  private String name;
-  
-  /**
-   * Get the name
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Set the name. 
-   * Note, this MUST NOT leak into the public API.
-   */
-  @XmlAttribute(required = true)
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBActivity.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * An activity is a generic term for work that a company or organization performs via business processes. 
+ * An activity can be atomic or non-atomic (compound). 
+ * The types of activities that are a part of a Process Model are: Process, Sub-Process, and Task. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="Activity")
+public class JAXBActivity extends JAXBFlowObject
+{
+  private String name;
+  
+  /**
+   * Get the name
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Set the name. 
+   * Note, this MUST NOT leak into the public API.
+   */
+  @XmlAttribute(required = true)
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBComplexGateway.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlType;
-
-
-// $Id$
-
-/**
- * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. 
- * 
- * Complex Gateways can also be used to combine a set of linked simple Gateways into a single, 
- * more compact situation. Modelers can provide complex expressions that determine the merging and/or 
- * splitting behavior of the Gateway. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="ComplexGateway")
-public class JAXBComplexGateway extends JAXBGateway
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBComplexGateway.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlType;
+
+
+// $Id$
+
+/**
+ * A Complex Gateway handles situations that are not easily handled through the other types of Gateways. 
+ * 
+ * Complex Gateways can also be used to combine a set of linked simple Gateways into a single, 
+ * more compact situation. Modelers can provide complex expressions that determine the merging and/or 
+ * splitting behavior of the Gateway. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="ComplexGateway")
+public class JAXBComplexGateway extends JAXBGateway
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBEndEvent.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-// $Id$
-
-/**
- * As the name implies, the End Event indicates where a Process will end.
- * 
- * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. An End Event can have a specific Result
- * that will appear as a marker within the center of the End Event shape. End Event Results are Message, Error, Compensation, Link, and Multiple.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "EndEvent")
-public class JAXBEndEvent extends JAXBEvent
-{
-  private String name;
-
-  /**
-   * Get the name
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Set the name. 
-   * Note, this MUST NOT leak into the public API.
-   */
-  @XmlAttribute(required = true)
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBEndEvent.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+// $Id$
+
+/**
+ * As the name implies, the End Event indicates where a Process will end.
+ * 
+ * In terms of Sequence Flow, the End Event ends the flow of the Process, and thus, will not have any outgoing Sequence Flow. An End Event can have a specific Result
+ * that will appear as a marker within the center of the End Event shape. End Event Results are Message, Error, Compensation, Link, and Multiple.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "EndEvent")
+public class JAXBEndEvent extends JAXBEvent
+{
+  private String name;
+
+  /**
+   * Get the name
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Set the name. 
+   * Note, this MUST NOT leak into the public API.
+   */
+  @XmlAttribute(required = true)
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBEvent.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * An Event is something that “happens” during the course of a business process. These Events affect the flow of the Process and usually have a cause or an impact.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "AbstractEvent")
-public class JAXBEvent extends JAXBFlowObject
-{
-  private JAXBExecutionHandler executionHandler;
-  private JAXBFlowHandler flowHandler;
-  private JAXBSignalHandler signalHandler;
-
-  /**
-   * Get the ExecutionHandler for this Event
-   */
-  public JAXBExecutionHandler getExecutionHandler()
-  {
-    return executionHandler;
-  }
-
-  /**
-   * Set the ExecutionHandler for this Event
-   */
-  @XmlElement(name = "execution-handler", required = false)
-  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
-  {
-    this.executionHandler = executionHandler;
-  }
-
-  /**
-   * Get the FlowHandler for this Event
-   */
-  public JAXBFlowHandler getFlowHandler()
-  {
-    return flowHandler;
-  }
-
-  /**
-   * Set the FlowHandler for this Event
-   */
-  @XmlElement(name = "flow-handler", required = false)
-  public void setFlowHandler(JAXBFlowHandler flowHandler)
-  {
-    this.flowHandler = flowHandler;
-  }
-
-  /**
-   * Get the SignalHandler for this Event
-   */
-  public JAXBSignalHandler getSignalHandler()
-  {
-    return signalHandler;
-  }
-
-  /**
-   * Set the SignalHandler for this Event
-   */
-  @XmlElement(name = "signal-handler", required = false)
-  public void setSignalHandler(JAXBSignalHandler signalHandler)
-  {
-    this.signalHandler = signalHandler;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBEvent.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * An Event is something that “happens” during the course of a business process. These Events affect the flow of the Process and usually have a cause or an impact.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "AbstractEvent")
+public class JAXBEvent extends JAXBFlowObject
+{
+  private JAXBExecutionHandler executionHandler;
+  private JAXBFlowHandler flowHandler;
+  private JAXBSignalHandler signalHandler;
+
+  /**
+   * Get the ExecutionHandler for this Event
+   */
+  public JAXBExecutionHandler getExecutionHandler()
+  {
+    return executionHandler;
+  }
+
+  /**
+   * Set the ExecutionHandler for this Event
+   */
+  @XmlElement(name = "execution-handler", required = false)
+  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
+  {
+    this.executionHandler = executionHandler;
+  }
+
+  /**
+   * Get the FlowHandler for this Event
+   */
+  public JAXBFlowHandler getFlowHandler()
+  {
+    return flowHandler;
+  }
+
+  /**
+   * Set the FlowHandler for this Event
+   */
+  @XmlElement(name = "flow-handler", required = false)
+  public void setFlowHandler(JAXBFlowHandler flowHandler)
+  {
+    this.flowHandler = flowHandler;
+  }
+
+  /**
+   * Get the SignalHandler for this Event
+   */
+  public JAXBSignalHandler getSignalHandler()
+  {
+    return signalHandler;
+  }
+
+  /**
+   * Set the SignalHandler for this Event
+   */
+  @XmlElement(name = "signal-handler", required = false)
+  public void setSignalHandler(JAXBSignalHandler signalHandler)
+  {
+    this.signalHandler = signalHandler;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBExclusiveGateway.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="ExclusiveGateway")
-public class JAXBExclusiveGateway extends JAXBGateway
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBExclusiveGateway.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * A point in the workflow process where, based on a decision or workflow control data, one of several branches is chosen. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="ExclusiveGateway")
+public class JAXBExclusiveGateway extends JAXBGateway
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBExecutionHandler.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Implement to make the FlowObject executable
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "ExecutionHandler")
-public class JAXBExecutionHandler extends JAXBHandler
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBExecutionHandler.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Implement to make the FlowObject executable
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "ExecutionHandler")
+public class JAXBExecutionHandler extends JAXBHandler
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBFlow.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-// $Id$
-
-/**
- * A Flow is a graphical line connecting two objects in a BPD.
- * 
- * There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also used in a generic sense (and lowercase) to describe how
- * Tokens will traverse Sequence Flow from the Start Event to an End Event.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "Flow")
-public class JAXBFlow
-{
-  private String name;
-  private String targetName;
-
-  public String getName()
-  {
-    return name;
-  }
-
-  @XmlAttribute(required = false)
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public String getTargetName()
-  {
-    return targetName;
-  }
-
-  /**
-   * Set the target name Note, this MUST NOT leak into the public API.
-   */
-  @XmlAttribute(name = "to", required = true)
-  public void setTargetName(String targetName)
-  {
-    this.targetName = targetName;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBFlow.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+// $Id$
+
+/**
+ * A Flow is a graphical line connecting two objects in a BPD.
+ * 
+ * There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also used in a generic sense (and lowercase) to describe how
+ * Tokens will traverse Sequence Flow from the Start Event to an End Event.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "Flow")
+public class JAXBFlow
+{
+  private String name;
+  private String targetName;
+
+  public String getName()
+  {
+    return name;
+  }
+
+  @XmlAttribute(required = false)
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+
+  public String getTargetName()
+  {
+    return targetName;
+  }
+
+  /**
+   * Set the target name Note, this MUST NOT leak into the public API.
+   */
+  @XmlAttribute(name = "to", required = true)
+  public void setTargetName(String targetName)
+  {
+    this.targetName = targetName;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBFlowHandler.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Implement to handle the outgoing Flows for an FlowObject
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "FlowHandler")
-public class JAXBFlowHandler extends JAXBHandler
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBFlowHandler.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Implement to handle the outgoing Flows for an FlowObject
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "FlowHandler")
+public class JAXBFlowHandler extends JAXBHandler
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBFlowObject.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id: $
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "FlowObject")
-public class JAXBFlowObject
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBFlowObject.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id: $
+
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * A Flow Object is one of the set of following graphical objects: Event, Activity, and Gateway.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "FlowObject")
+public class JAXBFlowObject
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBGateway.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,130 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
- * controlled, then a Gateway is not needed.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "Gateway")
-public class JAXBGateway extends JAXBFlowObject
-{
-  private String name;
-  private JAXBExecutionHandler executionHandler;
-  private JAXBFlowHandler flowHandler;
-  private JAXBSignalHandler signalHandler;
-  
-  @XmlElements( { 
-    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
-    @XmlElement(name = "message", type = JAXBMessageFlow.class) 
-    })
-  private List<JAXBFlow> outFlows = new ArrayList<JAXBFlow>();
-  
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Set the name. 
-   * Note, this MUST NOT leak into the public API.
-   */
-  @XmlAttribute(required = true)
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public List<JAXBFlow> getOutFlows()
-  {
-    return outFlows;
-  }
-
-  public void setOutFlow(List<JAXBFlow> outFlow)
-  {
-    this.outFlows = outFlow;
-  }
-
-  /**
-   * Get the ExecutionHandler for this Event
-   */
-  public JAXBExecutionHandler getExecutionHandler()
-  {
-    return executionHandler;
-  }
-
-  /**
-   * Set the ExecutionHandler for this Event
-   */
-  @XmlElement(name = "execution-handler", required = false)
-  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
-  {
-    this.executionHandler = executionHandler;
-  }
-
-  /**
-   * Get the FlowHandler for this Event
-   */
-  public JAXBFlowHandler getFlowHandler()
-  {
-    return flowHandler;
-  }
-
-  /**
-   * Set the FlowHandler for this Event
-   */
-  @XmlElement(name = "flow-handler", required = false)
-  public void setFlowHandler(JAXBFlowHandler flowHandler)
-  {
-    this.flowHandler = flowHandler;
-  }
-
-  /**
-   * Get the SignalHandler for this Event
-   */
-  public JAXBSignalHandler getSignalHandler()
-  {
-    return signalHandler;
-  }
-
-  /**
-   * Set the SignalHandler for this Event
-   */
-  @XmlElement(name = "signal-handler", required = false)
-  public void setSignalHandler(JAXBSignalHandler signalHandler)
-  {
-    this.signalHandler = signalHandler;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBGateway.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Gateways are modelling elements that are used to control how Sequence Flow interact as they converge and diverge within a Process. If the flow does not need to be
+ * controlled, then a Gateway is not needed.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "Gateway")
+public class JAXBGateway extends JAXBFlowObject
+{
+  private String name;
+  private JAXBExecutionHandler executionHandler;
+  private JAXBFlowHandler flowHandler;
+  private JAXBSignalHandler signalHandler;
+  
+  @XmlElements( { 
+    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
+    @XmlElement(name = "message", type = JAXBMessageFlow.class) 
+    })
+  private List<JAXBFlow> outFlows = new ArrayList<JAXBFlow>();
+  
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Set the name. 
+   * Note, this MUST NOT leak into the public API.
+   */
+  @XmlAttribute(required = true)
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+  
+  public List<JAXBFlow> getOutFlows()
+  {
+    return outFlows;
+  }
+
+  public void setOutFlow(List<JAXBFlow> outFlow)
+  {
+    this.outFlows = outFlow;
+  }
+
+  /**
+   * Get the ExecutionHandler for this Event
+   */
+  public JAXBExecutionHandler getExecutionHandler()
+  {
+    return executionHandler;
+  }
+
+  /**
+   * Set the ExecutionHandler for this Event
+   */
+  @XmlElement(name = "execution-handler", required = false)
+  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
+  {
+    this.executionHandler = executionHandler;
+  }
+
+  /**
+   * Get the FlowHandler for this Event
+   */
+  public JAXBFlowHandler getFlowHandler()
+  {
+    return flowHandler;
+  }
+
+  /**
+   * Set the FlowHandler for this Event
+   */
+  @XmlElement(name = "flow-handler", required = false)
+  public void setFlowHandler(JAXBFlowHandler flowHandler)
+  {
+    this.flowHandler = flowHandler;
+  }
+
+  /**
+   * Get the SignalHandler for this Event
+   */
+  public JAXBSignalHandler getSignalHandler()
+  {
+    return signalHandler;
+  }
+
+  /**
+   * Set the SignalHandler for this Event
+   */
+  @XmlElement(name = "signal-handler", required = false)
+  public void setSignalHandler(JAXBSignalHandler signalHandler)
+  {
+    this.signalHandler = signalHandler;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBHandler.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Implement to handle the outgoing Flows for an FlowObject
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "Handler")
-public abstract class JAXBHandler
-{
-  private String className;
-  private String beanRef;
-
-  public String getClassName()
-  {
-    return className;
-  }
-
-  @XmlAttribute(name = "class", required = false)
-  public void setClassName(String className)
-  {
-    this.className = className;
-  }
-
-  public String getBeanRef()
-  {
-    return beanRef;
-  }
-
-  @XmlAttribute(name = "bean", required = false)
-  public void setBeanRef(String beanRef)
-  {
-    this.beanRef = beanRef;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBHandler.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Implement to handle the outgoing Flows for an FlowObject
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "Handler")
+public abstract class JAXBHandler
+{
+  private String className;
+  private String beanRef;
+
+  public String getClassName()
+  {
+    return className;
+  }
+
+  @XmlAttribute(name = "class", required = false)
+  public void setClassName(String className)
+  {
+    this.className = className;
+  }
+
+  public String getBeanRef()
+  {
+    return beanRef;
+  }
+
+  @XmlAttribute(name = "bean", required = false)
+  public void setBeanRef(String beanRef)
+  {
+    this.beanRef = beanRef;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBInclusiveGateway.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlType;
-
-
-// $Id$
-
-/**
- * This Decision represents a branching point where Alternatives are based on conditional expressions contained within outgoing Sequence Flow. 
- * However, in this case, the True evaluation of one condition expression does not exclude the evaluation of other condition expressions. 
- * All Sequence Flow with a True evaluation will be traversed by a Token. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="InclusiveGateway")
-public class JAXBInclusiveGateway extends JAXBGateway
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBInclusiveGateway.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlType;
+
+
+// $Id$
+
+/**
+ * This Decision represents a branching point where Alternatives are based on conditional expressions contained within outgoing Sequence Flow. 
+ * However, in this case, the True evaluation of one condition expression does not exclude the evaluation of other condition expressions. 
+ * All Sequence Flow with a True evaluation will be traversed by a Token. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="InclusiveGateway")
+public class JAXBInclusiveGateway extends JAXBGateway
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBIntermediateEvent.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-
-// $Id$
-
-/**
- * An Intermediate Event is an Event that occurs after a Process has been started. 
- * 
- * It will affect the Flow of the Process, but will not start or (directly) terminate the Process. 
- * An Intermediate Event will show where messages or delays are expected within the Process, 
- * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="ItermediateEvent")
-public class JAXBIntermediateEvent extends JAXBEvent
-{
-  private String name;
-  
-  @XmlElements( { 
-    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
-    @XmlElement(name = "message", type = JAXBMessageFlow.class) 
-    })
-  private JAXBFlow outFlow;
-  
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Set the name. 
-   * Note, this MUST NOT leak into the public API.
-   */
-  @XmlAttribute(required = true)
-  public void setName(String name)
-  {
-    if (this.name != null)
-      throw new IllegalStateException("Cannot rename: " + name);
-
-    this.name = name;
-  }
-  
-  public JAXBFlow getOutFlow()
-  {
-    return outFlow;
-  }
-
-  @XmlTransient
-  public void setOutFlow(JAXBFlow outFlow)
-  {
-    this.outFlow = outFlow;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBIntermediateEvent.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+
+// $Id$
+
+/**
+ * An Intermediate Event is an Event that occurs after a Process has been started. 
+ * 
+ * It will affect the Flow of the Process, but will not start or (directly) terminate the Process. 
+ * An Intermediate Event will show where messages or delays are expected within the Process, 
+ * disrupt the Normal Flow through exception handling, or show the extra flow required for compensating a transaction.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="ItermediateEvent")
+public class JAXBIntermediateEvent extends JAXBEvent
+{
+  private String name;
+  
+  @XmlElements( { 
+    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
+    @XmlElement(name = "message", type = JAXBMessageFlow.class) 
+    })
+  private JAXBFlow outFlow;
+  
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * Set the name. 
+   * Note, this MUST NOT leak into the public API.
+   */
+  @XmlAttribute(required = true)
+  public void setName(String name)
+  {
+    if (this.name != null)
+      throw new IllegalStateException("Cannot rename: " + name);
+
+    this.name = name;
+  }
+  
+  public JAXBFlow getOutFlow()
+  {
+    return outFlow;
+  }
+
+  @XmlTransient
+  public void setOutFlow(JAXBFlow outFlow)
+  {
+    this.outFlow = outFlow;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBMessageFlow.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. 
- * Each Flow has only one source and only one target. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="MessageFlow")
-public class JAXBMessageFlow extends JAXBFlow
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBMessageFlow.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. 
+ * Each Flow has only one source and only one target. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="MessageFlow")
+public class JAXBMessageFlow extends JAXBFlow
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBParallelGateway.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlType;
-
-
-// $Id$
-
-/**
- * Parallel Gateway is required when two or more Activities need to be executed in parallel.  
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="ParallelGateway")
-public class JAXBParallelGateway extends JAXBGateway
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBParallelGateway.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlType;
+
+
+// $Id$
+
+/**
+ * Parallel Gateway is required when two or more Activities need to be executed in parallel.  
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="ParallelGateway")
+public class JAXBParallelGateway extends JAXBGateway
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBProcess.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A Process is any Activity performed within a company or organization.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "Process")
- at XmlRootElement(name = "process")
-public class JAXBProcess extends JAXBActivity
-{
-  @XmlElements( { 
-    @XmlElement(name = "start", type = JAXBStartEvent.class), 
-    @XmlElement(name = "event", type = JAXBIntermediateEvent.class), 
-    @XmlElement(name = "task", type = JAXBTask.class),
-    @XmlElement(name = "exclusive-gateway", type = JAXBExclusiveGateway.class),
-    @XmlElement(name = "inclusive-gateway", type = JAXBInclusiveGateway.class),
-    @XmlElement(name = "complex-gateway", type = JAXBComplexGateway.class),
-    @XmlElement(name = "parallel-gateway", type = JAXBParallelGateway.class),
-    @XmlElement(name = "sub-process", type = JAXBSubProcess.class), 
-    @XmlElement(name = "end", type = JAXBEndEvent.class) 
-    })
-  private List<JAXBFlowObject> flowObjects = new ArrayList<JAXBFlowObject>();
-
-  /**
-   * Get the list of flow objects
-   */
-  public List<JAXBFlowObject> getFlowObjects()
-  {
-    return flowObjects;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBProcess.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A Process is any Activity performed within a company or organization.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "Process")
+ at XmlRootElement(name = "process")
+public class JAXBProcess extends JAXBActivity
+{
+  @XmlElements( { 
+    @XmlElement(name = "start", type = JAXBStartEvent.class), 
+    @XmlElement(name = "event", type = JAXBIntermediateEvent.class), 
+    @XmlElement(name = "task", type = JAXBTask.class),
+    @XmlElement(name = "exclusive-gateway", type = JAXBExclusiveGateway.class),
+    @XmlElement(name = "inclusive-gateway", type = JAXBInclusiveGateway.class),
+    @XmlElement(name = "complex-gateway", type = JAXBComplexGateway.class),
+    @XmlElement(name = "parallel-gateway", type = JAXBParallelGateway.class),
+    @XmlElement(name = "sub-process", type = JAXBSubProcess.class), 
+    @XmlElement(name = "end", type = JAXBEndEvent.class) 
+    })
+  private List<JAXBFlowObject> flowObjects = new ArrayList<JAXBFlowObject>();
+
+  /**
+   * Get the list of flow objects
+   */
+  public List<JAXBFlowObject> getFlowObjects()
+  {
+    return flowObjects;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBSequenceFlow.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. 
- * Each Flow has only one source and only one target. 
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name="SequenceFlow")
-public class JAXBSequenceFlow extends JAXBFlow
-{
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBSequenceFlow.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * A Sequence Flow is a solid graphical line that is used to show the order that Activities will be performed in a Process. 
+ * Each Flow has only one source and only one target. 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name="SequenceFlow")
+public class JAXBSequenceFlow extends JAXBFlow
+{
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBSignalHandler.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlType;
-
-
-
-//$Id$
-
-/**
- * Implement to get signals on enter and exit.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "SignalHandler")
-public class JAXBSignalHandler extends JAXBHandler
-{
-}

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBSignalHandler.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlType;
+
+
+
+//$Id$
+
+/**
+ * Implement to get signals on enter and exit.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "SignalHandler")
+public class JAXBSignalHandler extends JAXBHandler
+{
+}

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBStartEvent.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts the Flow of the Process, and thus, will not have any
- * incoming Sequence Flow. A Start Event can have a Trigger that indicates how the Process starts: Message, Timer, Rule, Link, or Multiple.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "AbstractStartEvent")
-public class JAXBStartEvent extends JAXBEvent
-{
-  @XmlElements( { 
-    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
-    @XmlElement(name = "message", type = JAXBMessageFlow.class) })
-  private JAXBFlow outFlow;
-
-  public JAXBFlow getOutFlow()
-  {
-    return outFlow;
-  }
-
-  @XmlTransient
-  public void setOutFlow(JAXBFlow outFlow)
-  {
-    this.outFlow = outFlow;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBStartEvent.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A Start Event indicates where a particular Process will start. In terms of Sequence Flow, the Start Event starts the Flow of the Process, and thus, will not have any
+ * incoming Sequence Flow. A Start Event can have a Trigger that indicates how the Process starts: Message, Timer, Rule, Link, or Multiple.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "AbstractStartEvent")
+public class JAXBStartEvent extends JAXBEvent
+{
+  @XmlElements( { 
+    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
+    @XmlElement(name = "message", type = JAXBMessageFlow.class) })
+  private JAXBFlow outFlow;
+
+  public JAXBFlow getOutFlow()
+  {
+    return outFlow;
+  }
+
+  @XmlTransient
+  public void setOutFlow(JAXBFlow outFlow)
+  {
+    this.outFlow = outFlow;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBSubProcess.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-//$Id$
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * A Sub-Process is Process that is included within another Process.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "SubProcess")
-public class JAXBSubProcess extends JAXBProcess
-{
-  private JAXBExecutionHandler executionHandler;
-  private JAXBFlowHandler flowHandler;
-  private JAXBSignalHandler signalHandler;
-
-  @XmlElements( { 
-    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
-    @XmlElement(name = "message", type = JAXBMessageFlow.class) })
-  private JAXBFlow outFlow;
-
-  public JAXBFlow getOutFlow()
-  {
-    return outFlow;
-  }
-
-  @XmlTransient
-  public void setOutFlow(JAXBFlow outFlow)
-  {
-    this.outFlow = outFlow;
-  }
-
-  /**
-   * Get the ExecutionHandler for this Event
-   */
-  public JAXBExecutionHandler getExecutionHandler()
-  {
-    return executionHandler;
-  }
-
-  /**
-   * Set the ExecutionHandler for this Event
-   */
-  @XmlElement(name = "execution-handler", required = false)
-  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
-  {
-    this.executionHandler = executionHandler;
-  }
-
-  /**
-   * Get the FlowHandler for this Event
-   */
-  public JAXBFlowHandler getFlowHandler()
-  {
-    return flowHandler;
-  }
-
-  /**
-   * Set the FlowHandler for this Event
-   */
-  @XmlElement(name = "flow-handler", required = false)
-  public void setFlowHandler(JAXBFlowHandler flowHandler)
-  {
-    this.flowHandler = flowHandler;
-  }
-
-  /**
-   * Get the SignalHandler for this Event
-   */
-  public JAXBSignalHandler getSignalHandler()
-  {
-    return signalHandler;
-  }
-
-  /**
-   * Set the SignalHandler for this Event
-   */
-  @XmlElement(name = "signal-handler", required = false)
-  public void setSignalHandler(JAXBSignalHandler signalHandler)
-  {
-    this.signalHandler = signalHandler;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBSubProcess.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+//$Id$
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * A Sub-Process is Process that is included within another Process.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "SubProcess")
+public class JAXBSubProcess extends JAXBProcess
+{
+  private JAXBExecutionHandler executionHandler;
+  private JAXBFlowHandler flowHandler;
+  private JAXBSignalHandler signalHandler;
+
+  @XmlElements( { 
+    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
+    @XmlElement(name = "message", type = JAXBMessageFlow.class) })
+  private JAXBFlow outFlow;
+
+  public JAXBFlow getOutFlow()
+  {
+    return outFlow;
+  }
+
+  @XmlTransient
+  public void setOutFlow(JAXBFlow outFlow)
+  {
+    this.outFlow = outFlow;
+  }
+
+  /**
+   * Get the ExecutionHandler for this Event
+   */
+  public JAXBExecutionHandler getExecutionHandler()
+  {
+    return executionHandler;
+  }
+
+  /**
+   * Set the ExecutionHandler for this Event
+   */
+  @XmlElement(name = "execution-handler", required = false)
+  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
+  {
+    this.executionHandler = executionHandler;
+  }
+
+  /**
+   * Get the FlowHandler for this Event
+   */
+  public JAXBFlowHandler getFlowHandler()
+  {
+    return flowHandler;
+  }
+
+  /**
+   * Set the FlowHandler for this Event
+   */
+  @XmlElement(name = "flow-handler", required = false)
+  public void setFlowHandler(JAXBFlowHandler flowHandler)
+  {
+    this.flowHandler = flowHandler;
+  }
+
+  /**
+   * Get the SignalHandler for this Event
+   */
+  public JAXBSignalHandler getSignalHandler()
+  {
+    return signalHandler;
+  }
+
+  /**
+   * Set the SignalHandler for this Event
+   */
+  @XmlElement(name = "signal-handler", required = false)
+  public void setSignalHandler(JAXBSignalHandler signalHandler)
+  {
+    this.signalHandler = signalHandler;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBTask.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-//$Id$
-
-/**
- * A Task is an Atomic Activity that is included within a Process.
- * 
- * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to
- * perform the Task when it is executed.
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
- at XmlType(name = "Task")
-public class JAXBTask extends JAXBActivity
-{
-  private JAXBExecutionHandler executionHandler;
-  private JAXBFlowHandler flowHandler;
-  private JAXBSignalHandler signalHandler;
-  
-  @XmlElements( { 
-    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
-    @XmlElement(name = "message", type = JAXBMessageFlow.class) })
-  private JAXBFlow outFlow;
-
-  public JAXBFlow getOutFlow()
-  {
-    return outFlow;
-  }
-
-  @XmlTransient
-  public void setOutFlow(JAXBFlow outFlow)
-  {
-    this.outFlow = outFlow;
-  }
-
-  /**
-   * Get the ExecutionHandler for this Event
-   */
-  public JAXBExecutionHandler getExecutionHandler()
-  {
-    return executionHandler;
-  }
-
-  /**
-   * Set the ExecutionHandler for this Event
-   */
-  @XmlElement(name = "execution-handler", required = false)
-  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
-  {
-    this.executionHandler = executionHandler;
-  }
-
-  /**
-   * Get the FlowHandler for this Event
-   */
-  public JAXBFlowHandler getFlowHandler()
-  {
-    return flowHandler;
-  }
-
-  /**
-   * Set the FlowHandler for this Event
-   */
-  @XmlElement(name = "flow-handler", required = false)
-  public void setFlowHandler(JAXBFlowHandler flowHandler)
-  {
-    this.flowHandler = flowHandler;
-  }
-
-  /**
-   * Get the SignalHandler for this Event
-   */
-  public JAXBSignalHandler getSignalHandler()
-  {
-    return signalHandler;
-  }
-
-  /**
-   * Set the SignalHandler for this Event
-   */
-  @XmlElement(name = "signal-handler", required = false)
-  public void setSignalHandler(JAXBSignalHandler signalHandler)
-  {
-    this.signalHandler = signalHandler;
-  }
-}
\ No newline at end of file

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/JAXBTask.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+//$Id$
+
+/**
+ * A Task is an Atomic Activity that is included within a Process.
+ * 
+ * A Task is used when the work in the Process is not broken down to a finer level of Process Model detail. Generally, an end-user and/or an application are used to
+ * perform the Task when it is executed.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+ at XmlType(name = "Task")
+public class JAXBTask extends JAXBActivity
+{
+  private JAXBExecutionHandler executionHandler;
+  private JAXBFlowHandler flowHandler;
+  private JAXBSignalHandler signalHandler;
+  
+  @XmlElements( { 
+    @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), 
+    @XmlElement(name = "message", type = JAXBMessageFlow.class) })
+  private JAXBFlow outFlow;
+
+  public JAXBFlow getOutFlow()
+  {
+    return outFlow;
+  }
+
+  @XmlTransient
+  public void setOutFlow(JAXBFlow outFlow)
+  {
+    this.outFlow = outFlow;
+  }
+
+  /**
+   * Get the ExecutionHandler for this Event
+   */
+  public JAXBExecutionHandler getExecutionHandler()
+  {
+    return executionHandler;
+  }
+
+  /**
+   * Set the ExecutionHandler for this Event
+   */
+  @XmlElement(name = "execution-handler", required = false)
+  public void setExecutionHandler(JAXBExecutionHandler executionHandler)
+  {
+    this.executionHandler = executionHandler;
+  }
+
+  /**
+   * Get the FlowHandler for this Event
+   */
+  public JAXBFlowHandler getFlowHandler()
+  {
+    return flowHandler;
+  }
+
+  /**
+   * Set the FlowHandler for this Event
+   */
+  @XmlElement(name = "flow-handler", required = false)
+  public void setFlowHandler(JAXBFlowHandler flowHandler)
+  {
+    this.flowHandler = flowHandler;
+  }
+
+  /**
+   * Get the SignalHandler for this Event
+   */
+  public JAXBSignalHandler getSignalHandler()
+  {
+    return signalHandler;
+  }
+
+  /**
+   * Set the SignalHandler for this Event
+   */
+  @XmlElement(name = "signal-handler", required = false)
+  public void setSignalHandler(JAXBSignalHandler signalHandler)
+  {
+    this.signalHandler = signalHandler;
+  }
+}
\ No newline at end of file

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/ObjectFactory.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,131 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.11 at 09:21:08 AM CEST 
-//
-
-package org.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each Java content interface and Java element interface generated in the api.bpm.jboss.org package.
- * <p>
- * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist
- * of schema derived interfaces and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of
- * these are provided in this class.
- * 
- */
- at XmlRegistry
-public class ObjectFactory
-{
-  /**
-   * Create an instance of {@link ExclusiveGatewayImpl }
-   * 
-   */
-  public JAXBExclusiveGateway createExclusiveGateway()
-  {
-    return new JAXBExclusiveGateway();
-  }
-
-  /**
-   * Create an instance of {@link TaskImpl }
-   * 
-   */
-  public JAXBTask createTask()
-  {
-    return new JAXBTask();
-  }
-
-  /**
-   * Create an instance of {@link ProcessImpl }
-   * 
-   */
-  public JAXBProcess createProcess()
-  {
-    return new JAXBProcess();
-  }
-
-  /**
-   * Create an instance of {@link ParallelGatewayImpl }
-   * 
-   */
-  public JAXBParallelGateway createParallelGateway()
-  {
-    return new JAXBParallelGateway();
-  }
-
-  /**
-   * Create an instance of {@link MessageFlowImpl }
-   * 
-   */
-  public JAXBMessageFlow createMessageFlow()
-  {
-    return new JAXBMessageFlow();
-  }
-
-  /**
-   * Create an instance of {@link EndEventImpl }
-   * 
-   */
-  public JAXBEndEvent createEndEvent()
-  {
-    return new JAXBEndEvent();
-  }
-
-  /**
-   * Create an instance of {@link SubProcessImpl }
-   * 
-   */
-  public JAXBSubProcess createSubProcess()
-  {
-    return new JAXBSubProcess();
-  }
-
-  /**
-   * Create an instance of {@link SequenceFlowImpl }
-   * 
-   */
-  public JAXBSequenceFlow createSequenceFlow()
-  {
-    return new JAXBSequenceFlow();
-  }
-
-  /**
-   * Create an instance of {@link ComplexGatewayImpl }
-   * 
-   */
-  public JAXBComplexGateway createComplexGateway()
-  {
-    return new JAXBComplexGateway();
-  }
-
-  /**
-   * Create an instance of {@link InclusiveGatewayImpl }
-   * 
-   */
-  public JAXBInclusiveGateway createInclusiveGateway()
-  {
-    return new JAXBInclusiveGateway();
-  }
-
-  /**
-   * Create an instance of {@link IntermediateEventImpl }
-   * 
-   */
-  public JAXBIntermediateEvent createItermediateEvent()
-  {
-    return new JAXBIntermediateEvent();
-  }
-
-  /**
-   * Create an instance of {@link StartEventImpl }
-   * 
-   */
-  public JAXBStartEvent createStartEvent()
-  {
-    return new JAXBStartEvent();
-  }
-}

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/ObjectFactory.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,131 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2008.07.11 at 09:21:08 AM CEST 
+//
+
+package org.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each Java content interface and Java element interface generated in the api.bpm.jboss.org package.
+ * <p>
+ * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist
+ * of schema derived interfaces and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of
+ * these are provided in this class.
+ * 
+ */
+ at XmlRegistry
+public class ObjectFactory
+{
+  /**
+   * Create an instance of {@link ExclusiveGatewayImpl }
+   * 
+   */
+  public JAXBExclusiveGateway createExclusiveGateway()
+  {
+    return new JAXBExclusiveGateway();
+  }
+
+  /**
+   * Create an instance of {@link TaskImpl }
+   * 
+   */
+  public JAXBTask createTask()
+  {
+    return new JAXBTask();
+  }
+
+  /**
+   * Create an instance of {@link ProcessImpl }
+   * 
+   */
+  public JAXBProcess createProcess()
+  {
+    return new JAXBProcess();
+  }
+
+  /**
+   * Create an instance of {@link ParallelGatewayImpl }
+   * 
+   */
+  public JAXBParallelGateway createParallelGateway()
+  {
+    return new JAXBParallelGateway();
+  }
+
+  /**
+   * Create an instance of {@link MessageFlowImpl }
+   * 
+   */
+  public JAXBMessageFlow createMessageFlow()
+  {
+    return new JAXBMessageFlow();
+  }
+
+  /**
+   * Create an instance of {@link EndEventImpl }
+   * 
+   */
+  public JAXBEndEvent createEndEvent()
+  {
+    return new JAXBEndEvent();
+  }
+
+  /**
+   * Create an instance of {@link SubProcessImpl }
+   * 
+   */
+  public JAXBSubProcess createSubProcess()
+  {
+    return new JAXBSubProcess();
+  }
+
+  /**
+   * Create an instance of {@link SequenceFlowImpl }
+   * 
+   */
+  public JAXBSequenceFlow createSequenceFlow()
+  {
+    return new JAXBSequenceFlow();
+  }
+
+  /**
+   * Create an instance of {@link ComplexGatewayImpl }
+   * 
+   */
+  public JAXBComplexGateway createComplexGateway()
+  {
+    return new JAXBComplexGateway();
+  }
+
+  /**
+   * Create an instance of {@link InclusiveGatewayImpl }
+   * 
+   */
+  public JAXBInclusiveGateway createInclusiveGateway()
+  {
+    return new JAXBInclusiveGateway();
+  }
+
+  /**
+   * Create an instance of {@link IntermediateEventImpl }
+   * 
+   */
+  public JAXBIntermediateEvent createItermediateEvent()
+  {
+    return new JAXBIntermediateEvent();
+  }
+
+  /**
+   * Create an instance of {@link StartEventImpl }
+   * 
+   */
+  public JAXBStartEvent createStartEvent()
+  {
+    return new JAXBStartEvent();
+  }
+}

Deleted: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/package-info.java	2008-07-17 07:01:28 UTC (rev 1661)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.
- */
- at XmlSchema(namespace="urn:api.bpm.jboss:jpdl-0.1")
-package org.jboss.bpm.dialect.jaxb.model;
-
-import javax.xml.bind.annotation.XmlSchema;
-

Copied: api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java (from rev 1662, api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/jaxb/model/package-info.java)
===================================================================
--- api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java	                        (rev 0)
+++ api/trunk/modules/dialects/jaxb/src/main/java/org/jboss/bpm/dialect/api10/model/package-info.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.
+ */
+ at XmlSchema(namespace="urn:api.bpm.jboss:jpdl-0.1")
+package org.jboss.bpm.dialect.api10.model;
+
+import javax.xml.bind.annotation.XmlSchema;
+


Property changes on: api/trunk/modules/dialects/jpdl32
___________________________________________________________________
Name: svn:ignore
   + target


Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -32,7 +32,7 @@
 
 import org.jboss.bpm.InvalidProcessException;
 import org.jboss.bpm.client.DialectHandler;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32ProcessDefinition;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
 import org.jboss.bpm.model.Process;
 
 /**

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -26,13 +26,13 @@
 import java.util.List;
 
 import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32Action;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32EndState;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32Event;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32ProcessDefinition;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32StartState;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32State;
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32Transition;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32Action;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32EndState;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32Event;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32StartState;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32State;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32Transition;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessUnmarshaller.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessUnmarshaller.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessUnmarshaller.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -29,8 +29,8 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import org.jboss.bpm.dialect.jpdl32.jaxb.JPDL32ProcessDefinition;
-import org.jboss.bpm.dialect.jpdl32.jaxb.ObjectFactory;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
+import org.jboss.bpm.dialect.jpdl32.model.ObjectFactory;
 
 /**
  * A JAXB unmarshaller for a Process 

Copied: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model (from rev 1662, api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb)

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BindingType.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/BindingType.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BindingType.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BooleanType.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/BooleanType.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BooleanType.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ConfigType.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/ConfigType.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ConfigType.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/Delegation.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Action.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Assignment.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Assignment.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Assignment.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CancelTimer.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32CancelTimer.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CancelTimer.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CreateTimer.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32CreateTimer.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CreateTimer.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Decision.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32EndState.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Event.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32ExceptionHandler.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Fork.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Join.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Mail.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32MailNode.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Node.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32ProcessDefinition.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32ProcessState.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Script.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32StartState.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32State.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32SuperState.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Swimlane.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Swimlane.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Swimlane.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Task.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32TaskNode.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Timer.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Timer.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Timer.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Transition.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/JPDL32Variable.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ObjectFactory.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/ObjectFactory.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ObjectFactory.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,7 +6,7 @@
 //
 
 
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;

Modified: api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/package-info.java
===================================================================
--- api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/jaxb/package-info.java	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/package-info.java	2008-07-17 09:27:02 UTC (rev 1663)
@@ -6,4 +6,4 @@
 //
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:jbpm.org:jpdl-3.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.jboss.bpm.dialect.jpdl32.jaxb;
+package org.jboss.bpm.dialect.jpdl32.model;

Modified: api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml	2008-07-17 09:21:11 UTC (rev 1662)
+++ api/trunk/modules/testsuite/src/test/resources/jbpm-beans.xml	2008-07-17 09:27:02 UTC (rev 1663)
@@ -23,7 +23,7 @@
       </map>
     </property>
   </bean>
-  <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.jaxb.DialectHandlerImpl"/>
+  <bean name="jBPMDialectHandlerAPI10" class="org.jboss.bpm.dialect.api10.DialectHandlerImpl"/>
   <bean name="jBPMDialectHandlerJPDL32" class="org.jboss.bpm.dialect.jpdl32.DialectHandlerImpl"/>
 
   <!-- The ExecutionManager -->




More information about the jbpm-commits mailing list