[jbpm-commits] JBoss JBPM SVN: r2261 - in projects/jbpm-spec/trunk/modules: api/src/main/java/org/jboss/bpm/test and 10 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Sep 16 05:31:59 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-16 05:31:59 -0400 (Tue, 16 Sep 2008)
New Revision: 2261
Modified:
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.java
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java
projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml
projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java
projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclude.java
projects/jbpm-spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml
projects/jbpm-spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java
projects/jbpm-spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java
projects/jbpm-spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml
projects/jbpm-spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/DialectHandlerImpl.java
projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml
projects/jbpm-spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
Log:
Use URI for dialect nsURI
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectHandler.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.Writer;
+import java.net.URI;
import java.net.URL;
import org.jboss.bpm.model.Process;
@@ -37,12 +38,12 @@
*/
public interface DialectHandler
{
- String DEFAULT_NAMESPACE_URI = "urn:bpm.jboss:pdl-0.1";
+ URI DEFAULT_NAMESPACE_URI = URI.create("urn:bpm.jboss:pdl-0.1");
/**
* Get the the supported namespace from this dialect.
*/
- String getNamespaceURI();
+ URI getNamespaceURI();
/**
* Create a {@link Process} from a descriptor.
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/DialectRegistry.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -23,6 +23,7 @@
//$Id$
+import java.net.URI;
import java.util.Map;
/**
@@ -36,14 +37,14 @@
public static final Object BEAN_NAME = "jBPMDialectRegistry";
// Maps namespaceURI to dialect Id
- private Map<String,String> registry;
+ private Map<URI,String> registry;
- public void setRegistry(Map<String, String> registry)
+ public void setRegistry(Map<URI, String> registry)
{
this.registry = registry;
}
- public String getDialect(String nsURI)
+ public String getDialect(URI nsURI)
{
return registry.get(nsURI);
}
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -26,6 +26,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
@@ -41,6 +42,7 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.EngineShutdownException;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.Process.ProcessStatus;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -81,7 +83,7 @@
*/
public final Process createProcess(String pXML)
{
- String nsURI = getNamespaceURI(new ByteArrayInputStream(pXML.getBytes()));
+ URI nsURI = getNamespaceURI(new ByteArrayInputStream(pXML.getBytes()));
Process proc = getDialectHandler(nsURI).createProcess(pXML, false);
return proc;
}
@@ -91,7 +93,7 @@
*/
public final Process createProcess(URL pURL) throws IOException
{
- String nsURI = getNamespaceURI(pURL.openStream());
+ URI nsURI = getNamespaceURI(pURL.openStream());
Process proc = getDialectHandler(nsURI).createProcess(pURL, false);
return proc;
}
@@ -112,7 +114,7 @@
* @param status The optional process status
* @return An empty set if the process cannot be found
*/
- public Set<Process> getProcesses(String name, Process.ProcessStatus status)
+ public Set<Process> getProcesses(String name, ProcessStatus status)
{
Set<Process> procSet = new HashSet<Process>();
for (Process aux : procs.values())
@@ -142,7 +144,7 @@
{
if (ProcessEngine.locateProcessEngine().isPrepareForShutdown())
throw new EngineShutdownException("Cannot register a process while engine is shutting down");
-
+
log.debug("registerProcess: " + proc);
procs.put(proc.getID(), proc);
}
@@ -156,7 +158,7 @@
procs.remove(proc.getID());
}
- private String getNamespaceURI(InputStream inStream)
+ private URI getNamespaceURI(InputStream inStream)
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
@@ -176,13 +178,13 @@
if (nsURI == null)
throw new IllegalStateException("Cannot get namespace URI from root element");
- return nsURI;
+ return URI.create(nsURI);
}
/**
* Get the handler for the dialect with the given namespace URI
*/
- public DialectHandler getDialectHandler(String nsURI)
+ public DialectHandler getDialectHandler(URI nsURI)
{
String dialectId = dialectRegistry.getDialect(nsURI);
if (dialectId == null)
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
+import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -347,9 +348,10 @@
/**
* Get the BPM descriptor dialect ID
*/
- protected String getDialectURI()
+ protected URI getDialectURI()
{
- String dialect = System.getProperty("jbpm.dialect.uri", DialectHandler.DEFAULT_NAMESPACE_URI);
- return dialect;
+ String defaultURI = DialectHandler.DEFAULT_NAMESPACE_URI.toString();
+ URI nsURI = URI.create(System.getProperty("jbpm.dialect.uri", defaultURI));
+ return nsURI;
}
}
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestHelper.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -49,7 +49,7 @@
*/
public void deploy(String archive) throws Exception
{
- URL url = getArchiveFile(archive).toURL();
+ URL url = getArchiveFile(archive).toURI().toURL();
getDeployer().deploy(url);
}
@@ -57,7 +57,7 @@
*/
public void undeploy(String archive) throws Exception
{
- URL url = getArchiveFile(archive).toURL();
+ URL url = getArchiveFile(archive).toURI().toURL();
getDeployer().undeploy(url);
}
@@ -89,7 +89,7 @@
/** Try to discover the URL for the deployment archive */
public URL getArchiveURL(String archive) throws MalformedURLException
{
- return getArchiveFile(archive).toURL();
+ return getArchiveFile(archive).toURI().toURL();
}
/** Try to discover the File for the deployment archive */
@@ -110,7 +110,7 @@
/** Try to discover the URL for the test resource */
public URL getResourceURL(String resource) throws MalformedURLException
{
- return getResourceFile(resource).toURL();
+ return getResourceFile(resource).toURI().toURL();
}
/** Try to discover the File for the test resource */
Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/IntegrationTestSetup.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -72,7 +72,7 @@
public URL getArchiveURL(String archive) throws MalformedURLException
{
- return delegate.getArchiveFile(archive).toURL();
+ return delegate.getArchiveFile(archive).toURI().toURL();
}
public File getResourceFile(String resource)
@@ -82,7 +82,7 @@
public URL getResourceURL(String resource) throws MalformedURLException
{
- return delegate.getResourceFile(resource).toURL();
+ return delegate.getResourceFile(resource).toURI().toURL();
}
private void getArchiveArray(String archiveList)
Modified: projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml 2008-09-16 09:31:59 UTC (rev 2261)
@@ -40,7 +40,7 @@
<!-- The DialectRegistry -->
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <map keyClass="java.net.URI" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
<entry><key>urn:jbpm.org:jpdl-3.2</key><value>jpdl32</value></entry>
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
Modified: projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -27,6 +27,7 @@
import java.io.InputStreamReader;
import java.io.StringReader;
import java.io.Writer;
+import java.net.URI;
import java.net.URL;
import javax.xml.bind.JAXBException;
@@ -43,7 +44,7 @@
*/
public class DialectHandlerImpl implements DialectHandler
{
- public String getNamespaceURI()
+ public URI getNamespaceURI()
{
return DEFAULT_NAMESPACE_URI;
}
Modified: projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -27,6 +27,7 @@
import java.io.Reader;
import java.io.StringWriter;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URL;
import javax.management.ObjectName;
@@ -170,7 +171,7 @@
{
for (JAXBInclude incl : jaxbProc.getIncludes())
{
- String nsURI = incl.getNamespace();
+ URI nsURI = incl.getNamespace();
String location = incl.getLocation();
URL procURL;
Modified: projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclude.java
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclude.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclude.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -23,6 +23,8 @@
//$Id$
+import java.net.URI;
+
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
@@ -35,16 +37,16 @@
@XmlType(name = "Include")
public class JAXBInclude
{
- private String namespace;
+ private URI namespace;
private String location;
- public String getNamespace()
+ public URI getNamespace()
{
return namespace;
}
@XmlAttribute(required = true)
- public void setNamespace(String namespace)
+ public void setNamespace(URI namespace)
{
this.namespace = namespace;
}
Modified: projects/jbpm-spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/api10/src/test/resources/jbpm-beans.xml 2008-09-16 09:31:59 UTC (rev 2261)
@@ -34,7 +34,7 @@
<!-- The DialectRegistry -->
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <map keyClass="java.net.URI" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
</map>
</property>
Modified: projects/jbpm-spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -27,6 +27,7 @@
import java.io.InputStreamReader;
import java.io.StringReader;
import java.io.Writer;
+import java.net.URI;
import java.net.URL;
import javax.xml.bind.JAXBException;
@@ -45,9 +46,9 @@
*/
public class DialectHandlerImpl implements DialectHandler
{
- public static final String NAMESPACE_URI = "urn:jbpm.org:jpdl-3.2";
+ public static final URI NAMESPACE_URI = URI.create("urn:jbpm.org:jpdl-3.2");
- public String getNamespaceURI()
+ public URI getNamespaceURI()
{
return NAMESPACE_URI;
}
Modified: projects/jbpm-spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -26,6 +26,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.Writer;
+import java.net.URI;
import java.net.URL;
import javax.xml.bind.JAXBException;
@@ -43,9 +44,9 @@
*/
public class DialectHandlerImpl implements DialectHandler
{
- public static final String NAMESPACE_URI = "http://stp.eclipse.org/bpmn";
+ public static final URI NAMESPACE_URI = URI.create("http://stp.eclipse.org/bpmn");
- public String getNamespaceURI()
+ public URI getNamespaceURI()
{
return NAMESPACE_URI;
}
Modified: projects/jbpm-spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/stp/src/test/resources/jbpm-beans.xml 2008-09-16 09:31:59 UTC (rev 2261)
@@ -34,7 +34,7 @@
<!-- The DialectRegistry -->
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <map keyClass="java.net.URI" valueClass="java.lang.String">
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
</map>
</property>
Modified: projects/jbpm-spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/DialectHandlerImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/DialectHandlerImpl.java 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/DialectHandlerImpl.java 2008-09-16 09:31:59 UTC (rev 2261)
@@ -27,6 +27,7 @@
import java.io.InputStreamReader;
import java.io.StringReader;
import java.io.Writer;
+import java.net.URI;
import java.net.URL;
import javax.xml.bind.JAXBException;
@@ -45,9 +46,9 @@
*/
public class DialectHandlerImpl implements DialectHandler
{
- public static final String NAMESPACE_URI = "http://www.wfmc.org/2008/XPDL2.1";
+ public static final URI NAMESPACE_URI = URI.create("http://www.wfmc.org/2008/XPDL2.1");
- public String getNamespaceURI()
+ public URI getNamespaceURI()
{
return NAMESPACE_URI;
}
Modified: projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml 2008-09-16 09:31:59 UTC (rev 2261)
@@ -32,7 +32,7 @@
<!-- The DialectRegistry -->
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <map keyClass="java.net.URI" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
<entry><key>urn:jbpm.org:jpdl-3.2</key><value>jpdl32</value></entry>
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
Modified: projects/jbpm-spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-09-16 08:28:42 UTC (rev 2260)
+++ projects/jbpm-spec/trunk/modules/samples/airticket/server/src/main/resources/jbpm-beans.xml 2008-09-16 09:31:59 UTC (rev 2261)
@@ -36,7 +36,7 @@
<!-- The DialectRegistry -->
<bean name="jBPMDialectRegistry" class="org.jboss.bpm.client.DialectRegistry">
<property name="registry">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <map keyClass="java.net.URI" valueClass="java.lang.String">
<entry><key>urn:bpm.jboss:pdl-0.1</key><value>api10</value></entry>
<entry><key>http://stp.eclipse.org/bpmn</key><value>stp</value></entry>
</map>
More information about the jbpm-commits
mailing list