tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r567542 [3/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...
Date Mon, 20 Aug 2007 05:13:50 GMT
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.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/RuntimeSCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -46,7 +46,6 @@
  */
 public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider2 {
 
-    private ExtensionPointRegistry extensionPoints;
     private RuntimeComponentReference reference;
     private SCABinding binding;
     private boolean started = false;

Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.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/RuntimeSCAServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -44,26 +44,16 @@
  */
 public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider2 {
 
-    private ExtensionPointRegistry extensionPoints;
-    private RuntimeComponent component;
     private RuntimeComponentService service;
-    private SCABinding binding;
-    
     private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
     private ServiceBindingProvider2 distributedProvider;
     private DistributedSCABinding distributedBinding;
     
-    private boolean started = false;
-
     public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints,
                                             RuntimeComponent component,
                                             RuntimeComponentService service,
                                             SCABinding binding) {
-        this.extensionPoints = extensionPoints;
-        this.component = component;
         this.service = service;
-        this.binding = binding;
-        
         // if there is potentially a wire to this service that crosses the node boundary 
         if (((WireableBinding)binding).isRemote()) {        
             // look to see if a distributed SCA binding implementation has

Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.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/SCABindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java Sun Aug 19 22:13:29 2007
@@ -22,12 +22,10 @@
 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.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.assembly.WireableBinding;
 import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
 
 /**

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2BindingInvoker.java Sun Aug 19 22:13:29 2007
@@ -36,7 +36,6 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.osoa.sca.Constants;

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2OneWayBindingInvoker.java Sun Aug 19 22:13:29 2007
@@ -30,7 +30,6 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.interfacedef.ConversationSequence;
 import org.apache.tuscany.sca.invocation.Message;
 
 public class Axis2OneWayBindingInvoker extends Axis2BindingInvoker {
@@ -43,6 +42,7 @@
         super(serviceClient, wsdlOperationName, options, soapFactory);
     }
 
+    @Override
     protected Object invokeTarget(Message msg) throws InvocationTargetException {
         try {
             OperationClient operationClient = createOperationClient(msg);

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/Axis2ReferenceBindingProvider.java Sun Aug 19 22:13:29 2007
@@ -33,7 +33,6 @@
 
 public class Axis2ReferenceBindingProvider implements ReferenceBindingProvider2 {
 
-    private RuntimeComponentReference reference;
     private WebServiceBinding wsBinding;
     private Axis2ServiceClient axisClient;
 
@@ -43,7 +42,6 @@
                                          ServletHost servletHost,
                                          MessageFactory messageFactory) {
 
-        this.reference = reference;
         this.wsBinding = wsBinding;
 
         InterfaceContract contract = wsBinding.getBindingInterfaceContract();

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/axis2/TuscanyDispatcher.java Sun Aug 19 22:13:29 2007
@@ -49,6 +49,7 @@
      * 
      * @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
      */
+    @Override
     public AxisService findService(MessageContext messageContext) throws AxisFault {
         EndpointReference toEPR = messageContext.getTo();
 
@@ -73,6 +74,7 @@
         }
     }
 
+    @Override
     public void initDispatcher() {
         init(new HandlerDescription(NAME));
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Bar.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Bar.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Bar.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Bar.java Sun Aug 19 22:13:29 2007
@@ -22,7 +22,8 @@
 import java.io.Serializable;
 
 public class Bar implements Serializable {
-
+    private static final long serialVersionUID = 1249963611910502668L;
+    
     private String s;
     private int x;
     private Integer y;

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Foo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Foo.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Foo.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/Foo.java Sun Aug 19 22:13:29 2007
@@ -22,7 +22,8 @@
 import java.io.Serializable;
 
 public class Foo implements Serializable {
-
+    private static final long serialVersionUID = 4879476066850018458L;
+    
     private Bar[] bars;
 
     public Bar[] getBars() {

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldNoWSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldNoWSDLTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldNoWSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldNoWSDLTestCase.java Sun Aug 19 22:13:29 2007
@@ -64,10 +64,12 @@
        
     }
    
+    @Override
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/axis2/itests/HelloWorldNoWSDL.composite");
     }
    
+    @Override
     protected void tearDown() throws Exception {
         domain.close();
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldOMTestCase.java Sun Aug 19 22:13:29 2007
@@ -44,11 +44,13 @@
         Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
     }
 
+    @Override
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/axis2/itests/helloworld-om.composite");
         helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
     }
     
+    @Override
     protected void tearDown() throws Exception {
         domain.close();
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,11 +32,13 @@
         assertEquals("Hello petra", helloWorld.getGreetings("petra"));
     }
 
+    @Override
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/axis2/itests/HelloWorld.composite");
         helloWorld = domain.getService(HelloWorld.class, "HelloWorldComponent");
     }
     
+    @Override
     protected void tearDown() throws Exception {
         domain.close();
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldWSDLMergedTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldWSDLMergedTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldWSDLMergedTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/HelloWorldWSDLMergedTestCase.java Sun Aug 19 22:13:29 2007
@@ -44,11 +44,13 @@
         Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
     }
 
+    @Override
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/axis2/itests/helloworld-om-merged.composite");
         helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldWSDLMergedComponent");
     }
     
+    @Override
     protected void tearDown() throws Exception {
         domain.close();
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/QuestionMarkWSDLTestCaseFIXME.java Sun Aug 19 22:13:29 2007
@@ -89,10 +89,12 @@
         throw new RuntimeException("no SOAPAddress");
     }
 
+    @Override
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/axis2/itests/questionmark-wsdl.composite");
     }
 
+    @Override
     protected void tearDown() throws Exception {
         domain.close();
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java Sun Aug 19 22:13:29 2007
@@ -45,11 +45,13 @@
         Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText());
     }
 
