diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-28 10:58:07 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-28 10:58:07 +0000 |
commit | 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 (patch) | |
tree | f3d3148a4c4ae6d56185cbd55333aaf119532d26 /sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src | |
parent | 19aadc9a267456fe8b84a9a4d3afca74ba9ef969 (diff) |
Delete old beta3 branch as its going to be recreated from the current trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
29 files changed, 0 insertions, 2218 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java deleted file mode 100644 index 701c148218..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABinding.java +++ /dev/null @@ -1,32 +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.binding.local;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * Represents a Local SCA Binding
- */
-public interface LocalSCABinding extends Binding {
- QName TYPE = new QName(Base.SCA11_TUSCANY_NS, "binding.local");
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java deleted file mode 100644 index 14717d8f70..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactory.java +++ /dev/null @@ -1,33 +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.binding.local;
-
-/**
- * Factory for the Local SCA Service binding model.
- */
-public interface LocalSCABindingFactory {
- /**
- * Create a new Local binding.
- *
- * @return a new Local binding
- */
- LocalSCABinding createLocalBinding();
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java deleted file mode 100644 index abf2efd876..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingFactoryImpl.java +++ /dev/null @@ -1,35 +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.binding.local;
-
-/**
- * A factory for the Local SCA binding model.
- */
-public class LocalSCABindingFactoryImpl implements LocalSCABindingFactory {
- public LocalSCABindingFactoryImpl() {
-
- }
-
- @Override
- public LocalSCABinding createLocalBinding() {
- return new LocalSCABindingImpl();
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java deleted file mode 100644 index 9ed9ccd1a9..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingImpl.java +++ /dev/null @@ -1,116 +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.binding.local;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * Represents a Local SCA Binding
- */
-public class LocalSCABindingImpl implements LocalSCABinding {
- private String name;
- private String uri;
- private WireFormat wireFormat;
-
- /**
- * Constructs a new Local binding.
- */
- public LocalSCABindingImpl() {
- }
-
- @Override
- public QName getType() {
- return TYPE;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Getters for the binding URI. The computed URI for the
- * service that the reference is targeting or which the service represents
- * depending on whether the biding is associated with a reference or
- * service
- *
- * @return the binding URI
- */
- @Override
- public String getURI() {
- return uri;
- }
-
- @Override
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- @Override
- public boolean isUnresolved() {
- return false;
- }
-
- @Override
- public void setUnresolved(boolean unresolved) {
- }
-
- @Override
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
- @Override
- public WireFormat getRequestWireFormat() {
- return wireFormat;
- }
-
- @Override
- public void setRequestWireFormat(WireFormat wireFormat) {
- this.wireFormat = wireFormat;
- }
-
- @Override
- public WireFormat getResponseWireFormat() {
- return wireFormat;
- }
-
- @Override
- public void setResponseWireFormat(WireFormat wireFormat) {
- this.wireFormat = wireFormat;
- }
-
- @Override
- public OperationSelector getOperationSelector() {
- return null;
- }
-
- @Override
- public void setOperationSelector(OperationSelector operationSelector) {
- }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingInvocationInterceptor.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingInvocationInterceptor.java deleted file mode 100644 index 36ac93a5be..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingInvocationInterceptor.java +++ /dev/null @@ -1,108 +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.binding.local;
-
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.core.invocation.AsyncResponseInvoker;
-import org.apache.tuscany.sca.core.invocation.InterceptorAsyncImpl;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-
-/**
- * Interceptor used by the SCA Binding on the service side chain to provide a mechanism for optimising
- * invocations when the reference and the service involved are both in the same JVM, and thus the need
- * to use a transport of any kind is unnecessary.
- *
- */
-public class LocalSCABindingInvocationInterceptor extends InterceptorAsyncImpl {
- private static final Logger logger = Logger.getLogger(LocalSCABindingInvocationInterceptor.class.getName());
-
- private Invoker next;
-
- private boolean skipPrevious;
-
- public LocalSCABindingInvocationInterceptor() {
- super();
- } // end constructor
-
- public Message invoke(Message msg) {
- return next.invoke(msg);
- } // end method invoke
-
- public Invoker getNext() {
- return next;
- } // end method getNext
-
- public void setNext(Invoker next) {
- this.next = next;
- } // end method setNext
-
- /**
- * Process request method is simply a passthrough
- */
- public Message processRequest(Message msg) {
- return msg ;
- } // end method processRequest
-
-
- /**
- * Handle an async response
- * - deals with the local SCA binding case only (at present)
- * - in this case, extract the async response invoker from the message header and call the EPR
- * that is present in the invoker, which is in fact the local EPR from which the original forward
- * request came
- */
- public void invokeAsyncResponse(Message msg) {
- @SuppressWarnings("unchecked")
- AsyncResponseInvoker<?> respInvoker =
- (AsyncResponseInvoker<?>)msg.getHeaders().get("ASYNC_RESPONSE_INVOKER");
- if( respInvoker != null && "SCA_LOCAL".equals(respInvoker.getBindingType()) ) {
- // Handle the locally optimised case
- RuntimeEndpointReference responseEPR = (RuntimeEndpointReference)respInvoker.getResponseTargetAddress();
- msg.setFrom(responseEPR);
- // Handle async response Relates_To message ID value
- String msgID = respInvoker.getRelatesToMsgID();
- msg.getHeaders().put("RELATES_TO", msgID);
-
- // Call the processing on the reference chain directly
- responseEPR.invokeAsyncResponse(msg);
-
- // Prevent the response being processed by the rest of the service chain
- return;
- } else {
- // Carry on processing the response by the rest of the service chain
- InvokerAsyncResponse thePrevious = (InvokerAsyncResponse)getPrevious();
- if (thePrevious != null ) thePrevious.invokeAsyncResponse(msg);
- return;
- } // end if
-
- } // end method invokeAsyncResponse
-
- /**
- * processResponse is not called during async response handling (all handled by invokeAsyncResponse)
- * - this version is a dummy which does nothing.
- */
- public Message processResponse(Message msg) {
- return msg;
- } // end method processResponse
-
-} // end class
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingInvoker.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingInvoker.java deleted file mode 100644 index a2eb53d5bb..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingInvoker.java +++ /dev/null @@ -1,167 +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.binding.local;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.invocation.AsyncResponseInvoker;
-import org.apache.tuscany.sca.core.invocation.InterceptorAsyncImpl;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.InvokerAsyncRequest;
-import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-
-
-/**
- * @version $Rev: 1057653 $ $Date: 2011-01-11 09:18:49 -0500 (Tue, 11 Jan 2011) $
- */
-public class LocalSCABindingInvoker extends InterceptorAsyncImpl {
- private InvocationChain chain;
- private Mediator mediator;
- private Operation sourceOperation;
- private Operation targetOperation;
- private boolean passByValue;
- private RuntimeEndpointReference epr;
- private RuntimeEndpoint ep;
- private ExtensionPointRegistry registry;
-
- /**
- * Construct a SCABindingInvoker that delegates to the service invocation chain
- */
- public LocalSCABindingInvoker(InvocationChain chain, Operation sourceOperation, Mediator mediator,
- boolean passByValue, RuntimeEndpointReference epr, ExtensionPointRegistry registry) {
- super();
- this.chain = chain;
- this.mediator = mediator;
- this.sourceOperation = sourceOperation;
- this.targetOperation = chain.getTargetOperation();
- this.passByValue = passByValue;
- this.epr = epr;
- this.ep = (RuntimeEndpoint)epr.getTargetEndpoint();
- this.registry = registry;
- }
-
- /**
- * @see org.apache.tuscany.sca.invocation.Interceptor#getNext()
- */
- public Invoker getNext() {
- return chain.getHeadInvoker(Phase.SERVICE_POLICY);
- }
-
- /**
- * @see org.apache.tuscany.sca.invocation.Interceptor#setNext(org.apache.tuscany.sca.invocation.Invoker)
- */
- public void setNext(Invoker next) {
- // NOOP
- }
-
- public Message processRequest(Message msg){
- if (passByValue) {
- msg.setBody(mediator.copyInput(msg.getBody(), sourceOperation, targetOperation));
- } // end if
-
- ep.getInvocationChains();
- if ( !ep.getCallbackEndpointReferences().isEmpty() ) {
- RuntimeEndpointReference asyncEPR = (RuntimeEndpointReference) ep.getCallbackEndpointReferences().get(0);
- // Place a link to the callback EPR into the message headers...
- msg.getHeaders().put("ASYNC_CALLBACK", asyncEPR );
- } // end if
-
- if( ep.isAsyncInvocation() ) {
- // Get the message ID
- String msgID = (String)msg.getHeaders().get("MESSAGE_ID");
-
- String operationName = msg.getOperation().getName();
-
- // Create a response invoker and add it to the message headers
- AsyncResponseInvoker<RuntimeEndpointReference> respInvoker =
- new AsyncResponseInvoker<RuntimeEndpointReference>(ep, null, epr, msgID, operationName, getMessageFactory());
- respInvoker.setBindingType("SCA_LOCAL");
- msg.getHeaders().put("ASYNC_RESPONSE_INVOKER", respInvoker);
- } // end if
-
- return msg;
- } // end method processRequest
-
- /**
- * Regular (sync) processing of response message
- */
- public Message processResponse(Message msg){
- if (passByValue) {
- // Note source and target operation swapped so result is in source class loader
- if (msg.isFault()) {
- msg.setFaultBody(mediator.copyFault(msg.getBody(), sourceOperation, targetOperation));
- } else {
- if (sourceOperation.getOutputType() != null) {
- msg.setBody(mediator.copyOutput(msg.getBody(), sourceOperation, targetOperation));
- } // end if
- } // end if
- } // end if
-
- return msg;
- } // end method processResponse
-
- public void invokeAsyncRequest(Message msg) throws Throwable {
- try{
- msg = processRequest(msg);
- InvokerAsyncRequest theNext = (InvokerAsyncRequest)getNext();
- if( theNext != null ) theNext.invokeAsyncRequest(msg);
- postProcessRequest(msg);
- } catch (Throwable e) {
- postProcessRequest(msg, e);
- } // end try
- } // end method invokeAsyncRequest
-
- public void invokeAsyncResponse(Message msg) {
- msg = processResponse(msg);
-
- // Handle async response Relates_To message ID value
- @SuppressWarnings("unchecked")
- AsyncResponseInvoker<RuntimeEndpointReference> respInvoker =
- (AsyncResponseInvoker<RuntimeEndpointReference>)msg.getHeaders().get("ASYNC_RESPONSE_INVOKER");
- // TODO - this deals with the Local case only - not distributed
- if( respInvoker != null && "SCA_LOCAL".equals(respInvoker.getBindingType()) ) {
- RuntimeEndpointReference responseEPR = respInvoker.getResponseTargetAddress();
- msg.setFrom(responseEPR);
- String msgID = respInvoker.getRelatesToMsgID();
- msg.getHeaders().put("RELATES_TO", msgID);
- } // end if
-
- InvokerAsyncResponse thePrevious = (InvokerAsyncResponse)getPrevious();
- if (thePrevious != null ) thePrevious.invokeAsyncResponse(msg);
- } // end method invokeAsyncResponse
-
- public boolean isLocalSCABIndingInvoker() {
- return true;
- }
-
- private MessageFactory getMessageFactory() {
- FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
- return modelFactories.getFactory(MessageFactory.class);
- } // end method getMessageFactory
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java deleted file mode 100644 index 4ba66fb47a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCABindingProviderFactory.java +++ /dev/null @@ -1,56 +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.binding.local;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.SCABindingMapper;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-
-public class LocalSCABindingProviderFactory implements BindingProviderFactory<LocalSCABinding> {
- private ExtensionPointRegistry extensionPoints;
- private SCABindingMapper scaBindingMapper;
-
- public LocalSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
- this.extensionPoints = extensionPoints;
- UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class);
- }
-
- @Override
- public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpointReference) {
- return new LocalSCAReferenceBindingProvider(extensionPoints, endpointReference, scaBindingMapper);
- }
-
- @Override
- public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {
- return new LocalSCAServiceBindingProvider(endpoint, scaBindingMapper);
- }
-
- @Override
- public Class<LocalSCABinding> getModelType() {
- return LocalSCABinding.class;
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java deleted file mode 100644 index 199ab0a103..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAReferenceBindingProvider.java +++ /dev/null @@ -1,146 +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.binding.local;
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.binding.local.LocalSCABindingInvoker;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.interfacedef.Compatibility;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.EndpointReferenceAsyncProvider;
-import org.apache.tuscany.sca.provider.SCABindingMapper;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-import org.oasisopen.sca.ServiceUnavailableException;
-
-public class LocalSCAReferenceBindingProvider implements EndpointReferenceAsyncProvider {
- private RuntimeEndpointReference endpointReference;
-
- private InterfaceContractMapper interfaceContractMapper;
- private ExtensionPointRegistry extensionPoints;
- private Mediator mediator;
-
- public LocalSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints, RuntimeEndpointReference endpointReference, SCABindingMapper mapper) {
- this.extensionPoints = extensionPoints;
- UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
- this.mediator = utilities.getUtility(Mediator.class);
-
- this.endpointReference = endpointReference;
- }
-
- @Override
- public InterfaceContract getBindingInterfaceContract() {
- RuntimeEndpoint endpoint = (RuntimeEndpoint) endpointReference.getTargetEndpoint();
- if (endpoint != null) {
- return endpoint.getComponentTypeServiceInterfaceContract();
- } else {
- return endpointReference.getComponentTypeReferenceInterfaceContract();
- }
- }
-
- @Override
- public Invoker createInvoker(Operation operation) {
- Invoker result = null;
-
- Endpoint target = endpointReference.getTargetEndpoint();
- if (target != null) {
- RuntimeComponentService service = (RuntimeComponentService) target.getService();
- if (service != null) { // not a callback wire
- InvocationChain chain = ((RuntimeEndpoint) target).getInvocationChain(operation);
-
- boolean passByValue = false;
- Operation targetOp = chain.getTargetOperation();
- if (!operation.getInterface().isRemotable()) {
- if (interfaceContractMapper.isCompatibleByReference(operation, targetOp, Compatibility.SUBSET)) {
- passByValue = false;
- }
- } else {
- Reference ref = endpointReference.getReference().getReference();
- // The spec says both ref and service needs to
- // allowsPassByReference
- boolean allowsPBR = (endpointReference.getReference().isAllowsPassByReference() || (ref != null && ref.isAllowsPassByReference())) && chain.allowsPassByReference();
-
- if (allowsPBR && interfaceContractMapper.isCompatibleByReference(operation, targetOp, Compatibility.SUBSET)) {
- passByValue = false;
- } else if (interfaceContractMapper.isCompatibleWithoutUnwrapByValue(operation, targetOp, Compatibility.SUBSET)) {
- passByValue = true;
- }
- }
- // it turns out that the chain source and target operations are
- // the same, and are the operation
- // from the target, not sure if thats by design or a bug. The
- // SCA binding invoker needs to know
- // the source and target class loaders so pass in the real
- // source operation in the constructor
- result = chain == null ? null : new LocalSCABindingInvoker(chain, operation, mediator, passByValue, endpointReference, extensionPoints);
- }
- }
-
- if (result == null) {
- throw new ServiceUnavailableException("Unable to create SCA binding invoker for local target " + endpointReference.getComponent().getName() + " reference "
- + endpointReference.getReference().getName() + " (bindingURI=" + endpointReference.getBinding().getURI() + " operation=" + operation.getName() + ")");
- }
-
- return result;
- }
-
- @Override
- public boolean supportsOneWayInvocation() {
- // Default for Local invocation
- return false;
- }
-
- @Override
- public boolean supportsNativeAsync() {
- return true;
- }
-
- @Override
- public void configure() {
- // Nothing required for Local invocation
- }
-
- @Override
- public void start() {
- // Nothing required for Local invocation
- }
-
- @Override
- public void stop() {
- // Nothing required for Local invocation
- }
-
- /**
- * Allows us to replace the delegate EPR with the real EPR so that the local binding
- * optimization operates against the correct invocation chains.
- */
- public void setEndpointReference(RuntimeEndpointReference endpointReference){
- this.endpointReference = endpointReference;
- }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java deleted file mode 100644 index 3bcc25e5cb..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/local/LocalSCAServiceBindingProvider.java +++ /dev/null @@ -1,74 +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.binding.local;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
-import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
-import org.apache.tuscany.sca.provider.SCABindingMapper;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-/*
- * This service side binding provide doesn't actually serve much purpose as the
- * local optimization skips over it.
- */
-public class LocalSCAServiceBindingProvider implements EndpointAsyncProvider {
- private RuntimeEndpoint endpoint;
-
- public LocalSCAServiceBindingProvider(RuntimeEndpoint endpoint, SCABindingMapper scaBindingMapper) {
- this.endpoint = endpoint;
- }
-
- @Override
- public InterfaceContract getBindingInterfaceContract() {
- return endpoint.getComponentTypeServiceInterfaceContract();
- }
-
- @Override
- public InvokerAsyncResponse createAsyncResponseInvoker() {
- return null;
- }
-
- @Override
- public boolean supportsOneWayInvocation() {
- // Default for Local invocation
- return false;
- }
-
- @Override
- public boolean supportsNativeAsync() {
- return true;
- }
-
- @Override
- public void stop() {
- // Nothing required for local invocation
- }
-
- @Override
- public void start() {
- // Nothing required for local invocation
- }
-
- @Override
- public void configure() {
- // Nothing required for local invocation
- }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java deleted file mode 100644 index c87779d58d..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java +++ /dev/null @@ -1,297 +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.binding.sca.provider; - -import java.io.StringReader; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.assembly.Base; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.builder.BindingBuilder; -import org.apache.tuscany.sca.assembly.builder.BuilderContext; -import org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint; -import org.apache.tuscany.sca.common.xml.stax.StAXHelper; -import org.apache.tuscany.sca.contribution.processor.ContributionReadException; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser; -import org.apache.tuscany.sca.policy.PolicySubject; -import org.apache.tuscany.sca.provider.ProviderFactory; -import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; -import org.apache.tuscany.sca.provider.SCABindingMapper; -import org.apache.tuscany.sca.runtime.DomainRegistryFactory; -import org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; -import org.oasisopen.sca.ServiceRuntimeException; - -/** - * Default implementation of SCABindingMapper - */ -public class DefaultSCABindingMapper implements SCABindingMapper { - private final static Logger logger = Logger.getLogger(DefaultSCABindingMapper.class.getName()); - protected ExtensionPointRegistry registry; - protected ProviderFactoryExtensionPoint providerFactories; - protected StAXArtifactProcessorExtensionPoint processors; - protected QName defaultMappedBinding; - protected QName defaultLocalBinding; - protected boolean supportsDistributedSCA; - - public DefaultSCABindingMapper(ExtensionPointRegistry registry, Map<String, String> attributes) { - this.registry = registry; - providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class); - processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - defaultMappedBinding = getDefaultMappedBinding(attributes); - defaultLocalBinding = new QName(Base.SCA11_TUSCANY_NS, "binding.local"); - supportsDistributedSCA = isDistributed(); - } - - protected QName getDefaultMappedBinding(Map<String, String> attributes) { - QName defaultMappedBinding = null; - if (attributes != null) { - String qname = attributes.get("mappedBinding"); - if (qname != null) { - defaultMappedBinding = ServiceDeclarationParser.getQName(qname); - } - } - if (defaultMappedBinding == null) { - String qname = - System.getProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding"); - if (qname != null) { - defaultMappedBinding = ServiceDeclarationParser.getQName(qname); - } else { - // By default, mapping to binding.ws or if thats not available then binding.rmi - defaultMappedBinding = new QName(Base.SCA11_TUSCANY_NS, "binding.hazelcast"); - if (!isBindingSupported(defaultMappedBinding)) { - defaultMappedBinding = new QName(Base.SCA11_NS, "binding.ws"); - if (!isBindingSupported(defaultMappedBinding)) { - defaultMappedBinding = new QName(Base.SCA11_TUSCANY_NS, "binding.rmi"); - } - } - } - } - return defaultMappedBinding; - } - - private BindingBuilder<?> getBindingBuilder(QName binding) { - if (isBindingSupported(binding)) { - BuilderExtensionPoint builders = registry.getExtensionPoint(BuilderExtensionPoint.class); - BindingBuilder<?> builder = builders.getBindingBuilder(binding); - return builder; - } else { - return null; - } - } - - private boolean isBindingSupported(QName binding) { - if (binding == null) { - return false; - } - // Check if there is a processor - StAXArtifactProcessor<?> processor = processors.getProcessor(binding); - if (processor == null) { - // logger.warning("Mapped binding for binding.sca is not supported: " + binding); - return false; - } - - try { - if (processor != null) { - // Futher check if the provider is present - Binding bindingTemplate = createDelegatingBinding(binding); - ProviderFactory<?> providerFactory = providerFactories.getProviderFactory(bindingTemplate.getClass()); - if (providerFactory == null) { - // logger.warning("Mapped binding for binding.sca is not supported: " + binding); - processor = null; - return false; - } - } - } catch (Throwable e) { - throw new ServiceRuntimeException(e); - } - return true; - } - - // FIXME: [rfeng] This is a HACK to check if we should make binding.sca remotable - // by checking if we have distributed domain registry present - protected boolean isDistributed() { - DomainRegistryFactoryExtensionPoint factories = - registry.getExtensionPoint(DomainRegistryFactoryExtensionPoint.class); - List<DomainRegistryFactory> list = factories.getDomainRegistryFactories(); - if (list.size() == 1) { - String[] schemes = list.get(0).getSupportedSchemes(); - if (Arrays.asList(schemes).contains("local")) { - return false; - } - } - return true; - } - - public RuntimeEndpoint map(RuntimeEndpoint endpoint) { - QName bindingType = chooseBinding(endpoint); - if (!isBindingSupported(bindingType)) { - logger.warning("Mapped binding for binding.sca is not supported: " + bindingType); - return null; - } - - // create a copy of the endpoint but with the web service binding in - RuntimeEndpoint ep = null; - try { - ep = (RuntimeEndpoint)endpoint.clone(); - } catch (Exception ex) { - // we know we can clone endpoint references - } - - Binding binding = map(endpoint.getBinding(), bindingType); - ep.setBinding(binding); - BindingBuilder builder = getBindingBuilder(bindingType); - if (builder != null) { - builder.build(ep.getComponent(), ep.getService(), binding, new BuilderContext(registry), false); - } - return ep; - } - - public RuntimeEndpointReference map(RuntimeEndpointReference endpointReference) { - QName bindingType = chooseBinding(endpointReference); - if (!isBindingSupported(bindingType)) { - logger.warning("Mapped binding for binding.sca is not supported: " + bindingType); - return null; - } - - // create a copy of the endpoint but with the web service binding in - RuntimeEndpointReference epr = null; - try { - epr = (RuntimeEndpointReference)endpointReference.clone(); - } catch (Exception ex) { - // we know we can clone endpoint references - } - - Binding binding = map(endpointReference.getBinding(), bindingType); - epr.setBinding(binding); - - // epr.setTargetEndpoint(map((RuntimeEndpoint)epr.getTargetEndpoint())); - - BindingBuilder builder = getBindingBuilder(bindingType); - if (builder != null) { - builder.build(epr.getComponent(), epr.getReference(), binding, new BuilderContext(registry), false); - } - - return epr; - } - - protected Binding map(Binding scaBinding, QName newBindingType) { - try { - Binding binding = createDelegatingBinding(newBindingType); - binding.setName(scaBinding.getName()); - binding.setURI(scaBinding.getURI()); - binding.setOperationSelector(scaBinding.getOperationSelector()); - binding.setRequestWireFormat(scaBinding.getRequestWireFormat()); - binding.setResponseWireFormat(scaBinding.getResponseWireFormat()); - if (binding instanceof PolicySubject && scaBinding instanceof PolicySubject) { - PolicySubject subject1 = (PolicySubject)binding; - PolicySubject subject2 = (PolicySubject)scaBinding; - subject1.getPolicySets().addAll(subject2.getPolicySets()); - subject1.getRequiredIntents().addAll(subject2.getRequiredIntents()); - } - return binding; - } catch (Throwable e) { - throw new ServiceRuntimeException(e); - } - - } - - protected Binding createDelegatingBinding(QName bindingType) throws XMLStreamException, ContributionReadException { - StAXArtifactProcessor processor = processors.getProcessor(bindingType); - if (processor == null) { - logger.warning("Mapped binding for binding.sca is not supported: " + bindingType); - } - - StringBuffer xml = new StringBuffer(); - xml.append("<").append(bindingType.getLocalPart()).append(" xmlns:b=\"").append(bindingType.getNamespaceURI()) - .append("\"/>"); - - StAXHelper staxHelper = StAXHelper.getInstance(registry); - XMLStreamReader reader = staxHelper.createXMLStreamReader(new StringReader(xml.toString())); - reader.nextTag(); - Binding binding = (Binding)processor.read(reader, new ProcessorContext(registry)); - - return binding; - } - - /* - public boolean isRemotable(RuntimeEndpoint endpoint) { - return supportsDistributedSCA && isBindingSupported(chooseBinding(endpoint)); - } - - public boolean isRemotable(RuntimeEndpointReference endpointReference) { - return supportsDistributedSCA && isBindingSupported(chooseBinding(endpointReference)); - } - */ - - /** - * Choose the physical binding for service-side remotable binding.sca - * @param endpoint - * @return - */ - protected QName chooseBinding(RuntimeEndpoint endpoint) { - if(endpoint.getService().getInterfaceContract() != null - && ((RuntimeComponentService)endpoint.getService()).getInterfaceContract().getInterface().isRemotable() - && supportsDistributedSCA - && isBindingSupported(defaultMappedBinding)) { - return defaultMappedBinding; - } - - return defaultLocalBinding; - } - - /** - * Choose the physical binding for reference-side remotable binding.sca - * @param endpointReference - * @return - */ - protected QName chooseBinding(RuntimeEndpointReference endpointReference) { - if(endpointReference.getTargetEndpoint().isRemote()) { - RuntimeComponentReference ref = (RuntimeComponentReference)endpointReference.getReference(); - if(ref.getInterfaceContract() != null && !ref.getInterfaceContract().getInterface().isRemotable()) { - throw new ServiceRuntimeException("Reference interface not remotable for component: " - + endpointReference.getComponent().getName() - + " and reference: " - + ref.getName()); - } - - if(supportsDistributedSCA && isBindingSupported(defaultMappedBinding)) { - return defaultMappedBinding; - } - } - - return defaultLocalBinding; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java deleted file mode 100644 index 2cc71f1744..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java +++ /dev/null @@ -1,94 +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.binding.sca.provider; - -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.local.LocalSCAReferenceBindingProvider; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.EndpointReferenceAsyncProvider; -import org.apache.tuscany.sca.provider.EndpointReferenceProvider; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.provider.SCABindingMapper; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; - -/** - * The reference binding provider for the remote sca binding implementation. - */ -public class DelegatingSCAReferenceBindingProvider implements EndpointReferenceAsyncProvider { - - private ReferenceBindingProvider provider; - private RuntimeEndpointReference delegateEndpointReference; - - public DelegatingSCAReferenceBindingProvider(RuntimeEndpointReference endpointReference, - SCABindingMapper mapper) { - delegateEndpointReference = mapper.map(endpointReference); - if (delegateEndpointReference != null) { - endpointReference.setDelegateEndpointReference(delegateEndpointReference); - provider = delegateEndpointReference.getBindingProvider(); - - // reset the EPR to binding.sca EPR because the local optimization assumes - // this to be the case. - if (provider instanceof LocalSCAReferenceBindingProvider){ - ((LocalSCAReferenceBindingProvider)provider).setEndpointReference(endpointReference); - } - } - } - - public InterfaceContract getBindingInterfaceContract() { - return provider.getBindingInterfaceContract(); - } - - public boolean supportsOneWayInvocation() { - return provider.supportsOneWayInvocation(); - } - - public Invoker createInvoker(Operation operation) { - return provider.createInvoker(operation); - } - - public void start() { - provider.start(); - } - - public void stop() { - provider.stop(); - } - - public void configure() { - if (provider instanceof EndpointReferenceProvider) { - ((EndpointReferenceProvider)provider).configure(); - } - } - - @Override - public boolean supportsNativeAsync() { - if (provider instanceof EndpointReferenceAsyncProvider) { - return ((EndpointReferenceAsyncProvider)provider).supportsNativeAsync(); - } - - return false; - } - - public RuntimeEndpointReference getDelegateEndpointReference(){ - return delegateEndpointReference; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java deleted file mode 100644 index bc57c47ba6..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java +++ /dev/null @@ -1,122 +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.binding.sca.provider; - -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.invocation.InvokerAsyncResponse; -import org.apache.tuscany.sca.provider.EndpointAsyncProvider; -import org.apache.tuscany.sca.provider.EndpointProvider; -import org.apache.tuscany.sca.provider.SCABindingMapper; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; - -/** - * The service binding provider for the remote sca binding implementation. Relies on the - * binding-ws-axis implementation for providing a remote message endpoint - * - * @version $Rev$ $Date$ - */ -public class DelegatingSCAServiceBindingProvider implements EndpointAsyncProvider { - - // private static final Logger logger = Logger.getLogger(DelegatingSCAServiceBindingProvider.class.getName()); - - private ServiceBindingProvider provider; - private RuntimeEndpoint endpoint; - private RuntimeEndpoint delegateEndpoint; - private boolean started = false; - - public DelegatingSCAServiceBindingProvider(RuntimeEndpoint endpoint, SCABindingMapper mapper) { - this.endpoint = endpoint; - this.delegateEndpoint = mapper.map(endpoint); - if (delegateEndpoint != null) { - endpoint.setDelegateEndpoint(delegateEndpoint); - provider = delegateEndpoint.getBindingProvider(); - } - - } - - @Override - public InterfaceContract getBindingInterfaceContract() { - return provider.getBindingInterfaceContract(); - } - - @Override - public boolean supportsOneWayInvocation() { - return provider.supportsOneWayInvocation(); - } - - @Override - public void configure() { - if (provider instanceof EndpointProvider){ - ((EndpointProvider)provider).configure(); - } - } - - @Override - public boolean supportsNativeAsync() { - if (provider instanceof EndpointAsyncProvider){ - return ((EndpointAsyncProvider)provider).supportsNativeAsync(); - } else { - return false; - } - } - - @Override - public InvokerAsyncResponse createAsyncResponseInvoker() { - if (provider instanceof EndpointAsyncProvider){ - return ((EndpointAsyncProvider)provider).createAsyncResponseInvoker(); - } else { - return null; - } - } - - public void start() { - if (started) { - return; - } else { - provider.start(); - // Set the resolved binding URI back to the binding.sca - endpoint.getBinding().setURI(delegateEndpoint.getBinding().getURI()); - endpoint.setDeployedURI(delegateEndpoint.getDeployedURI()); - started = true; - } - } - - public void stop() { - if (!started) { - return; - } - try { - provider.stop(); - } finally { - started = false; - } - } - - public ServiceBindingProvider getProviderDelegate() { - return provider; - } - - public RuntimeEndpoint getDelegateEndpoint(){ - return delegateEndpoint; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java deleted file mode 100644 index ecaa699ad3..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java +++ /dev/null @@ -1,59 +0,0 @@ -/* -ah * 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.binding.sca.provider; - -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.provider.BindingProviderFactory; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.provider.SCABindingMapper; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; - -/** - * The factory for creating SCA Binding providers - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCABindingProviderFactory implements BindingProviderFactory<SCABinding> { - - private ExtensionPointRegistry extensionPoints; - private SCABindingMapper scaBindingMapper; - - public RuntimeSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class); - } - - public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpointReference) { - return new RuntimeSCAReferenceBindingProvider(extensionPoints, endpointReference); - } - - public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) { - return new RuntimeSCAServiceBindingProvider(scaBindingMapper, endpoint); - } - - public Class<SCABinding> getModelType() { - return SCABinding.class; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java deleted file mode 100644 index cfbb6f484b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java +++ /dev/null @@ -1,113 +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.binding.sca.provider; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.EndpointReferenceAsyncProvider; -import org.apache.tuscany.sca.provider.EndpointReferenceProvider; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.provider.SCABindingMapper; -import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; - -/** - * The sca reference binding provider mediates between the twin requirements of - * local sca bindings and remote sca bindings. In the local case is does - * very little. When the sca binding model is set as being remote (because a - * reference target can't be resolved in the current model) this binding will - * try and create a remote connection to it - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCAReferenceBindingProvider implements EndpointReferenceAsyncProvider { - - private RuntimeEndpointReference endpointReference; - private boolean started = false; - - private ReferenceBindingProvider delegatingBindingProvider; - private SCABindingMapper scaBindingMapper; - - public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints, - RuntimeEndpointReference endpointReference) { - this.endpointReference = endpointReference; - - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - this.scaBindingMapper = utilities.getUtility(SCABindingMapper.class); - getDelegatingProvider(); - } - - private ReferenceBindingProvider getDelegatingProvider() { - if (delegatingBindingProvider == null) { - delegatingBindingProvider = new DelegatingSCAReferenceBindingProvider(endpointReference, scaBindingMapper); - } - - return delegatingBindingProvider; - } - - public InterfaceContract getBindingInterfaceContract() { - return delegatingBindingProvider.getBindingInterfaceContract(); - } - - public boolean supportsOneWayInvocation() { - return delegatingBindingProvider.supportsOneWayInvocation(); - } - - public Invoker createInvoker(Operation operation) { - return delegatingBindingProvider.createInvoker(operation); - } - - public void start() { - if (started) { - return; - } - getDelegatingProvider().start(); - started = true; - } - - public void stop() { - if (!started) { - return; - } - - try { - getDelegatingProvider().stop(); - } finally { - started = false; - } - } - - public void configure() { - if (getDelegatingProvider() instanceof EndpointReferenceProvider) { - ((EndpointReferenceProvider)getDelegatingProvider()).configure(); - } - } - - public boolean supportsNativeAsync() { - return ((EndpointReferenceAsyncProvider)delegatingBindingProvider).supportsNativeAsync(); - } - - public RuntimeEndpointReference getDelegateEndpointReference(){ - return ((DelegatingSCAReferenceBindingProvider)delegatingBindingProvider).getDelegateEndpointReference(); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java deleted file mode 100644 index 2dc019226a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java +++ /dev/null @@ -1,130 +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.binding.sca.provider; - -import org.apache.tuscany.sca.binding.local.LocalSCABindingInvocationInterceptor; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.invocation.InvocationChain; -import org.apache.tuscany.sca.invocation.InvokerAsyncResponse; -import org.apache.tuscany.sca.invocation.Phase; -import org.apache.tuscany.sca.provider.EndpointAsyncProvider; -import org.apache.tuscany.sca.provider.EndpointProvider; -import org.apache.tuscany.sca.provider.OptimisingBindingProvider; -import org.apache.tuscany.sca.provider.SCABindingMapper; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeEndpoint; - -/** - * The sca service binding provider mediates between the twin requirements of - * local sca bindings and remote sca bindings. In the local case is does - * very little. When the sca binding model is set as being remote this binding will - * try and create a remote service endpoint for remote references to connect to - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCAServiceBindingProvider implements EndpointAsyncProvider, OptimisingBindingProvider { - private RuntimeEndpoint endpoint; - private SCABindingMapper mapper; - - private ServiceBindingProvider delegatingBindingProvider; - - public RuntimeSCAServiceBindingProvider(SCABindingMapper scaBindingMapper, RuntimeEndpoint endpoint) { - this.endpoint = endpoint; - this.mapper = scaBindingMapper; - getDelegatingProvider(); - } - - // if there is potentially a wire to this service that crosses the node boundary - // then we need to create a remote endpoint - private ServiceBindingProvider getDelegatingProvider() { - if(delegatingBindingProvider == null) { - delegatingBindingProvider = new DelegatingSCAServiceBindingProvider(endpoint, mapper); - } - return delegatingBindingProvider; - } - - /* - protected boolean isDistributed(ExtensionPointRegistry extensionPoints, Endpoint endpoint) { - // find if the node config is for distributed endpoints - // TODO: temp, need a much better way to do this - DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPoints); - Collection<DomainRegistry> eprs = domainRegistryFactory.getEndpointRegistries(); - if (eprs.size() > 0) { - String eprName = eprs.iterator().next().getClass().getName(); - return !eprName.equals("org.apache.tuscany.sca.core.assembly.impl.DomainRegistryImpl"); - } - return false; - } - */ - - public InterfaceContract getBindingInterfaceContract() { - return getDelegatingProvider().getBindingInterfaceContract(); - } - - public boolean supportsOneWayInvocation() { - return getDelegatingProvider().supportsOneWayInvocation(); - } - - public void start() { - getDelegatingProvider().start(); - } - - public void stop() { - endpoint.getBinding().setURI(null); - getDelegatingProvider().stop(); - } - - public void configure() { - if (getDelegatingProvider() instanceof EndpointProvider) { - ((EndpointProvider)getDelegatingProvider()).configure(); - } - } - - public boolean supportsNativeAsync() { - return true; - } - - public InvokerAsyncResponse createAsyncResponseInvoker() { - return ((EndpointAsyncProvider)getDelegatingProvider()).createAsyncResponseInvoker(); - } - - /** - * Handles the optimization for the service side chain, which provides a mechanism for direct local - * invocation of the service in cases where the component reference is in the same JVM as the - * component service. Effectively, this means skipping any Remote Binding listener and its associated - * binding chain and data binding processors. - * - * This means inserting a SCABindingLocalInvocationInterceptor into the chains for the Endpoint, - * which is placed immediately before the Policy processors (and after any Databinding processors) - */ - public void optimiseBinding(RuntimeEndpoint ep) { - // To optimise, place an SCA binding Local Invocation interceptor at the start of the POLICY phase - // of the service chain... - for (InvocationChain chain : ep.getInvocationChains()) { - chain.addHeadInterceptor( Phase.SERVICE_POLICY, new LocalSCABindingInvocationInterceptor() ); - } // end for - - } // end method optimiseBinding - - public RuntimeEndpoint getDelegateEndpoint(){ - return ((DelegatingSCAServiceBindingProvider)delegatingBindingProvider).getDelegateEndpoint(); - } - -} // end class RuntimeSCAServiceBinding diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.local.LocalSCABindingFactory b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.local.LocalSCABindingFactory deleted file mode 100644 index 9ad3a4c536..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.local.LocalSCABindingFactory +++ /dev/null @@ -1,19 +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.
-
-org.apache.tuscany.sca.binding.local.LocalSCABindingFactoryImpl
-
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor deleted file mode 100644 index 419e040564..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ /dev/null @@ -1,19 +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.
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.local,model=org.apache.tuscany.sca.binding.local.LocalSCABinding,factory=org.apache.tuscany.sca.binding.local.LocalSCABindingFactory
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 151c00eec8..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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.
-org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index 3a089bc284..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory +++ /dev/null @@ -1,20 +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.
-
-# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.sca.provider.RuntimeSCABindingProviderFactory;model=org.apache.tuscany.sca.assembly.SCABinding
-org.apache.tuscany.sca.binding.local.LocalSCABindingProviderFactory;model=org.apache.tuscany.sca.binding.local.LocalSCABinding
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper deleted file mode 100644 index 2719598883..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper +++ /dev/null @@ -1,17 +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.
-org.apache.tuscany.sca.binding.sca.provider.DefaultSCABindingMapper
\ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml deleted file mode 100644 index e1039b53ae..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<sca:definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <!-- MJE 22/06/2010 - add asyncInvocation to the @mayProvide list, for async services support --> - <sca:bindingType type="sca:binding.sca" mayProvide="sca:asyncInvocation" alwaysProvides=""/> -</sca:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java deleted file mode 100644 index d968e2891d..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java +++ /dev/null @@ -1,102 +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.apace.tuscany.sca.binding.sca; - -import java.io.InputStream; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * SCABindingTestCase - * - * @version $Rev$ $Date$ - */ -public class SCABindingTestCase { - - private XMLInputFactory inputFactory; - private StAXArtifactProcessor<Object> staxProcessor; - private CompositeModelResolver resolver; - private ExtensionPointRegistry extensionPoints; - - @Before - public void init() throws Exception { - extensionPoints = new DefaultExtensionPointRegistry(); - inputFactory = XMLInputFactory.newInstance(); - - StAXArtifactProcessorExtensionPoint staxProcessors = - extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null); - - resolver = new CompositeModelResolver(null, null); - } - - @Test - public void testSCABindingFactory() { - SCABindingFactory factory = - extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class); - - Assert.assertNotNull(factory.createSCABinding()); - } - - @Test - @Ignore - public void testBuildModel() { - try { - InputStream is = getClass().getResourceAsStream("/Calculator.composite"); - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - ProcessorContext context = new ProcessorContext(extensionPoints); - Composite composite = (Composite)staxProcessor.read(reader, context); - - is.close(); - Assert.assertNotNull(composite); - - resolver.addModel(composite, context); - - staxProcessor.resolve(composite, resolver, new ProcessorContext()); - - SCABinding referenceSCABinding = - (SCABinding)composite.getComponents().get(0).getReferences().get(0).getBindings().get(0); - SCABinding serviceSCABinding = - (SCABinding)composite.getComponents().get(1).getServices().get(0).getBindings().get(0); - - Assert.assertNotNull(referenceSCABinding); - Assert.assertNotNull(serviceSCABinding); - } catch (Exception ex) { - Assert.fail(ex.getMessage()); - } - - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/wireformat/WireFormatDefault.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/wireformat/WireFormatDefault.java deleted file mode 100644 index 1cb4df39e0..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/wireformat/WireFormatDefault.java +++ /dev/null @@ -1,49 +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.apace.tuscany.sca.binding.sca.wireformat;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- *
- * @version $Rev: 986685 $ $Date: 2010-08-18 15:00:03 +0100 (Wed, 18 Aug 2010) $
- */
-public class WireFormatDefault implements WireFormat {
- public static final QName WIRE_FORMAT_DEFAULT_QNAME = new QName(Constants.SCA11_NS, "wireFormat.default");
-
-
- public QName getSchemaName() {
- return WIRE_FORMAT_DEFAULT_QNAME;
- }
-
- public boolean isUnresolved() {
- return false;
- }
-
- public void setUnresolved(boolean unresolved) {
- }
-
- @Override
- public boolean equals(Object obj) {
- return this.getClass() == obj.getClass();
- }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/wireformat/WireFormatDefaultProcessor.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/wireformat/WireFormatDefaultProcessor.java deleted file mode 100644 index 6c8bd13197..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/wireformat/WireFormatDefaultProcessor.java +++ /dev/null @@ -1,71 +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.apace.tuscany.sca.binding.sca.wireformat;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.xml.Constants;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- *
- * @version $Rev: 825773 $ $Date: 2009-10-16 06:42:26 +0100 (Fri, 16 Oct 2009) $
- */
-public class WireFormatDefaultProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WireFormatDefault> {
-
- public QName getArtifactType() {
- return WireFormatDefault.WIRE_FORMAT_DEFAULT_QNAME;
- }
-
- public WireFormatDefaultProcessor(FactoryExtensionPoint modelFactories) {
- }
-
- public WireFormatDefault read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
- WireFormatDefault wireFormat = new WireFormatDefault();
-
- return wireFormat;
- }
-
- public void write(WireFormatDefault wireFormat, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
- String prefix = "tuscany";
- writer.writeStartElement(prefix, getArtifactType().getLocalPart(), getArtifactType().getNamespaceURI());
- writer.writeNamespace("tuscany", Constants.SCA11_TUSCANY_NS);
-
- writer.writeEndElement();
- }
-
- public Class<WireFormatDefault> getModelType() {
- return WireFormatDefault.class;
- }
-
- public void resolve(WireFormatDefault arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {
-
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java deleted file mode 100644 index c60885f5a4..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java +++ /dev/null @@ -1,95 +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.apace.tuscany.sca.binding.sca.xml; - -import static org.junit.Assert.assertNotNull; - -import java.io.InputStream; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Test reading WSDL interfaces. - * - * @version $Rev$ $Date$ - */ -public class ReadTestCase { - - private static XMLInputFactory inputFactory; - private static StAXArtifactProcessor<Object> staxProcessor; - private static ProcessorContext context; - - @BeforeClass - public static void setUp() throws Exception { - ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - context = new ProcessorContext(extensionPoints); - - inputFactory = XMLInputFactory.newInstance(); - StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null); - } - - @Test - public void testReadComponentType() throws Exception { - InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType"); - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - ComponentType componentType = (ComponentType)staxProcessor.read(reader, context); - assertNotNull(componentType); - - SCABinding referenceSCABinding = (SCABinding) componentType.getReferences().get(0).getBindings().get(0); - assertNotNull(referenceSCABinding); - - SCABinding serviceSCABinding = (SCABinding) componentType.getServices().get(0).getBindings().get(0); - assertNotNull(serviceSCABinding); - - //new PrintUtil(System.out).print(componentType); - } - - @Test - public void testReadComposite() throws Exception { - InputStream is = getClass().getResourceAsStream("/Calculator.composite"); - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - Composite composite = (Composite)staxProcessor.read(reader, context); - assertNotNull(composite); - - SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0); - SCABinding serviceSCABinding = (SCABinding) composite.getComponents().get(1).getServices().get(0).getBindings().get(0); - - Assert.assertNotNull(referenceSCABinding); - Assert.assertNotNull(serviceSCABinding); - - assertNotNull(serviceSCABinding.getRequestWireFormat()); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java deleted file mode 100644 index 93bd129a65..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java +++ /dev/null @@ -1,88 +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.apace.tuscany.sca.binding.sca.xml; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; - -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Test reading/write WSDL interfaces. - * - * @version $Rev$ $Date$ - */ -public class WriteTestCase { - - private static StAXArtifactProcessor<Object> staxProcessor; - private static XMLInputFactory inputFactory; - private static XMLOutputFactory outputFactory; - private static ProcessorContext context; - - @BeforeClass - public static void setUp() throws Exception { - DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - context = new ProcessorContext(extensionPoints); - StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - inputFactory = XMLInputFactory.newInstance(); - outputFactory = XMLOutputFactory.newInstance(); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory); - } - - @Test - @Ignore // broken in 2.0 bring up - public void testReadWriteComponentType() throws Exception { - InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType"); - ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is), context); - assertNotNull(componentType); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos), context); - assertEquals("<?xml version='1.0' encoding='UTF-8'?><componentType xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" ><service name=\"CalculatorService\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><reference name=\"addService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></reference></componentType>", - bos.toString()); - } - - @Test - @Ignore // broken in 2.0 bring up - public void testReadWriteComposite() throws Exception { - InputStream is = getClass().getResourceAsStream("/Calculator.composite"); - Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is), context); - assertNotNull(composite); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context); - assertEquals("<?xml version='1.0' encoding='UTF-8'?><composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\" targetNamespace=\"http://calc\" name=\"Calculator\"><service name=\"CalculatorService\" promote=\"CalculatorServiceComponent\"><binding.sca /><interface.java interface=\"calculator.CalculatorService\" /></service><component name=\"CalculatorServiceComponent\"><implementation.java class=\"calculator.CalculatorServiceImpl\" /><reference name=\"addService\" target=\"AddServiceComponent\"><binding.sca /></reference><reference name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference name=\"divideService\" target=\"DivideServiceComponent\" /></component><component name=\"AddServiceComponent\"><implementation.java class=\"calculator.AddServiceImpl\" /><service name=\"AddService\"><binding.sca /><interface.java interface=\"calculator.AddService\" /></service></component><component name=\"SubtractServiceComponent\"><implementation.java class=\"calculator.SubtractServiceImpl\" /></component><component name=\"MultiplyServiceComponent\"><implementation.java class=\"calculator.MultiplyServiceImpl\" /></component><component name=\"DivideServiceComponent\"><implementation.java class=\"calculator.DivideServiceImpl\" /></component></composite>", - bos.toString()); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/Calculator.composite b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/Calculator.composite deleted file mode 100644 index 46a6fe6c9b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/Calculator.composite +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:calc="http://calc" - targetNamespace="http://calc" - name="Calculator"> - <service name="CalculatorService" promote="CalculatorServiceComponent"> - <interface.java interface="calculator.CalculatorService"/> - <binding.sca/> - </service> - - <component name="CalculatorServiceComponent"> - <implementation.java class="calculator.CalculatorServiceImpl"/> - <reference name="addService" target="AddServiceComponent"> - <binding.sca/> - </reference> - <reference name="subtractService" target="SubtractServiceComponent"/> - <reference name="multiplyService" target="MultiplyServiceComponent"/> - <reference name="divideService" target="DivideServiceComponent"/> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - <service name="AddService"> - <interface.java interface="calculator.AddService"/> - <binding.sca> - <wireFormat.default/> - </binding.sca> - </service> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType deleted file mode 100644 index da4219759f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"> - - <service name="CalculatorService"> - <interface.java interface="calculator.CalculatorService" /> - <binding.sca/> - </service> - - <reference name="addService"> - <interface.java interface="calculator.AddService" /> - <binding.sca/> - </reference> - -</componentType> -
\ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor deleted file mode 100644 index 185b1e83c6..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-sca-runtime/src/test/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ /dev/null @@ -1,18 +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.
-
-org.apace.tuscany.sca.binding.sca.wireformat.WireFormatDefaultProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200912#wireFormat.default,model=org.apace.tuscany.sca.binding.sca.wireformat.WireFormatDefault
\ No newline at end of file |