Author: jmarino
Date: Wed Apr 26 04:38:42 2006
New Revision: 397183
URL: http://svn.apache.org/viewcvs?rev=397183&view=rev
Log:
refactor of wire exception hierarchy to remove InvocationException; removal of
model entry point reference in WebServiceEntryPoint; addition of api to
EntryPointContext to return service interface
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/InvocationException.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceWireBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceBuilder.java
Wed Apr 26 04:38:42 2006
@@ -49,7 +49,8 @@
return binding instanceof WebServiceBinding;
}
- protected ExternalServiceContextFactory
createExternalServiceContextFactory(ExternalService externalService) {
+ protected ExternalServiceContextFactory
createExternalServiceContextFactory(
+ ExternalService externalService) {
ExternalWebServiceClient externalWebServiceClient =
createExternalWebServiceClient(externalService);
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceWireBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceWireBuilder.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceWireBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/ExternalWebServiceWireBuilder.java
Wed Apr 26 04:38:42 2006
@@ -33,7 +33,8 @@
return
ExternalWebServiceContextFactory.class.isAssignableFrom(targetType);
}
- protected TargetInvoker createInvoker(QualifiedName targetName, Method
operation, ScopeContext context, boolean downScope) {
+ protected TargetInvoker createInvoker(QualifiedName targetName, Method
operation,
+ ScopeContext context, boolean
downScope) {
return new ExternalWebServiceTargetInvoker(targetName, operation,
context);
}
}
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
Wed Apr 26 04:38:42 2006
@@ -27,7 +27,8 @@
/**
- * Creates a <code>ContextFactory</code> for an entry point configured with
the [EMAIL PROTECTED] WebServiceBinding}
+ * Creates a <code>ContextFactory</code> for an entry point configured with the
+ * [EMAIL PROTECTED] WebServiceBinding}
*
* @version $Rev$ $Date$
*/
@@ -38,7 +39,8 @@
return binding instanceof WebServiceBinding;
}
- protected EntryPointContextFactory
createEntryPointContextFactory(EntryPoint entryPoint, MessageFactory
msgFactory) {
+ protected EntryPointContextFactory
createEntryPointContextFactory(EntryPoint entryPoint,
+
MessageFactory msgFactory) {
return new
WebServiceEntryPointContextFactory(entryPoint.getName(),messageFactory);
}
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointInOutSyncMessageReceiver.java
Wed Apr 26 04:38:42 2006
@@ -32,7 +32,6 @@
import org.apache.tuscany.binding.axis2.util.AxiomHelper;
import org.apache.tuscany.core.context.EntryPointContext;
-import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.soap.SOAPBody;
@@ -53,20 +52,17 @@
/**
* Constructor WebServiceEntryPointInOutSyncMessageReceiver
*
- * @param entryPoint
* @param context
* @param wsdlPortInfo
*/
- @SuppressWarnings("unchecked")
- public WebServiceEntryPointInOutSyncMessageReceiver(EntryPoint entryPoint,
- EntryPointContext
context,
+ public WebServiceEntryPointInOutSyncMessageReceiver(EntryPointContext
context,
WebServicePortMetaData
wsdlPortInfo,
TypeHelper typeHelper,
ClassLoader
classLoader) {
this.entryPointContext = context;
-
- Class<?> serviceInterface = entryPoint.getConfiguredService().getPort()
- .getServiceContract().getInterface();
+ Class<?> serviceInterface = entryPointContext.getServiceInterface();
+// Class<?> serviceInterface =
entryPoint.getConfiguredService().getPort()
+// .getServiceContract().getInterface();
Method[] methods = serviceInterface.getMethods();
Map<String, Method> map = new HashMap<String, Method>(methods.length);
for (Method method : methods) {
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/handler/WebServiceEntryPointServlet.java
Wed Apr 26 04:38:42 2006
@@ -122,9 +122,7 @@
false);
WebServiceEntryPointInOutSyncMessageReceiver msgrec
- = new WebServiceEntryPointInOutSyncMessageReceiver(
- entryPoint,
- (EntryPointContext) entryPointContext,
+ = new
WebServiceEntryPointInOutSyncMessageReceiver((EntryPointContext)
entryPointContext,
wsdlPortInfo,
wsBinding.getTypeHelper(),
wsBinding.getResourceLoader().getClassLoader());
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/loader/WebServiceBindingLoader.java
Wed Apr 26 04:38:42 2006
@@ -60,9 +60,9 @@
}
public WebServiceBinding load(XMLStreamReader reader,
- LoaderContext loaderContext)
+ LoaderContext loaderContext)
throws XMLStreamException, ConfigurationLoadException {
-
+
WebServiceBinding binding = WS_FACTORY.createWebServiceBinding();
binding.setURI(reader.getAttributeValue(null, "uri"));
binding.setPortURI(reader.getAttributeValue(null, "port"));
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/test/java/org/apache/tuscany/binding/jsonrpc/mocks/tuscany/MockEntryPointContext.java
Wed Apr 26 04:38:42 2006
@@ -21,6 +21,10 @@
return null;
}
+ public Class getServiceInterface() {
+ return null;
+ }
+
public String getName() {
return null;
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
Wed Apr 26 04:38:42 2006
@@ -20,7 +20,6 @@
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
-import org.apache.tuscany.databinding.sdo.SDOObjectFactory;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/EntryPointContext.java
Wed Apr 26 04:38:42 2006
@@ -16,6 +16,8 @@
*/
package org.apache.tuscany.core.context;
+import org.apache.tuscany.core.wire.SourceWireFactory;
+
/**
* The runtime artifact representing an entry point,
<code>EntryPointContext</code> manages wire handler
* instances that expose service operations offered by a component in the
parent composite. The wire handler
@@ -60,5 +62,8 @@
*/
public Object getHandler() throws TargetException;
-
+ /**
+ * Returns the service interface configured for the entry poitn
+ */
+ public Class getServiceInterface();
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/EntryPointContextImpl.java
Wed Apr 26 04:38:42 2006
@@ -83,4 +83,8 @@
return invocationHandler;
}
+ public Class getServiceInterface() {
+ return sourceWireFactory.getBusinessInterface();
+ }
+
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
Wed Apr 26 04:38:42 2006
@@ -30,17 +30,9 @@
*/
public class SystemEntryPointBuilder implements ContextFactoryBuilder {
- // ----------------------------------
- // Constructors
- // ----------------------------------
-
public SystemEntryPointBuilder() {
}
- // ----------------------------------
- // Methods
- // ----------------------------------
-
public void build(AssemblyObject modelObject) throws BuilderException {
if (!(modelObject instanceof EntryPoint)) {
return;
@@ -53,6 +45,7 @@
try {
String targetName;
ConfiguredService targetService =
entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0);
+ Class serviceInterface =
entryPoint.getConfiguredReference().getPort().getServiceContract().getInterface();
if (targetService.getPart() == null) {
// FIXME not correct
if (targetService.getPort() == null) {
@@ -64,7 +57,7 @@
targetName = targetService.getPart().getName();
}
SystemEntryPointContextFactory contextFactory = new
SystemEntryPointContextFactory(entryPoint.getName(),
- targetName);
+ targetName, serviceInterface);
entryPoint.setContextFactory(contextFactory);
} catch (FactoryInitException e) {
e.addContextName(entryPoint.getName());
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
Wed Apr 26 04:38:42 2006
@@ -40,13 +40,16 @@
private String targetName;
- public SystemEntryPointContextFactory(String name, String targetName) {
+ private Class serviceInterface;
+
+ public SystemEntryPointContextFactory(String name, String targetName,
Class serviceInterface) {
this.name = name;
this.targetName = targetName;
+ this.serviceInterface = serviceInterface;
}
public EntryPointContext createContext() throws ContextCreationException {
- return new SystemEntryPointContext(name, targetName, this);
+ return new SystemEntryPointContext(name, targetName, serviceInterface,
this);
}
public Scope getScope() {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemEntryPointContext.java
Wed Apr 26 04:38:42 2006
@@ -35,11 +35,15 @@
private ContextResolver resolver;
private QualifiedName targetName;
-
- public SystemEntryPointContext(String name, String targetName,
ContextResolver resolver) {
+
+ private Class serviceInterface;
+
+ public SystemEntryPointContext(String name, String targetName, Class
serviceInterface, ContextResolver resolver) {
super(name);
assert (resolver != null) : "Context resolver was null";
assert (targetName != null) : "Target name was null";
+ assert (serviceInterface != null) : "Service interface is null";
+ this.serviceInterface = serviceInterface;
this.resolver = resolver;
this.targetName = new QualifiedName(targetName);
}
@@ -72,4 +76,7 @@
return getInstance(null);
}
+ public Class getServiceInterface() {
+ return serviceInterface;
+ }
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java?rev=397183&r1=397182&r2=397183&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/wire/WireException.java
Wed Apr 26 04:38:42 2006
@@ -16,10 +16,12 @@
*/
package org.apache.tuscany.core.wire;
+import org.apache.tuscany.common.TuscanyException;
+
/**
- *
+ * Denotes a top-level exception dealing with a wire
*/
-public abstract class WireException extends InvocationException {
+public abstract class WireException extends TuscanyException {
public WireException() {
super();