+    @Override
     protected void setUp() throws Exception {
         domain = SCADomain.newInstance(getCompositeName());
         helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent");
     }
     
+    @Override
     protected void tearDown() throws Exception {
         domain.close();
     }

Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java Sun Aug 19 22:13:29 2007
@@ -65,6 +65,7 @@
     private PolicyFactory policyFactory;
     private InterfaceContractMapper mapper;
 
+    @Override
     public void setUp() throws Exception {
         ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
         assemblyFactory = new DefaultAssemblyFactory();
@@ -87,6 +88,7 @@
         staxProcessors.addArtifactProcessor(wsdlProcessor);
     }
 
+    @Override
     public void tearDown() throws Exception {
     }
 

Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java Sun Aug 19 22:13:29 2007
@@ -62,6 +62,7 @@
     private PolicyFactory policyFactory;
     private InterfaceContractMapper mapper;
 
+    @Override
     public void setUp() throws Exception {
         ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
         factory = new DefaultAssemblyFactory();
@@ -87,6 +88,7 @@
         staxProcessors.addArtifactProcessor(wsdlProcessor);
     }
 
+    @Override
     public void tearDown() throws Exception {
     }
 

Modified: incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java Sun Aug 19 22:13:29 2007
@@ -32,8 +32,6 @@
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
  * Represents a WebService binding.

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java Sun Aug 19 22:13:29 2007
@@ -139,10 +139,12 @@
             jarFile = connection.getJarFile();
         }
 
+        @Override
         public int available() throws IOException {
             return is.available();
         }
 
+        @Override
         public void close() throws IOException {
             is.close();
             // We need to close the JAR file
@@ -151,30 +153,37 @@
             }
         }
 
+        @Override
         public synchronized void mark(int readlimit) {
             is.mark(readlimit);
         }
 
+        @Override
         public boolean markSupported() {
             return is.markSupported();
         }
 
+        @Override
         public int read() throws IOException {
             return is.read();
         }
 
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             return is.read(b, off, len);
         }
 
+        @Override
         public int read(byte[] b) throws IOException {
             return is.read(b);
         }
 
+        @Override
         public synchronized void reset() throws IOException {
             is.reset();
         }
 
