You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/20 07:13:50 UTC
svn commit: r567542 [2/7] - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
assembly/src/main/java/org/apache/tuscany/sca/assembly/i...
Modified: incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java Sun Aug 19 22:13:29 2007
@@ -51,8 +51,6 @@
DEFAULT_VALUES.put(double.class, new Double(0.0));
}
- private Class clazz;
-
private Map<String, Method> methodMap = new HashMap<String, Method>();
/**
@@ -61,8 +59,6 @@
* @param clazz
*/
private JavaReflectionAdapter(final Class clazz) {
- this.clazz = clazz;
-
// Index the methods on the implementation class
Method[] methods = AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
public Method[] run() {
Modified: incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java Sun Aug 19 22:13:29 2007
@@ -142,6 +142,7 @@
return exceptionTypes;
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append(getName(returnType)).append(" ").append(name).append("(");
Modified: incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java Sun Aug 19 22:13:29 2007
@@ -97,6 +97,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof NamingEndpoint) {
NamingEndpoint endpoint = (NamingEndpoint)obj;
@@ -108,6 +109,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return jndiName.hashCode();
}
@@ -115,6 +117,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
return jndiName;
}
Modified: incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java Sun Aug 19 22:13:29 2007
@@ -18,11 +18,6 @@
*/
package org.apache.tuscany.sca.binding.ejb.tests;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
import junit.framework.TestCase;
import org.apache.tuscany.sca.host.embedded.SCADomain;
@@ -34,9 +29,9 @@
*/
public class EJBReferenceTestCase extends TestCase {
private static final int MOCK_PORT = 8085;
- private static final int OPENEJB_PORT = 4201;
private SCADomain scaDomain;
+ @Override
protected void setUp() throws Exception {
System.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
System.setProperty("java.naming.provider.url", "ejbd://localhost:" + MOCK_PORT);
@@ -54,17 +49,7 @@
Thread.sleep(500);
}
- private InitialContext getRemoteInitialContext() throws NamingException {
- Properties properties = new Properties();
-
- properties.setProperty("java.naming.factory.initial", "org.apache.openejb.client.RemoteInitialContextFactory");
- properties.setProperty("java.naming.provider.url", "ejbd://localhost:" + OPENEJB_PORT);
-
- InitialContext context = new InitialContext(properties);
- // System.out.println(context.lookup("hello-addservice/AddServiceBean/calculator.AddService"));
- return context;
- }
-
+ @Override
protected void tearDown() throws Exception {
scaDomain.close();
}
Modified: incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java Sun Aug 19 22:13:29 2007
@@ -109,6 +109,7 @@
this.buf = buf;
}
+ @Override
public void run() {
try {
int totalSize = buf.length;
@@ -135,6 +136,7 @@
this.buf = buf;
}
+ @Override
public void run() {
try {
os.write(buf);
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -33,7 +33,6 @@
*/
public class AtomServiceBindingProvider implements ServiceBindingProvider {
- private RuntimeComponent component;
private RuntimeComponentService service;
private AtomBinding binding;
private ServletHost servletHost;
@@ -45,7 +44,6 @@
AtomBinding binding,
ServletHost servletHost,
MessageFactory messageFactory) {
- this.component = component;
this.service = service;
this.binding = binding;
this.servletHost = servletHost;
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java Sun Aug 19 22:13:29 2007
@@ -509,6 +509,7 @@
private boolean authenticate(String user, String password) {
// TODO Handle this using SCA security policies
+ //FIXME Why are we using endsWith instead of equals here??
return ("admin".endsWith(user) && "admin".equals(password));
}
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -33,7 +33,6 @@
*/
public class RSSServiceBindingProvider implements ServiceBindingProvider {
- private RuntimeComponent component;
private RuntimeComponentService service;
private RSSBinding binding;
private ServletHost servletHost;
@@ -45,7 +44,6 @@
RSSBinding binding,
ServletHost servletHost,
MessageFactory messageFactory) {
- this.component = component;
this.service = service;
this.binding = binding;
this.servletHost = servletHost;
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.binding.feed;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -29,7 +28,6 @@
import java.util.UUID;
import org.apache.tuscany.sca.binding.feed.collection.Collection;
-import org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
import org.osoa.sca.annotations.Scope;
import com.sun.syndication.feed.atom.Content;
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java Sun Aug 19 22:13:29 2007
@@ -25,11 +25,8 @@
import javax.jms.DeliveryMode;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.jms.JMSBindingException;
import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
@@ -58,9 +55,9 @@
private String correlationScheme = JMSBindingConstants.CORRELATE_MSG_ID;
private String initialContextFactoryName = JMSBindingConstants.DEFAULT_CONTEXT_FACTORY_NAME;
private String jndiURL = JMSBindingConstants.DEFAULT_JNDI_URL;
- private String requestConnection = null;
- private String responseConnection = null;
- private String operationProperties = null;
+ //private String requestConnection = null;
+ //private String responseConnection = null;
+ //private String operationProperties = null;
//
// <destination name="xs:anyURI"
// type="string"? Not yet implemented in binding
@@ -120,7 +117,7 @@
// <property name="NMTOKEN" Not yet implemented in binding
// type="NMTOKEN">* Not yet implemented in binding
// </resourceAdapter>?
- private String resourceAdapterName = null;
+ //private String resourceAdapterName = null;
//
// <headers JMSType="string"? Not yet implemented in binding
// JMSCorrelationId="string"? Not yet implemented in binding
@@ -130,8 +127,8 @@
// <property name="NMTOKEN" Not yet implemented in binding
// type="NMTOKEN">* Not yet implemented in binding
// </headers>?
- private String jmsType = null;
- private String jmsCorrelationId = null;
+ //private String jmsType = null;
+ //private String jmsCorrelationId = null;
private int jmsDeliveryMode = DeliveryMode.NON_PERSISTENT; // Maps to javax.jms.DeliveryMode
private int jmsTimeToLive = JMSBindingConstants.DEFAULT_TIME_TO_LIVE;
private int jmsPriority = JMSBindingConstants.DEFAULT_PRIORITY;
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.binding.jms;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
import javax.xml.namespace.QName;
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java Sun Aug 19 22:13:29 2007
@@ -26,7 +26,6 @@
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
-import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.apache.tuscany.sca.binding.jms.JMSBinding;
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.binding.jms.provider;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.List;
import javax.jms.Destination;
@@ -50,7 +49,7 @@
private JMSMessageProcessor responseMessageProcessor;
private String correlationScheme;
private MessageFactory messageFactory;
- private Method operationMethod;
+ //private Method operationMethod;
public JMSBindingListener(JMSBinding jmsBinding,
JMSResourceFactory jmsResourceFactory,
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.binding.jms.JMSBinding;
import org.apache.tuscany.sca.binding.jms.JMSBindingConstants;
import org.apache.tuscany.sca.binding.jms.JMSBindingException;
@@ -41,7 +40,6 @@
*/
public class JMSBindingReferenceBindingProvider implements ReferenceBindingProvider {
- private RuntimeComponent component;
private RuntimeComponentReference reference;
private JMSBinding jmsBinding;
private List<JMSBindingInvoker> jmsBindingInvokers = new ArrayList<JMSBindingInvoker>();
@@ -49,7 +47,6 @@
public JMSBindingReferenceBindingProvider(RuntimeComponent component,
RuntimeComponentReference reference,
JMSBinding binding) {
- this.component = component;
this.reference = reference;
this.jmsBinding = binding;
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -28,9 +28,7 @@
import org.apache.tuscany.sca.binding.jms.JMSBinding;
import org.apache.tuscany.sca.binding.jms.JMSBindingConstants;
import org.apache.tuscany.sca.binding.jms.JMSBindingException;
-import org.apache.tuscany.sca.interfacedef.Interface;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -43,7 +41,6 @@
public class JMSBindingServiceBindingProvider implements ServiceBindingProvider {
- private RuntimeComponent component;
private RuntimeComponentService service;
private JMSBinding jmsBinding;
private JMSResourceFactory jmsResourceFactory;
@@ -52,7 +49,6 @@
public JMSBindingServiceBindingProvider(RuntimeComponent component,
RuntimeComponentService service,
JMSBinding binding) {
- this.component = component;
this.service = service;
this.jmsBinding = binding;
@@ -118,13 +114,5 @@
jmsResourceFactory.startConnection();
- }
-
- private Class<?> getTargetJavaClass(Interface targetInterface) {
- // TODO: right now assume that the target is always a Java
- // Implementation. Need to figure out
- // how to generate Java Interface in cases where the target is not a
- // Java Implementation
- return ((JavaInterface)targetInterface).getJavaClass();
}
}
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryActiveMQImpl.java Sun Aug 19 22:13:29 2007
@@ -27,7 +27,6 @@
import javax.jms.Session;
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.apache.tuscany.sca.binding.jms.JMSBinding;
Modified: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCase.java Sun Aug 19 22:13:29 2007
@@ -18,22 +18,13 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
-import org.junit.After;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
-import junit.framework.TestCase;
-import static org.junit.Assert.*;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import org.apache.tuscany.sca.binding.jms.HelloWorldService;
-
-import org.apache.activemq.broker.BrokerService;
/**
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCService.java Sun Aug 19 22:13:29 2007
@@ -29,7 +29,6 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
import org.apache.tuscany.sca.spi.ComponentLifecycle;
/**
@@ -41,9 +40,7 @@
*/
public class JSONRPCService implements ComponentLifecycle {
- private RuntimeComponent component;
private RuntimeComponentService service;
- private JSONRPCBinding jsonBinding;
private ServletHost servletHost;
private Binding binding;
@@ -60,10 +57,8 @@
Binding b,
JSONRPCBinding binding,
ServletHost servletHost) {
- this.component = component;
this.service = service;
this.binding = b;
- this.jsonBinding = binding;
this.servletHost = servletHost;
}
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ScaDomainScriptServlet.java Sun Aug 19 22:13:29 2007
@@ -47,6 +47,7 @@
serviceNames = new ArrayList<String>();
}
+ @Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
ServletOutputStream os = response.getOutputStream();
Modified: incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java Sun Aug 19 22:13:29 2007
@@ -41,10 +41,12 @@
private SCADomain domain;
+ @Override
protected void setUp() throws Exception {
domain = SCADomain.newInstance("JSONRPCBinding.composite");
}
+ @Override
protected void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java Sun Aug 19 22:13:29 2007
@@ -19,12 +19,8 @@
package org.apache.tuscany.sca.binding.notification;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.tuscany.sca.assembly.impl.BaseImpl;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
* @version $Rev$ $Date$
@@ -35,6 +31,7 @@
protected String ntmAddress;
protected URI notificationType;
+ @Override
public Object clone() {
return this;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<BrokerConsumerReference> getEncodingObjectType() {
return BrokerConsumerReference.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,11 +32,13 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<Broker> getEncodingObjectType() {
return Broker.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -77,11 +77,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<BrokerID> getEncodingObjectType() {
return BrokerID.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<BrokerProducerReference> getEncodingObjectType() {
return BrokerProducerReference.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -75,11 +75,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<Brokers> getEncodingObjectType() {
return Brokers.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -69,11 +69,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<ConnectionOverride> getEncodingObjectType() {
return ConnectionOverride.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -63,11 +63,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<ConnectionOverrideResponse> getEncodingObjectType() {
return ConnectionOverrideResponse.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<ConsumerReference> getEncodingObjectType() {
return ConsumerReference.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java Sun Aug 19 22:13:29 2007
@@ -25,6 +25,11 @@
public class EncodingException extends Exception {
/**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* Initializes the exception message.
*
* @param message Message for the exception.
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -35,14 +35,17 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<EndConsumers> getEncodingObjectType() {
return EndConsumers.class;
}
+ @Override
protected void encodeSequenceTypeAttribute(EndConsumers encodingObject, XMLStreamWriter writer) throws EncodingException {
try {
writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());
@@ -51,6 +54,7 @@
}
}
+ @Override
protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {
return reader.getAttributeValue(null, Constants.ConsumerSequenceType);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -35,14 +35,17 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<EndProducers> getEncodingObjectType() {
return EndProducers.class;
}
+ @Override
protected void encodeSequenceTypeAttribute(EndProducers encodingObject, XMLStreamWriter writer) throws EncodingException {
try {
writer.writeAttribute(Constants.ProducerSequenceType, encodingObject.getSequenceType());
@@ -51,6 +54,7 @@
}
}
+ @Override
protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {
return reader.getAttributeValue(null, Constants.ProducerSequenceType);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -77,11 +77,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<EndpointAddress> getEncodingObjectType() {
return EndpointAddress.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -87,11 +87,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<EndpointReference> getEncodingObjectType() {
return EndpointReference.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -35,14 +35,17 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NeighborBrokerConsumers> getEncodingObjectType() {
return NeighborBrokerConsumers.class;
}
+ @Override
protected void encodeSequenceTypeAttribute(NeighborBrokerConsumers encodingObject, XMLStreamWriter writer) throws EncodingException {
try {
writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());
@@ -51,6 +54,7 @@
}
}
+ @Override
protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {
return reader.getAttributeValue(null, Constants.ConsumerSequenceType);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -75,11 +75,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<Neighbors> getEncodingObjectType() {
return Neighbors.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -63,11 +63,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewBrokerAck> getEncodingObjectType() {
return NewBrokerAck.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,11 +32,13 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewBroker> getEncodingObjectType() {
return NewBroker.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -105,11 +105,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewBrokerResponse> getEncodingObjectType() {
return NewBrokerResponse.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewConsumer> getEncodingObjectType() {
return NewConsumer.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -35,14 +35,17 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewConsumerResponse> getEncodingObjectType() {
return NewConsumerResponse.class;
}
+ @Override
protected void encodeSequenceTypeAttribute(NewConsumerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {
try {
writer.writeAttribute(Constants.ProducerSequenceType, encodingObject.getSequenceType());
@@ -51,6 +54,7 @@
}
}
+ @Override
protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {
return reader.getAttributeValue(null, Constants.ProducerSequenceType);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewProducer> getEncodingObjectType() {
return NewProducer.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -35,14 +35,17 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<NewProducerResponse> getEncodingObjectType() {
return NewProducerResponse.class;
}
+ @Override
protected void encodeSequenceTypeAttribute(NewProducerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {
try {
writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());
@@ -51,6 +54,7 @@
}
}
+ @Override
protected String decodeSequenceTypeAttribute(XMLStreamReader reader) {
return reader.getAttributeValue(null, Constants.ConsumerSequenceType);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -73,11 +73,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<ReferenceProperties> getEncodingObjectType() {
return ReferenceProperties.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -87,11 +87,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<RemoveBroker> getEncodingObjectType() {
return RemoveBroker.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
super(registry);
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<RemovedBroker> getEncodingObjectType() {
return RemovedBroker.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -87,11 +87,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<ReplaceBrokerConnection> getEncodingObjectType() {
return ReplaceBrokerConnection.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java Sun Aug 19 22:13:29 2007
@@ -69,11 +69,13 @@
}
}
+ @Override
protected QName getEncodingObjectQName() {
return QNAME;
}
+ @Override
protected Class<Subscribe> getEncodingObjectType() {
return Subscribe.class;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java Sun Aug 19 22:13:29 2007
@@ -119,6 +119,11 @@
@SuppressWarnings("serial")
public static class IOUtilsException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public IOUtilsException(String message) {
super(message);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java Sun Aug 19 22:13:29 2007
@@ -38,6 +38,10 @@
@SuppressWarnings("serial")
public class NotificationServlet extends HttpServlet {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private NotificationServletHandler handler;
private NotificationServletStreamHandler servletStreamHandler;
@@ -51,6 +55,7 @@
this.servletStreamHandler = servletStreamHandler;
}
+ @Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
HashMap<String, String> headers = new HashMap<String, String>();
Enumeration headerNames = request.getHeaderNames();
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java Sun Aug 19 22:13:29 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.binding.sca.axis2.impl;
-import org.apache.tuscany.sca.core.runtime.EndpointReferenceImpl;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.binding.sca.axis2.impl;
-import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -40,13 +39,10 @@
*/
public class Axis2SCABindingProviderFactory implements BindingProviderFactory<DistributedSCABinding> {
- private ExtensionPointRegistry extensionPoints;
private MessageFactory messageFactory;
private ServletHost servletHost;
public Axis2SCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
- this.extensionPoints = extensionPoints;
-
ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
this.servletHost = servletHosts.getServletHosts().get(0);
ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.axis2.Axis2ReferenceBindingProvider;
-import org.apache.tuscany.sca.binding.axis2.Axis2ServiceProvider;
import org.apache.tuscany.sca.binding.axis2.Java2WSDLHelper;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl;
@@ -35,16 +34,12 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider2;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
/**
* The reference binding provider for the remote sca binding implementation. Relies on the
@@ -58,13 +53,9 @@
private RuntimeComponent component;
private RuntimeComponentReference reference;
private SCABinding binding;
- private ServletHost servletHost;
- private MessageFactory messageFactory;
-
private Axis2ReferenceBindingProvider axisReferenceBindingProvider;
private WebServiceBinding wsBinding;
- private boolean started = false;
private EndpointReference serviceEPR = null;
public Axis2SCAReferenceBindingProvider(RuntimeComponent component,
@@ -75,11 +66,6 @@
this.component = component;
this.reference = reference;
this.binding = binding.getSCABinding();
- this.servletHost = servletHost;
- this.messageFactory = messageFactory;
-
- // fix up the minimal things required to get the ws binding going.
-
wsBinding = (new DefaultWebServiceBindingFactory()).createWebServiceBinding();
// Turn the java interface contract into a wsdl interface contract
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -19,36 +19,22 @@
package org.apache.tuscany.sca.binding.sca.axis2.impl;
-import java.net.URI;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
-import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.axis2.Axis2ServiceClient;
import org.apache.tuscany.sca.binding.axis2.Axis2ServiceProvider;
import org.apache.tuscany.sca.binding.axis2.Java2WSDLHelper;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingFactoryImpl;
-import org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingImpl;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.provider.ServiceBindingProvider2;
-import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
/**
* The service binding provider for the remote sca binding implementation. Relies on the
@@ -58,12 +44,7 @@
*/
public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider2 {
- private RuntimeComponent component;
- private RuntimeComponentService service;
private SCABinding binding;
- private ServletHost servletHost;
- private MessageFactory messageFactory;
-
private Axis2ServiceProvider axisProvider;
private WebServiceBinding wsBinding;
@@ -75,14 +56,7 @@
DistributedSCABinding binding,
ServletHost servletHost,
MessageFactory messageFactory) {
- this.component = component;
- this.service = service;
this.binding = binding.getSCABinding();
- this.servletHost = servletHost;
- this.messageFactory = messageFactory;
-
- // fix up the minimal things required to get the ws binding going.
-
wsBinding = (new DefaultWebServiceBindingFactory()).createWebServiceBinding();
// Turn the java interface contract into a wsdl interface contract
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java Sun Aug 19 22:13:29 2007
@@ -19,43 +19,13 @@
package org.apache.tuscany.sca.binding.sca.axis2.impl;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
-import java.util.Iterator;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.engine.MessageReceiver;
-import org.apache.tuscany.sca.assembly.AbstractContract;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.axis2.Axis2ServiceInMessageReceiver;
-import org.apache.tuscany.sca.binding.axis2.Axis2ServiceInOutSyncMessageReceiver;
import org.apache.tuscany.sca.binding.axis2.Axis2ServiceProvider;
-import org.apache.tuscany.sca.binding.axis2.Axis2ServiceServlet;
-import org.apache.tuscany.sca.binding.axis2.TuscanyAxisConfigurator;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.core.invocation.ThreadMessageContext;
-import org.apache.tuscany.sca.core.runtime.EndpointReferenceImpl;
import org.apache.tuscany.sca.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
/**
@@ -69,12 +39,6 @@
private SCABinding binding;
- private AbstractContract contract;
- private WebServiceBinding wsBinding;
- private ServletHost servletHost;
- private MessageFactory messageFactory;
- private ConfigurationContext configContext;
-
/**
* Switch in the fake ws binding
*
@@ -98,11 +62,6 @@
servletHost,
messageFactory);
- this.contract = service;
- this.wsBinding = wsBinding;
- this.servletHost = servletHost;
- this.messageFactory = messageFactory;
-
this.binding = binding;
}
@@ -113,6 +72,7 @@
*
* @return the binding
*/
+ @Override
protected Binding getBinding(){
return binding;
}
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java Sun Aug 19 22:13:29 2007
@@ -115,7 +115,7 @@
// start node B
for (Composite compositeB : domainB.getDomainComposite().getIncludes()) {
- domainB.getCompositeActivator().start(composite);
+ domainB.getCompositeActivator().start(compositeB);
}
} catch (Exception ex) {
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDistributedSCADomainImpl.java Sun Aug 19 22:13:29 2007
@@ -28,8 +28,6 @@
import org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl;
import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
/**
* A local representation of the sca domain distributed across a number
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java Sun Aug 19 22:13:29 2007
@@ -59,6 +59,7 @@
return url;
}
+ @Override
public String toString (){
return "[" +
domainUri + " " +
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorld.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorld.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorld.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-import org.osoa.sca.annotations.Remotable;
public interface HelloWorld {
Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java Sun Aug 19 22:13:29 2007
@@ -64,6 +64,7 @@
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
+ @Override
public void setUp() throws Exception {
ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
assemblyFactory = new DefaultAssemblyFactory();
@@ -86,6 +87,7 @@
staxProcessors.addArtifactProcessor(wsdlProcessor);
}
+ @Override
public void tearDown() throws Exception {
}
Modified: incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java Sun Aug 19 22:13:29 2007
@@ -60,6 +60,7 @@
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
+ @Override
public void setUp() throws Exception {
ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
factory = new DefaultAssemblyFactory();
@@ -85,6 +86,7 @@
staxProcessors.addArtifactProcessor(scaProcessor);
}
+ @Override
public void tearDown() throws Exception {
}
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.binding.sca;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.SCABinding;
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java Sun Aug 19 22:13:29 2007
@@ -18,17 +18,10 @@
*/
package org.apache.tuscany.sca.binding.sca.impl;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
/**
* The Distributed SCA binding wrapper for the SCA binding model object. This is currently
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java Sun Aug 19 22:13:29 2007
@@ -20,19 +20,10 @@
package org.apache.tuscany.sca.binding.sca.impl;
import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.WireableBinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
-import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
-import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider2;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider2;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org