svn commit: r438535 - in /incubator/ode/trunk: bpel-dd/src/main/xsd/bpeldd.xsd bpel-dd/src/main/xsd/bpeldd.xsdconfig bpel-dd/src/main/xsd/dd.xsd bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessDDInitializer.java

[mszefler]

Author: mszefler
Date: Wed Aug 30 09:29:24 2006
New Revision: 438535

URL: http://svn.apache.org/viewvc?rev=438535&view=rev
Log:
Removed old deployment descriptor
Use QNames in deploy descriptor for process properties


Removed:
    incubator/ode/trunk/bpel-dd/src/main/xsd/bpeldd.xsd
    incubator/ode/trunk/bpel-dd/src/main/xsd/bpeldd.xsdconfig
Modified:
    incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessDDInitializer.java

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=438535&r1=438534&r2=438535&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd (original)
+++ incubator/ode/trunk/bpel-dd/src/main/xsd/dd.xsd Wed Aug 30 09:29:24 2006
@@ -47,7 +47,7 @@
               </xs:annotation>
             </xs:element>
 
-            <xs:element name="property"  minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="property"  minOccurs="0" maxOccurs="unbounded">
               <xs:annotation>
                 <xs:documentation>
                   A user-defined property that will be attached to a process 
upon
@@ -58,8 +58,7 @@
                 <xs:sequence>
                   <xs:any namespace="##other" minOccurs="0" 
maxOccurs="unbounded" processContents="lax"/>
                 </xs:sequence>
-                <xs:attribute name="name" type="xs:string" use="required"/>
-                <xs:attribute name="namespace" type="xs:anyURI" 
use="required"/>
+                <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/engine/ProcessDDInitializer.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessDDInitializer.java?rev=438535&r1=438534&r2=438535&view=diff
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessDDInitializer.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessDDInitializer.java
 Wed Aug 30 09:29:24 2006
@@ -109,12 +109,12 @@
       for (TDeployment.Process.Property property : _dd.getPropertyList()) {
         String textContent = DOMUtils.getTextContent(property.getDomNode());
         if (textContent != null) {
-          processDAO.setProperty(property.getName(), property.getNamespace(),
+          processDAO.setProperty(property.getName().getLocalPart(), 
property.getName().getNamespaceURI(),
               textContent);
         } else {
           Element elmtContent = DOMUtils.getElementContent(property
               .getDomNode());
-          processDAO.setProperty(property.getName(), property.getNamespace(),
+          processDAO.setProperty(property.getName().getLocalPart(), 
property.getName().getNamespaceURI(),
               elmtContent);
         }
       }