+        @Override
         public long skip(long n) throws IOException {
             return is.skip(n);
         }

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -31,8 +31,8 @@
     
     private File contributionRoot;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         this.contributionRoot = new File(FOLDER_CONTRIBUTION);
     }
     

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -31,8 +31,8 @@
 public class JarContributionPackageProcessorTestCase extends TestCase {
     private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
     
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
     }
     
     public final void testProcessPackageArtifacts() throws Exception {

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java Sun Aug 19 22:13:29 2007
@@ -36,14 +36,14 @@
     private ModelResolver resolver;
     private ContributionFactory factory;
     
+    @Override
     protected void setUp() throws Exception {
         resolver = new ModelResolverImpl(getClass().getClassLoader());
         factory = new ContributionFactoryImpl();
     }
     
+    @Override
     protected void tearDown() throws Exception {
-        resolver = null;
-        factory = null;
     }
     
     public void testResolved() {
@@ -90,10 +90,12 @@
             this.name = name;
         }
         
+        @Override
         public int hashCode() {
             return name.hashCode();
         }
         
+        @Override
         public boolean equals(Object obj) {
             return name.equals(((Model)obj).name);
         }

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java Sun Aug 19 22:13:29 2007
@@ -37,6 +37,7 @@
     
     private ContributionFactory factory;
     
+    @Override
     protected void setUp() throws Exception {
         
         ModelResolverExtensionPoint resolvers = new DefaultModelResolverExtensionPoint();
@@ -49,6 +50,7 @@
         factory = new ContributionFactoryImpl();
     }
     
+    @Override
     protected void tearDown() throws Exception {
     }
     
@@ -97,10 +99,12 @@
             this.name = name;
         }
         
+        @Override
         public int hashCode() {
             return name.hashCode();
         }
         
+        @Override
         public boolean equals(Object obj) {
             return name.equals(((Model)obj).name);
         }
@@ -113,10 +117,12 @@
             this.name = name;
         }
         
+        @Override
         public int hashCode() {
             return name.hashCode();
         }
         
+        @Override
         public boolean equals(Object obj) {
             return name.equals(((OtherModel)obj).name);
         }

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java Sun Aug 19 22:13:29 2007
@@ -45,8 +45,8 @@
                 contentTypeDescriber.getType(artifactURL, "application/vnd.tuscany.ext"));        
     }
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         contentTypeDescriber = new ArtifactTypeDescriberImpl();
     }
 

