tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r747769 - in /tuscany/java/sca/modules/implementation-bpel/src/main: java/org/apache/tuscany/sca/implementation/bpel/ java/org/apache/tuscany/sca/implementation/bpel/impl/ java/org/apache/tuscany/sca/implementation/bpel/xml/ resources/META-...
Date Wed, 25 Feb 2009 13:08:08 GMT
Author: antelder
Date: Wed Feb 25 13:08:07 2009
New Revision: 747769

URL: http://svn.apache.org/viewvc?rev=747769&view=rev
Log:
Copy the change in r746461 from 1.x to 2.x - Add BPEL document resolver to defer to namespace
imports if document is not found in current contribution

Added:
    tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
  (contents, props changed)
      - copied, changed from r747758, tuscany/branches/sca-java-1.x/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
    tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
  (props changed)
      - copied unchanged from r747758, tuscany/branches/sca-java-1.x/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
Modified:
    tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
    tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
    tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
    tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java

Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java?rev=747769&r1=747768&r2=747769&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
Wed Feb 25 13:08:07 2009
@@ -19,8 +19,6 @@
 
 package org.apache.tuscany.sca.implementation.bpel;
 
-import java.net.URI;
-import java.net.URL;
 import java.util.List;
 
 import javax.wsdl.PortType;

Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java?rev=747769&r1=747768&r2=747769&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
Wed Feb 25 13:08:07 2009
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.implementation.bpel.impl;
 
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 

Copied: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
(from r747758, tuscany/branches/sca-java-1.x/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java?p2=tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java&p1=tuscany/branches/sca-java-1.x/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java&r1=747758&r2=747769&rev=747769&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
Wed Feb 25 13:08:07 2009
@@ -24,12 +24,11 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
 import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
 
 /**
@@ -42,7 +41,7 @@
     private Contribution contribution;
     private Map<QName, BPELProcessDefinition> map = new HashMap<QName, BPELProcessDefinition>();
     
-    public BPELDocumentModelResolver(Contribution contribution, ModelFactoryExtensionPoint
modelFactories) {
+    public BPELDocumentModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories)
{
         this.contribution = contribution;
     }
 

Propchange: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 25 13:08:07 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java:671193

Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java?rev=747769&r1=747768&r2=747769&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
Wed Feb 25 13:08:07 2009
@@ -18,9 +18,8 @@
  */
 package org.apache.tuscany.sca.implementation.bpel.xml;
 
-import javax.xml.namespace.QName;
-
 import javax.wsdl.PortType;
+import javax.xml.namespace.QName;
 
 /**
  * Represents a <partnerLink.../> element in a BPEL process

Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java?rev=747769&r1=747768&r2=747769&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
(original)
+++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
Wed Feb 25 13:08:07 2009
@@ -17,10 +17,9 @@
  * under the License.
  */package org.apache.tuscany.sca.implementation.bpel.xml;
 
- import javax.xml.namespace.QName; 
- 
- import javax.wsdl.extensions.ExtensibilityElement;
  import javax.wsdl.PortType;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.xml.namespace.QName;
  
 /**
  * Represents a <partnerLinkType.../> element related to a BPEL process

Propchange: tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 25 13:08:07 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver:671193



Mime
View raw message