Author: jsdelfino
Date: Mon May 12 15:03:14 2008
New Revision: 655664
URL: http://svn.apache.org/viewvc?rev=655664&view=rev
Log:
Added correct registration of WebServiceBindingFactory as it was missing before
and removed some of the hardcoded creations of DefaultWebServiceBindingFactory
as they're not necessary anymore.
Added:
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/services/
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=655664&r1=655663&r2=655664&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
Mon May 12 15:03:14 2008
@@ -80,6 +80,7 @@
this.component = component;
this.reference = reference;
this.binding = binding.getSCABinding();
+ //FIXME fix that hack, shouldn't create a new instance of the binding
factory here
wsBinding = (new
DefaultWebServiceBindingFactory()).createWebServiceBinding();
// Turn the java interface contract into a WSDL interface contract
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=655664&r1=655663&r2=655664&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
Mon May 12 15:03:14 2008
@@ -67,6 +67,7 @@
Map<ClassLoader,
List<PolicyHandlerTuple>> policyHandlerClassnames) {
this.nodeFactory = nodeFactory;
this.binding = binding.getSCABinding();
+ //FIXME fix that hack, shouldn't create a new instance of the binding
factory here
wsBinding = (new
DefaultWebServiceBindingFactory()).createWebServiceBinding();
// Turn the java interface contract into a WSDL interface contract
Modified:
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=655664&r1=655663&r2=655664&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
Mon May 12 15:03:14 2008
@@ -40,7 +40,6 @@
import org.apache.tuscany.sca.assembly.xml.ConfiguredOperationProcessor;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.assembly.xml.PolicyAttachPointProcessor;
-import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
@@ -71,7 +70,7 @@
public WebServiceBindingProcessor(ModelFactoryExtensionPoint
modelFactories) {
this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
- this.wsFactory = new DefaultWebServiceBindingFactory();
+ this.wsFactory =
modelFactories.getFactory(WebServiceBindingFactory.class);
this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
this.intentAttachPointTypeFactory =
modelFactories.getFactory(IntentAttachPointTypeFactory.class);
Modified:
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java?rev=655664&r1=655663&r2=655664&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
Mon May 12 15:03:14 2008
@@ -21,10 +21,11 @@
import org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingFactoryImpl;
/**
- * A factory for the WSDL model.
+ * A factory for the Web Service binding model.
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class DefaultWebServiceBindingFactory extends
WebServiceBindingFactoryImpl implements WebServiceBindingFactory {
}
Modified:
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java?rev=655664&r1=655663&r2=655664&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
Mon May 12 15:03:14 2008
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class WebServiceBindingFactoryImpl implements
WebServiceBindingFactory {
+public class WebServiceBindingFactoryImpl implements WebServiceBindingFactory {
public WebServiceBinding createWebServiceBinding() {
return new WebServiceBindingImpl();
Added:
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory?rev=655664&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
(added)
+++
incubator/tuscany/java/sca/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
Mon May 12 15:03:14 2008
@@ -0,0 +1,19 @@
+# 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.
+
+# Implementation class for the model factory
+org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingFactoryImpl
\ No newline at end of file