Copied: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java (from r567515, incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java?p2=incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java&p1=incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCase.java&r1=567515&r2=567542&rev=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataDocumentProcessorTestCaseFIXME.java Sun Aug 19 22:13:29 2007
@@ -19,37 +19,36 @@
 
 package org.apache.tuscany.sca.contribution.services;
 
-import javax.xml.stream.XMLInputFactory;
-
 import junit.framework.TestCase;
 
 /**
  * @version $Rev$ $Date$
  */
-public class ContributionMetadataDocumentProcessorTestCase extends TestCase {
-
-    private static final String VALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
-            + "<deployable composite=\"ns:Composite1\"/>"
-            + "<deployable composite=\"ns:Composite2\"/>"
-            + "<import namespace=\"http://ns2\" location=\"sca://contributions/002/\"/>"
-            + "<export namespace=\"http://ns1\"/>"
-            + "</contribution>";
+//FIXME Why is this test case all commented out? 
+public class ContributionMetadataDocumentProcessorTestCaseFIXME extends TestCase {
 
-    private static final String INVALID_XML =
-        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
-            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
-            + "<deployable composite=\"ns:Composite1\"/>"
-            + "<deployable composite=\"ns3:Composite1\"/>"
-            + "<import namespace=\"http://ns2\" location=\"sca://contributions/002/\"/>"
-            + "<export namespace=\"http://ns1\"/>"
-            + "</contribution>";
+//    private static final String VALID_XML =
+//        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
+//            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
+//            + "<deployable composite=\"ns:Composite1\"/>"
+//            + "<deployable composite=\"ns:Composite2\"/>"
+//            + "<import namespace=\"http://ns2\" location=\"sca://contributions/002/\"/>"
+//            + "<export namespace=\"http://ns1\"/>"
+//            + "</contribution>";
+//
+//    private static final String INVALID_XML =
+//        "<?xml version=\"1.0\" encoding=\"ASCII\"?>" 
+//            + "<contribution xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" xmlns:ns=\"http://ns\">"
+//            + "<deployable composite=\"ns:Composite1\"/>"
+//            + "<deployable composite=\"ns3:Composite1\"/>"
+//            + "<import namespace=\"http://ns2\" location=\"sca://contributions/002/\"/>"
+//            + "<export namespace=\"http://ns1\"/>"
+//            + "</contribution>";
 
-    private XMLInputFactory xmlFactory;
+//    private XMLInputFactory xmlFactory;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
 //        xmlFactory = XMLInputFactory.newInstance();
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java Sun Aug 19 22:13:29 2007
@@ -31,8 +31,8 @@
 public class ContributionRepositoryTestCase extends TestCase {
     private ContributionRepositoryImpl repository;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         // create repository (this should re-create the root directory)
         this.repository = new ContributionRepositoryImpl("target/repository/");
         repository.init();

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java Sun Aug 19 22:13:29 2007
@@ -55,8 +55,8 @@
                 packageTypeDescriber.getType(artifactURL, "application/vnd.tuscany.ext"));        
     }
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         packageTypeDescriber = new PackageTypeDescriberImpl();
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
 public class ClassReferenceArtifactResolverTestCase extends TestCase {
     private ExtensibleModelResolver resolver;
     
+    @Override
     protected void setUp() throws Exception {
         
         ModelResolverExtensionPoint resolvers = new DefaultModelResolverExtensionPoint();
@@ -46,6 +47,7 @@
         resolver = new ExtensibleModelResolver(null, resolvers, factories);
     }
     
+    @Override
     protected void tearDown() throws Exception {
     }
     

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -34,8 +34,8 @@
 
     private XMLInputFactory xmlFactory;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         xmlFactory = XMLInputFactory.newInstance();
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -34,8 +34,8 @@
 
     private XMLInputFactory xmlFactory;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         xmlFactory = XMLInputFactory.newInstance();
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -35,8 +35,8 @@
 
     private XMLInputFactory xmlFactory;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         xmlFactory = XMLInputFactory.newInstance();
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -35,8 +35,8 @@
 
     private XMLInputFactory xmlFactory;
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         xmlFactory = XMLInputFactory.newInstance();
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessor.java Sun Aug 19 22:13:29 2007
@@ -27,6 +27,7 @@
  * 
  * @version $Rev$ $Date$
  */
+@Deprecated
 public interface ContributionPostProcessor {
     
     /**

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionPostProcessorExtensionPoint.java Sun Aug 19 22:13:29 2007
@@ -27,6 +27,7 @@
  * 
  * @version $Rev$ $Date$
  */
+@Deprecated
 public interface ContributionPostProcessorExtensionPoint {
     
     /**

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultContributionPostProcessorExtensionPoint.java Sun Aug 19 22:13:29 2007
@@ -28,6 +28,7 @@
  * 
  * @version $Rev$ $Date$
  */
+@Deprecated
 public class DefaultContributionPostProcessorExtensionPoint implements ContributionPostProcessorExtensionPoint {
 
     /**

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java Sun Aug 19 22:13:29 2007
@@ -31,6 +31,7 @@
  *
  * @version $Rev$ $Date$
  */
+@Deprecated
 public class DefaultModelResolver implements ModelResolver {
     private static final long serialVersionUID = -7826976465762296634L;
     
@@ -42,6 +43,7 @@
      * @deprecated Please use the other constructor.
      * @param contribution
      */
+    @Deprecated
     public DefaultModelResolver(Contribution contribution) {
         this.contribution = contribution;
     }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java Sun Aug 19 22:13:29 2007
@@ -29,6 +29,7 @@
  * 
  * @version $Rev$ $Date$
  */
+@Deprecated
 public interface ContributionMetadataDocumentProcessor {
     /**
      * Create the model object for Contribution Service metadata information

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java Sun Aug 19 22:13:29 2007
@@ -57,25 +57,6 @@
         processInterface(javaInterface, operations);
     }
 
-    private void introspectWrapperStyle(Operation operation) {
-        if (operation.isWrapperStyle()) {
-            return;
-        }
-        DataType outputType = operation.getOutputType();
-        DataType<List<DataType>> inputType = operation.getInputType();
-        if (outputType == null || inputType == null) {
-            return;
-        }
-        if (inputType.getLogical().size() != 1) {
-            return;
-        }
-        DataType wrapperType = inputType.getLogical().get(0);
-        if (outputType.getDataBinding().equals(wrapperType.getDataBinding())) {
-            operation.setWrapperStyle(true);
-            operation.setDataBinding(outputType.getDataBinding());
-        }
-    }
-
     private void processInterface(JavaInterface javaInterface, List<Operation> operations) {
         Class<?> clazz = javaInterface.getJavaClass();
         DataBinding dataBinding = clazz.getAnnotation(DataBinding.class);

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java Sun Aug 19 22:13:29 2007
@@ -81,6 +81,7 @@
     /**
      * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
      */
+    @Override
     public int getWeight() {
         return 10000;
     }

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java Sun Aug 19 22:13:29 2007
@@ -89,6 +89,7 @@
     /**
      * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
      */
+    @Override
     public int getWeight() {
         return 10000;
     }

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java Sun Aug 19 22:13:29 2007
@@ -91,6 +91,7 @@
     /**
      * @see org.apache.tuscany.sca.databinding.Transformer#getWeight()
      */
+    @Override
     public int getWeight() {
         return 10;
     }

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java Sun Aug 19 22:13:29 2007
@@ -42,8 +42,8 @@
     /**
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
     }
 
     /**

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java Sun Aug 19 22:13:29 2007
@@ -25,5 +25,6 @@
  *
  * @version $Rev$ $Date$
  */
+@Deprecated
 public class DefaultModelFactoryExtensionPoint extends org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint implements ModelFactoryExtensionPoint {
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java Sun Aug 19 22:13:29 2007
@@ -25,5 +25,6 @@
  *
  * @version $Rev$ $Date$
  */
+@Deprecated
 public interface ModelFactoryExtensionPoint extends org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint {
 }

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java Sun Aug 19 22:13:29 2007
@@ -25,8 +25,8 @@
  * @version $Rev$ $Date$
  *
  */
-@SuppressWarnings("serial")
 public class WorkSchedulerException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
 
     public WorkSchedulerException() {
         super();

Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java Sun Aug 19 22:13:29 2007
@@ -35,7 +35,6 @@
 import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.assembly.Wire;
 import org.apache.tuscany.sca.interfacedef.Operation;

Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java Sun Aug 19 22:13:29 2007
@@ -87,6 +87,7 @@
             return clone;
         }
 	
+        @Override
 	public String getParentName() {
 		//TODO find a better name for bean definitions representing component types
 		return String.valueOf(System.identityHashCode(implementation));
@@ -120,6 +121,7 @@
 		private static final long serialVersionUID = 1L;
 		
 		// Add a property
+                @Override
 		public boolean add(ComponentProperty property) {
 			
 			// Add corresponding bean property value
@@ -138,6 +140,7 @@
 		private static final long serialVersionUID = 1L;
 
 		// Add a reference
+                @Override
 		public boolean add(ComponentReference reference) {
 			
 			// Add corresponding bean property value

Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java Sun Aug 19 22:13:29 2007
@@ -36,6 +36,7 @@
         this.reference = reference;
     }
 
+    @Override
     public String getBeanName() {
         SCABinding binding = reference.getBinding(SCABinding.class);
         String name = binding.getURI();
@@ -46,6 +47,7 @@
         return name;
     }
 
+    @Override
     public boolean equals(Object other) {
         if (this != other) {
             if (other instanceof RuntimeBeanReference) {
@@ -57,6 +59,7 @@
             return true;
     }
 
+    @Override
     public int hashCode() {
         return getBeanName().hashCode() * 29 + (this.isToParent() ? 1 : 0);
     }

Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java Sun Aug 19 22:13:29 2007
@@ -26,9 +26,6 @@
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.implementation.java.BaseJavaImplementation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 
@@ -109,6 +106,7 @@
 		private static final long serialVersionUID = 1L;
 		
 		// Add a property
+                @Override
 		public boolean add(Property property) {
 			
 			// Add corresponding bean property value
@@ -127,6 +125,7 @@
 		private static final long serialVersionUID = 1L;
 
 		// Add a reference
+                @Override
 		public boolean add(Reference reference) {
 			
 			// Add corresponding bean property value

Modified: incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,15 +32,15 @@
     private SCADomainContext context;
     private CalculatorService calculatorService;
 
+    @Override
     protected void setUp() throws Exception {
         context = new SCADomainContext("org/apache/tuscany/sca/core/spring/Calculator.composite");
 
         calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
+    @Override
     protected void tearDown() throws Exception {
-        context = null;
-        calculatorService = null;
     }
 
     public void testCalculator() throws Exception {

Modified: incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,6 +32,7 @@
     private SCADomainContext context;
     private CalculatorService calculatorService;
 
+    @Override
     protected void setUp() throws Exception {
         context = new SCADomainContext(
                           "org/apache/tuscany/sca/core/spring/OuterCalculator.composite",
@@ -41,9 +42,8 @@
         calculatorService = context.getService(CalculatorService.class, "CalculatorServiceComponent/InnerCalculatorServiceComponent");
     }
 
+    @Override
     protected void tearDown() throws Exception {
-        context = null;
-        calculatorService = null;
     }
 
     public void testCalculator() throws Exception {

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java Sun Aug 19 22:13:29 2007
@@ -51,6 +51,7 @@
         resolvedEndpoint = msgContext.getFrom();
     }
 
+    @Override
     public B getInstance() throws ObjectCreationException {
         if (wire != null) {
             // wire and endpoint already resolved, so return a pre-wired proxy

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java Sun Aug 19 22:13:29 2007
@@ -42,7 +42,6 @@
  */
 @SuppressWarnings("unused")
 public class CglibProxyFactory implements ProxyFactory {
-    private InterfaceContractMapper contractMapper;
     private MessageFactory messageFactory;
 
     public CglibProxyFactory() {
@@ -50,7 +49,6 @@
     }
 
     public CglibProxyFactory(MessageFactory messageFactory, InterfaceContractMapper mapper) {
-        this.contractMapper = mapper;
         this.messageFactory = messageFactory;
 
     }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java Sun Aug 19 22:13:29 2007
@@ -77,6 +77,7 @@
         return ref;
     }
 
+    @Override
     @SuppressWarnings( {"unchecked"})
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (method.getParameterTypes().length == 0 && "toString".equals(method.getName())) {

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java Sun Aug 19 22:13:29 2007
@@ -28,6 +28,7 @@
 public final class ThreadMessageContext {
 
     private static final ThreadLocal<Message> CONTEXT = new ThreadLocal<Message>() {
+        @Override
         protected synchronized Message initialValue() {
             return new MessageImpl();
         }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java Sun Aug 19 22:13:29 2007
@@ -23,7 +23,6 @@
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.namespace.QName;
@@ -201,10 +200,6 @@
                                               RuntimeComponentReference reference,
                                               List<Binding> bindings) {
 
-        List<Binding> unresolvedTargetBindings = new ArrayList<Binding>();
-
-        // create binding providers for all of the bindings for resolved targets
-        // or for all of the bindings where no targets are specified
         for (Binding binding : bindings) {
             BindingProviderFactory providerFactory =
                 (BindingProviderFactory)providerFactories.getProviderFactory(binding.getClass());

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java Sun Aug 19 22:13:29 2007
@@ -108,6 +108,7 @@
         throws TargetDestructionException {
     }    
 
+    @Override
     public synchronized void start() {
         int lifecycleState = getLifecycleState();
         if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
@@ -126,6 +127,7 @@
         }
     }
 
+    @Override
     public synchronized void stop() {
         int lifecycleState = getLifecycleState();
         if (lifecycleState != RUNNING) {
@@ -138,6 +140,7 @@
         wrappers.remove(contextId);
     }
 
+    @Override
     public String toString() {
         return "In state [" + super.toString() + ']';
     }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java Sun Aug 19 22:13:29 2007
@@ -36,11 +36,13 @@
         super(Scope.COMPOSITE, component);
     }
 
+    @Override
     public synchronized void stop() {
         super.stop();
         wrapper = null;
     }
 
+    @Override
     public synchronized InstanceWrapper getWrapper(KEY contextId) throws TargetResolutionException {
         if (wrapper == null) {
             wrapper = createInstanceWrapper();
@@ -49,6 +51,7 @@
         return wrapper;
     }
 
+    @Override
     public InstanceWrapper getAssociatedWrapper(KEY contextId) throws TargetResolutionException {
         if (wrapper == null) {
             throw new TargetNotFoundException(component.getURI());

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java Sun Aug 19 22:13:29 2007
@@ -107,6 +107,7 @@
     }    
     
 
+    @Override
     public synchronized void start() {
         if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
             throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
@@ -119,6 +120,7 @@
         lifecycleState = RUNNING;        
        }
 
+    @Override
     public synchronized void stop() {
         
         // Prevent the scheduler from submitting any additional reapers, initiate an orderly shutdown if a reaper task is in progress. 
@@ -178,6 +180,7 @@
     // In this case the instance is immediately removed.  A new conversation will be started on the next operation
     // associated with this conversationId's service reference. 
     //
+    @Override
     public void remove(Object contextId) throws TargetDestructionException {
         if (this.instanceLifecycleCollection.containsKey(contextId)) 
         {

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java Sun Aug 19 22:13:29 2007
@@ -37,14 +37,17 @@
         super(Scope.SESSION, component);
     }
 
+    @Override
     public void onEvent(Event event) {
         checkInit();
         if (event instanceof HttpSessionEnd) {
-            Object key = ((HttpSessionEnd)event).getSessionID();
+            //FIXME key is not used
+            //Object key = ((HttpSessionEnd)event).getSessionID();
             // FIXME: Remove the session id
         }
     }
 
+    @Override
     public synchronized void start() {
         if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
             throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
@@ -52,6 +55,7 @@
         lifecycleState = RUNNING;
     }
 
+    @Override
     public synchronized void stop() {
         lifecycleState = STOPPED;
     }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java Sun Aug 19 22:13:29 2007
@@ -42,6 +42,7 @@
         contexts = new ConcurrentHashMap<Thread, InstanceWrapper>();
     }
 
+    @Override
     public void onEvent(Event event) {
         checkInit();
         if (event instanceof RequestEnd) {
@@ -49,6 +50,7 @@
         }
     }
 
+    @Override
     public synchronized void start() {
         if (lifecycleState != UNINITIALIZED && lifecycleState != STOPPED) {
             throw new IllegalStateException("Scope must be in UNINITIALIZED or STOPPED state [" + lifecycleState + "]");
@@ -56,6 +58,7 @@
         lifecycleState = RUNNING;
     }
 
+    @Override
     public synchronized void stop() {
         contexts.clear();
         // synchronized (destroyQueues) {

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java Sun Aug 19 22:13:29 2007
@@ -20,7 +20,6 @@
 
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.scope.InstanceWrapper;
-import org.apache.tuscany.sca.scope.PersistenceException;
 import org.apache.tuscany.sca.scope.Scope;
 import org.apache.tuscany.sca.scope.TargetDestructionException;
 import org.apache.tuscany.sca.scope.TargetResolutionException;
@@ -36,6 +35,7 @@
         super(Scope.STATELESS, component);
     }
 
+    @Override
     public  InstanceWrapper getWrapper(KEY contextId)
         throws TargetResolutionException {
         InstanceWrapper ctx = createInstanceWrapper();
@@ -43,11 +43,13 @@
         return ctx;
     }
 
+    @Override
     public  InstanceWrapper getAssociatedWrapper(KEY contextId)
         throws TargetResolutionException {
         return getWrapper(contextId);
     }
 
+    @Override
     public  void returnWrapper(InstanceWrapper wrapper, KEY contextId)
         throws TargetDestructionException {
         wrapper.stop();

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java Sun Aug 19 22:13:29 2007
@@ -131,6 +131,7 @@
     /**
      * @see Object#hashCode() 
      */
+    @Override
     public int hashCode() {
         return id.hashCode();
     }
@@ -142,6 +143,7 @@
      * @return true if this object is the same as the obj argument; false
      *         otherwise..
      */
+    @Override
     public boolean equals(final Object obj) {
         return (obj != null) && (obj.getClass() == WorkItemImpl.class) && ((WorkItemImpl) obj).id.equals(id);
     }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java Sun Aug 19 22:13:29 2007
@@ -52,6 +52,7 @@
      *
      * @return the current lifecycle as a String
      */
+    @Override
     public String toString() {
         switch (lifecycleState) {
             case Lifecycle.CONFIG_ERROR:

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java Sun Aug 19 22:13:29 2007
@@ -42,6 +42,7 @@
         return scope;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
@@ -53,10 +54,12 @@
         return !(scope != null ? scope != scope1.scope.intern() : scope1.scope != null);
     }
 
+    @Override
     public int hashCode() {
         return scope != null ? scope.hashCode() : 0;
     }
 
+    @Override
     public String toString() {
         return scope;
     }

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java Sun Aug 19 22:13:29 2007
@@ -24,6 +24,7 @@
 public class DefaultExtensionPointRegistryTestCase extends TestCase {
     private ExtensionPointRegistry registry;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         registry = new DefaultExtensionPointRegistry();

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java Sun Aug 19 22:13:29 2007
@@ -75,8 +75,8 @@
         EasyMock.verify(listener);
     }
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         publisher = new BaseEventPublisher() {
         };
     }

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java Sun Aug 19 22:13:29 2007
@@ -63,7 +63,7 @@
     }
 
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
     }
 }

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java Sun Aug 19 22:13:29 2007
@@ -43,6 +43,7 @@
     protected InstanceWrapper<T> wrapper;
 
     @SuppressWarnings("unchecked")
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         control = EasyMock.createStrictControl();

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java Sun Aug 19 22:13:29 2007
@@ -156,8 +156,8 @@
         store.destroy();
     }
 
+    @Override
     protected void setUp() throws Exception {
-        super.setUp();
         monitor = EasyMock.createNiceMock(StoreMonitor.class);
         EasyMock.replay(monitor);
     }

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java Sun Aug 19 22:13:29 2007
@@ -44,6 +44,7 @@
         return new OMElementWrapperHandler();
     }
 
+    @Override
     public Object copy(Object source) {
         if ( OMElement.class.isAssignableFrom(source.getClass()) ) {
             try {

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomExceptionHandler.java Sun Aug 19 22:13:29 2007
@@ -34,7 +34,7 @@
 public class AxiomExceptionHandler implements ExceptionHandler {
 
     public Exception createException(DataType<DataType> exceptionType, String message, Object faultInfo, Throwable cause) {
-        return new FaultException(message, (OMElement)faultInfo, cause);
+        return new FaultException(message, faultInfo, cause);
     }
 
     public Object getFaultInfo(Exception exception) {

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java Sun Aug 19 22:13:29 2007
@@ -31,6 +31,7 @@
         return source.getText();
     }
 
+    @Override
     public Class getSourceType() {
         return OMElement.class;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message