From 1ff9b3b7cd9f2e1b9f0a2a7662445499460e0a79 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 15 Oct 2008 16:56:19 +0000 Subject: Fix the impl.bpel dependency on BPELPartnerLinkTypeExt git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704961 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-equinox/modules/binding-ws-xml/pom.xml | 2 +- .../modules/implementation-bpel-jbpm/pom.xml | 265 ++++++++++----------- .../modules/implementation-bpel-ode/pom.xml | 2 +- .../modules/implementation-bpel/pom.xml | 2 +- .../bpel/xml/BPELDocumentProcessor.java | 2 +- .../wsdl/xml/BPELExtensionHandler.java | 1 + .../wsdl/xml/BPELPartnerLinkTypeExt.java | 79 ------ .../interfacedef/wsdl/BPELPartnerLinkTypeExt.java | 79 ++++++ 8 files changed, 213 insertions(+), 219 deletions(-) delete mode 100644 branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java create mode 100644 branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java (limited to 'branches') diff --git a/branches/sca-equinox/modules/binding-ws-xml/pom.xml b/branches/sca-equinox/modules/binding-ws-xml/pom.xml index ecca16624d..4e584b1569 100644 --- a/branches/sca-equinox/modules/binding-ws-xml/pom.xml +++ b/branches/sca-equinox/modules/binding-ws-xml/pom.xml @@ -84,7 +84,7 @@ ${tuscany.version} org.apache.tuscany.sca.binding.ws.xml ${pom.name} - org.apache.tuscany.sca.binding.ws.xml* + diff --git a/branches/sca-equinox/modules/implementation-bpel-jbpm/pom.xml b/branches/sca-equinox/modules/implementation-bpel-jbpm/pom.xml index dab1a851c3..30a2ce677f 100644 --- a/branches/sca-equinox/modules/implementation-bpel-jbpm/pom.xml +++ b/branches/sca-equinox/modules/implementation-bpel-jbpm/pom.xml @@ -1,140 +1,133 @@ - + - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.4-SNAPSHOT - ../pom.xml - - tuscany-implementation-bpel-jbpm - Apache Tuscany SCA BPEL jBPM Implementation Extension - - - org.apache.tuscany.sca - tuscany-assembly - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-bpel - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-core - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-assembly-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-contribution - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-sca-api - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-wsdl - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-interface-wsdl-xml - 1.4-SNAPSHOT - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.1.1 - compile - - - stax - stax-api - - - - - junit - junit - 3.8.1 - test - - - org.easymock - easymock - 2.2 - test - - - - - - - - org.apache.felix - maven-bundle-plugin + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.4-SNAPSHOT + ../pom.xml + + tuscany-implementation-bpel-jbpm + Apache Tuscany SCA BPEL jBPM Implementation Extension + + + org.apache.tuscany.sca + tuscany-assembly + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-implementation-bpel + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-core + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-interface + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-assembly-xml + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-contribution + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-sca-api + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-databinding + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-databinding-sdo + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-interface-wsdl + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-interface-wsdl-xml + 1.4-SNAPSHOT + + + org.apache.tuscany.sdo + tuscany-sdo-impl + 1.1.1 + compile + + + stax + stax-api + + + + + junit + junit + 3.8.1 + test + + + org.easymock + easymock + 2.2 + test + - - - ${tuscany.version} - org.apache.tuscany.sca.implementation.bpel.jbpm - ${pom.name} - org.apache.tuscany.sca.implementation.bpel.jbpm* - - - - - + + + + + + org.apache.felix + maven-bundle-plugin + + + + ${tuscany.version} + org.apache.tuscany.sca.implementation.bpel.jbpm + + ${pom.name} + + + + + + diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml b/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml index acd7781a9e..08f6a15ca1 100644 --- a/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml +++ b/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml @@ -426,7 +426,7 @@ ${tuscany.version} org.apache.tuscany.sca.implementation.bpel.ode ${pom.name} - org.apache.tuscany.sca.implementation.bpel.ode* + diff --git a/branches/sca-equinox/modules/implementation-bpel/pom.xml b/branches/sca-equinox/modules/implementation-bpel/pom.xml index ac1e8af858..763e61a0c4 100644 --- a/branches/sca-equinox/modules/implementation-bpel/pom.xml +++ b/branches/sca-equinox/modules/implementation-bpel/pom.xml @@ -89,7 +89,7 @@ ${tuscany.version} org.apache.tuscany.sca.implementation.bpel ${pom.name} - org.apache.tuscany.sca.implementation.bpel* + org.apache.tuscany.sca.implementation.bpel diff --git a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java index 22837baefd..0e24b94a2e 100644 --- a/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java +++ b/branches/sca-equinox/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java @@ -46,11 +46,11 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint; import org.apache.tuscany.sca.implementation.bpel.BPELFactory; import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition; import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.wsdl.BPELPartnerLinkTypeExt; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject; -import org.apache.tuscany.sca.interfacedef.wsdl.xml.BPELPartnerLinkTypeExt; import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; import org.apache.tuscany.sca.monitor.Problem.Severity; diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java index 13203d4adc..5178149b63 100644 --- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java +++ b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java @@ -28,6 +28,7 @@ import javax.wsdl.extensions.ExtensionRegistry; import javax.wsdl.extensions.ExtensionSerializer; import javax.xml.namespace.QName; +import org.apache.tuscany.sca.interfacedef.wsdl.BPELPartnerLinkTypeExt; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java b/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java deleted file mode 100644 index 67124832f3..0000000000 --- a/branches/sca-equinox/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.interfacedef.wsdl.xml; - -import javax.wsdl.extensions.ExtensibilityElement; -import javax.xml.namespace.QName; - -/** - * A class to serve as the extensibility element for BPEL partnerLinkType elements - * - * @version $Rev$ $Date$ - */ -public class BPELPartnerLinkTypeExt implements ExtensibilityElement { - - private QName elementType = null; - private String linkTypeName = null; - private String[] roleNames = new String[2]; - private QName[] rolePortTypes = new QName[2]; - - // -- methods required by the Extensibility Element interface - public QName getElementType() { - return elementType; - } - - public Boolean getRequired() { - return true; - } - - public void setElementType(QName theName ) { - elementType = theName; - } - - public void setRequired(Boolean required) { - // intentionally left blank - } - - // -- other methods - - public void setName( String theName ) { - linkTypeName = theName; - } - - public String getName() { - return linkTypeName; - } - - public void setRole( int i, String name, QName portType ) { - if( i > 1 ) return; - roleNames[i] = name; - rolePortTypes[i] = portType; - } - - public String getRoleName( int i ) { - if( i > 1 ) return null; - return roleNames[i]; - } - - public QName getRolePortType( int i ) { - if( i > 1 ) return null; - return rolePortTypes[i]; - } - -} // end BPELPartnerLinkTypeExt diff --git a/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java b/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java new file mode 100644 index 0000000000..0d6f23e732 --- /dev/null +++ b/branches/sca-equinox/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.interfacedef.wsdl; + +import javax.wsdl.extensions.ExtensibilityElement; +import javax.xml.namespace.QName; + +/** + * A class to serve as the extensibility element for BPEL partnerLinkType elements + * + * @version $Rev$ $Date$ + */ +public class BPELPartnerLinkTypeExt implements ExtensibilityElement { + + private QName elementType = null; + private String linkTypeName = null; + private String[] roleNames = new String[2]; + private QName[] rolePortTypes = new QName[2]; + + // -- methods required by the Extensibility Element interface + public QName getElementType() { + return elementType; + } + + public Boolean getRequired() { + return true; + } + + public void setElementType(QName theName ) { + elementType = theName; + } + + public void setRequired(Boolean required) { + // intentionally left blank + } + + // -- other methods + + public void setName( String theName ) { + linkTypeName = theName; + } + + public String getName() { + return linkTypeName; + } + + public void setRole( int i, String name, QName portType ) { + if( i > 1 ) return; + roleNames[i] = name; + rolePortTypes[i] = portType; + } + + public String getRoleName( int i ) { + if( i > 1 ) return null; + return roleNames[i]; + } + + public QName getRolePortType( int i ) { + if( i > 1 ) return null; + return rolePortTypes[i]; + } + +} // end BPELPartnerLinkTypeExt -- cgit v1.2.3