tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r576992 - in /incubator/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/provider/ ...
Date Tue, 18 Sep 2007 17:34:46 GMT
Author: lresende
Date: Tue Sep 18 10:34:45 2007
New Revision: 576992

URL: http://svn.apache.org/viewvc?rev=576992&view=rev
Log:
Minor fix on implementation-bpel to use process location introspected from contribution

Modified:
    incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
    incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
    incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
    incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
    incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java?rev=576992&r1=576991&r2=576992&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
(original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
Tue Sep 18 10:34:45 2007
@@ -30,19 +30,6 @@
 public interface BPELImplementation extends Implementation {
 
     /**
-     * Builds the process configuration used by ODE to get deployment and configuration
-     * level information about a process.
-     * @return
-     */
-    //ProcessConf getProcessConf();
-
-    /**
-     * Sets the implementation compiled process bytes
-     * @param compiledProcess serialized compiled process
-     */
-    //void setCompiledProcess(byte[] compiledProcess);
-
-    /**
      * Get the BPEL process Name
      */
     QName getProcess();
@@ -52,4 +39,16 @@
      * @param processName process QName
      */
     void setProcess(QName processName);
+    
+    /**
+     * Get the BPEL process definition
+     * @return
+     */
+    BPELProcessDefinition getProcessDefinition();
+    
+    /**
+     * Set the BPEL process definition
+     * @param processDefinition
+     */
+    void setProcessDefinition(BPELProcessDefinition processDefinition);
 }

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?rev=576992&r1=576991&r2=576992&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
(original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
Tue Sep 18 10:34:45 2007
@@ -41,6 +41,7 @@
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.impl.ComponentTypeImpl;
 import org.apache.tuscany.sca.implementation.bpel.BPELImplementation;
+import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
 import org.w3c.dom.Node;
 
@@ -51,9 +52,9 @@
  */
 public class BPELImplementationImpl extends ComponentTypeImpl implements BPELImplementation
{
 
-    private Service _bpelService;
     private QName _processName;
-    private byte[] _compiledProcess;
+    private BPELProcessDefinition _processDefinition;
+
     private boolean unresolved;
 
     /**
@@ -64,10 +65,6 @@
 
     }
 
-    public void setCompiledProcess(byte[] compiledProcess) {
-        _compiledProcess = compiledProcess;
-    }
-
     public QName getProcess() {
         return _processName;
     }
@@ -76,8 +73,12 @@
         _processName = processName;
     }
 
-    public ProcessConf getProcessConf() {
-        return null;
+    public BPELProcessDefinition getProcessDefinition() {
+        return this._processDefinition;
+    }
+
+    public void setProcessDefinition(BPELProcessDefinition processDefinition) {
+        this._processDefinition = processDefinition;
     }
 
     @Override
@@ -137,7 +138,7 @@
         }
 
         public InputStream getCBPInputStream() {
-            return new ByteArrayInputStream(_compiledProcess);
+            return null; //new ByteArrayInputStream(_compiledProcess);
         }
 
         public String getBpelDocument() {

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java?rev=576992&r1=576991&r2=576992&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
(original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationProcessor.java
Tue Sep 18 10:34:45 2007
@@ -110,6 +110,8 @@
                 throw new ContributionResolveException("Can't find BPEL Process : " + processDefinition.getName());
             }
             
+            impl.setProcessDefinition(processDefinition);
+            
             //resolve component type
             mergeComponentType(resolver, impl);
                         

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java?rev=576992&r1=576991&r2=576992&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
(original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider/BPELImplementationProvider.java
Tue Sep 18 10:34:45 2007
@@ -82,7 +82,8 @@
                 odeServer.init();
             }
 
-            URL deployURL = getClass().getClassLoader().getResource("deploy.xml");
+            URL deployURL = this.implementation.getProcessDefinition().getLocation();
+            
             File deploymentDir = new File(deployURL.toURI().getPath()).getParentFile();
             System.out.println("Deploying : " + deploymentDir.toString());
             System.out.println(deploymentDir);

Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=576992&r1=576991&r2=576992&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Tue Sep 18 10:34:45 2007
@@ -16,5 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.bpel.impl.BPELImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
-org.apache.tuscany.sca.implementation.bpel.impl.BPELDocumentProcessor;qname=http://schemas.xmlsoap.org/ws/2004/03/business-process#process,model=org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition
\ No newline at end of file
+org.apache.tuscany.sca.implementation.bpel.impl.BPELImplementationProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementation.bpel,model=org.apache.tuscany.sca.implementation.bpel.BPELImplementation
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message