Author: mszefler
Date: Mon Aug 14 15:36:19 2006
New Revision: 431453
URL: http://svn.apache.org/viewvc?rev=431453&view=rev
Log:
Minor fixes to deployment desciptors.
Added an optional <type> field in DD.
Added:
incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
(with props)
Modified:
incubator/ode/trunk/axis2-examples/src/examples/DynPartner/deploy.xml
incubator/ode/trunk/axis2-examples/src/examples/MagicSession/deploy.xml
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentPoller.java
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Messages.java
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
incubator/ode/trunk/jbi-examples/src/examples/example-build.xml
Modified: incubator/ode/trunk/axis2-examples/src/examples/DynPartner/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-examples/src/examples/DynPartner/deploy.xml?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
--- incubator/ode/trunk/axis2-examples/src/examples/DynPartner/deploy.xml
(original)
+++ incubator/ode/trunk/axis2-examples/src/examples/DynPartner/deploy.xml Mon
Aug 14 15:36:19 2006
@@ -13,6 +13,7 @@
</invoke>
</process>
<process name="resp:DynPartnerResponder">
+ <type>resp:DynPartnerResponder</type>
<provide partnerLink="mainPartnerLink">
<service name="rws:DynResponderService"
port="DynResponderPort"/>
</provide>
Modified:
incubator/ode/trunk/axis2-examples/src/examples/MagicSession/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-examples/src/examples/MagicSession/deploy.xml?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
--- incubator/ode/trunk/axis2-examples/src/examples/MagicSession/deploy.xml
(original)
+++ incubator/ode/trunk/axis2-examples/src/examples/MagicSession/deploy.xml Mon
Aug 14 15:36:19 2006
@@ -15,6 +15,7 @@
</invoke>
</process>
<process name="resp:MagicSessionResponder">
+ <type>resp:MagicSessionResponder</type>
<provide partnerLink="mainPartnerLink">
<service name="mws:MSResponderService"
port="MSResponderPort"/>
</provide>
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentPoller.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentPoller.java?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
---
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentPoller.java
(original)
+++
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentPoller.java
Mon Aug 14 15:36:19 2006
@@ -32,7 +32,7 @@
*/
public class DeploymentPoller {
- private static Log __log = LogFactory.getLog(DeploymentPoller.class);
+ private static final Log __log = LogFactory.getLog(DeploymentPoller.class);
/** The polling interval. */
private static final long POLL_TIME = 3000;
@@ -138,12 +138,13 @@
*/
private class PollingThread extends Thread {
private boolean _active = true;
+ private byte[] _mutex = new byte[0];
/** Stop this poller, and block until it terminates. */
void kill() {
- synchronized (this) {
+ synchronized (_mutex) {
_active = false;
- this.notifyAll();
+ _mutex.notify();
}
try {
join();
@@ -156,9 +157,9 @@
try {
while (_active) {
check();
- synchronized (this) {
+ synchronized (_mutex) {
try {
- this.wait(POLL_TIME);
+ _mutex.wait(POLL_TIME);
} catch (InterruptedException e) {
}
}
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Messages.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Messages.java?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Messages.java
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/Messages.java
Mon Aug 14 15:36:19 2006
@@ -138,4 +138,8 @@
return format("The WSDL for namespace \"{0}\" could not be found in
\"{1}\".", wsdlUri, location);
}
+ public String msgOdeShutdownCompleted() {
+ return "Shutdown completed. ";
+ }
+
}
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Mon Aug 14 15:36:19 2006
@@ -114,7 +114,7 @@
__log.debug("Starting Hibernate.");
initHibernate();
- __log.info("Hibernate started.");
+ __log.debug("Hibernate started.");
__log.debug("Initializing BPEL server.");
initBpelServer();
@@ -175,7 +175,7 @@
_jotm.stop();
_jotm = null;
- __log.info("Shutdown completed.");
+ __log.info(__msgs.msgOdeShutdownCompleted());
} finally {
Thread.currentThread().setContextClassLoader(old);
}
Modified: incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd (original)
+++ incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd Mon Aug 14 15:36:19 2006
@@ -78,8 +78,17 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="type" minOccurs="1" maxOccurs="1"
type="xs:QName">
+ <xs:annotation>
+ <xs:documentation> Process type -- indicates which process
defintion should be used
+ for the process.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
</xs:sequence>
+
<xs:attribute name="name" type="xs:QName" use="required"/>
+
</xs:complexType>
</xs:element>
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/deploy/DeploymentUnitImpl.java
Mon Aug 14 15:36:19 2006
@@ -211,6 +211,10 @@
return _dd;
}
+ /**
+ * Get the mapping of process <em>types</em> to compiled processes.
+ * @return
+ */
public HashMap<QName, OProcess> getProcesses() {
loadProcessDefinitions();
return _processes;
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
Mon Aug 14 15:36:19 2006
@@ -564,10 +564,14 @@
BpelEngineException failed = null;
// Going trough each process declared in the dd
for (TDeployment.Process processDD :
du.getDeploymentDescriptor().getDeploy().getProcessList()) {
- OProcess oprocess = du.getProcesses().get(processDD.getName());
+
+ // If a type is not specified, assume the process id is also the
type.
+ QName type = processDD.getType() != null ? processDD.getType() :
processDD.getName();
+ OProcess oprocess = du.getProcesses().get(type);
if (oprocess == null)
- throw new BpelEngineException("Could not find the compiled
process definition for a "
- + "process referenced in the deployment descriptor: "
+ processDD.getName());
+ throw new BpelEngineException("Could not find the compiled
process definition for BPEL" +
+ "type " + type + " when deploying process " +
processDD.getName()
+ + " in " + deploymentUnitDirectory);
try {
deploy(processDD.getName(), du, oprocess, du.getDocRegistry()
Added:
incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml?rev=431453&view=auto
==============================================================================
---
incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
(added)
+++
incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
Mon Aug 14 15:36:19 2006
@@ -0,0 +1,12 @@
+<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
+ xmlns:pns="urn:org.apache.ode/examples/jbi/HelloWorld2"
+ xmlns:sns="urn:/HelloWorld2.wsdl" >
+
+
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="sns:HelloService" port="jbi"/>
+ </provide>
+ </process>
+</deploy>
Propchange:
incubator/ode/trunk/jbi-examples/src/examples/HelloWorld2/HelloWorld2-process/deploy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ode/trunk/jbi-examples/src/examples/example-build.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi-examples/src/examples/example-build.xml?rev=431453&r1=431452&r2=431453&view=diff
==============================================================================
--- incubator/ode/trunk/jbi-examples/src/examples/example-build.xml (original)
+++ incubator/ode/trunk/jbi-examples/src/examples/example-build.xml Mon Aug 14
15:36:19 2006
@@ -75,7 +75,7 @@
<target name="service-unit" depends="init,clean,bpelc">
<zip destfile="${sufile}">
<fileset dir="${build.dir}" includes="**/*"/>
- <fileset dir="./" includes="*.dd"/>
+ <fileset dir="./" includes="deploy.xml"/>
</zip>
</target>
