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/05/03 04:25:36 UTC

svn commit: r534694 - in /incubator/tuscany/java/sca/samples/binding-echo/src: main/java/echo/ test/java/echo/

Author: jsdelfino
Date: Wed May  2 19:25:35 2007
New Revision: 534694

URL: http://svn.apache.org/viewvc?view=rev&rev=534694
Log:
Minor cleanup of the sample echo binding.

Modified:
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBinding.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingImpl.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingInterceptor.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoModuleActivator.java
    incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoServer.java
    incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/Echo.java
    incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
    incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java Wed May  2 19:25:35 2007
@@ -19,6 +19,11 @@
 
 package echo;
 
+/**
+ * A factory for the sample Echo binding model.
+ *
+ * @version $Rev$ $Date$
+ */
 public class DefaultEchoBindingFactory implements EchoBindingFactory {
 
     public EchoBinding createEchoBinding() {

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBinding.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBinding.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBinding.java Wed May  2 19:25:35 2007
@@ -21,6 +21,11 @@
 
 import org.apache.tuscany.assembly.Binding;
 
+/**
+ * A model for the sample Echo binding.
+ *
+ * @version $Rev$ $Date$
+ */
 public interface EchoBinding extends Binding {
 
 }

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java Wed May  2 19:25:35 2007
@@ -19,6 +19,11 @@
 
 package echo;
 
+/**
+ * A factory for the sample Echo binding model.
+ *
+ * @version $Rev$ $Date$
+ */
 public interface EchoBindingFactory {
     /**
      * Creates a new Echo binding.

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingImpl.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingImpl.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingImpl.java Wed May  2 19:25:35 2007
@@ -33,6 +33,11 @@
 import org.apache.tuscany.interfacedef.Operation;
 import org.apache.tuscany.spi.wire.Interceptor;
 
+/**
+ * Implementation of the Echo binding model.
+ *
+ * @version $Rev$ $Date$
+ */
 public class EchoBindingImpl extends BindingImpl implements EchoBinding, ReferenceBindingActivator,
     ReferenceBindingProvider, ServiceBindingActivator, ServiceBindingProvider {
 

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingInterceptor.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingInterceptor.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingInterceptor.java Wed May  2 19:25:35 2007
@@ -25,19 +25,21 @@
 import org.apache.tuscany.spi.wire.Message;
 
 /**
+ * Interceptor for the sample echo binding.
+ * 
  * @version $Rev$ $Date$
  */
 public class EchoBindingInterceptor implements Interceptor {
     private Interceptor next;
 
-    public Object invokeTarget(final Object payload) throws InvocationTargetException {
+    private Object echo(Object[] args) throws InvocationTargetException {
         // echo back the result, a real binding would invoke some API for flowing the request
-        return ((Object[])payload)[0];
+        return args[0];
     }
 
     public Message invoke(Message msg) throws InvocationRuntimeException {
         try {
-            Object resp = invokeTarget(msg.getBody());
+            Object resp = echo((Object[])msg.getBody());
             msg.setBody(resp);
         } catch (InvocationTargetException e) {
             msg.setBodyWithFault(e.getCause());

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java Wed May  2 19:25:35 2007
@@ -30,6 +30,11 @@
 import org.apache.tuscany.contribution.service.ContributionWireException;
 import org.apache.tuscany.contribution.service.ContributionWriteException;
 
+/**
+ * A processor for <binding.echo> elements.
+ *
+ * @version $Rev$ $Date$
+ */
 public class EchoBindingProcessor implements StAXArtifactProcessorExtension<EchoBinding> {
     private final EchoBindingFactory factory;
 

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoModuleActivator.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoModuleActivator.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoModuleActivator.java Wed May  2 19:25:35 2007
@@ -25,7 +25,11 @@
 import org.apache.tuscany.core.ExtensionPointRegistry;
 import org.apache.tuscany.core.ModuleActivator;
 
-
+/**
+ * A module activator for the sample Echo binding extension.
+ *
+ * @version $Rev$ $Date$
+ */
 public class EchoModuleActivator implements ModuleActivator {
     private final EchoBindingProcessor echoBindingProcessor = new EchoBindingProcessor();
 
@@ -36,16 +40,17 @@
 
     public void start(ExtensionPointRegistry registry) {
 
-        // Add the EchoProcessor to the proper registry
-        StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        artifactProcessorRegistry.addExtension(echoBindingProcessor);
+        // Add the EchoProcessor extension
+        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+        processors.addExtension(echoBindingProcessor);
        
         // Start the Echo server
         EchoServer.start();
     }
 
     public void stop(ExtensionPointRegistry registry) {
-        // Remove the EchoProcessor from the proper registry
+        
+        // Remove the EchoProcessor from the registry
         StAXArtifactProcessorExtensionPoint artifactProcessorRegistry = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
         artifactProcessorRegistry.removeExtension(echoBindingProcessor);
 

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoServer.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoServer.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoServer.java Wed May  2 19:25:35 2007
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 /**
- * EchoTransport
+ * A sample Echo server, showing how to integrate service bindings. 
  * 
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/Echo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/Echo.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/Echo.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/Echo.java Wed May  2 19:25:35 2007
@@ -19,8 +19,11 @@
 package echo;
 
 /**
+ * Interface of our sample Echo service.
+ * 
  * @version $Rev$ $Date$
  */
 public interface Echo {
-    String invoke(String msg);
+    
+    String echo(String msg);
 }

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java Wed May  2 19:25:35 2007
@@ -23,6 +23,8 @@
 
 
 /**
+ * A simple client component that uses a reference with an Echo binding.
+ * 
  * @version $Rev$ $Date$
  */
 public class EchoComponentImpl implements Echo {
@@ -34,8 +36,8 @@
         this.echoReference = echoReference;
     }
 
-    public String invoke(String msg) {
-        String result = echoReference.invoke(msg);
+    public String echo(String msg) {
+        String result = echoReference.echo(msg);
         System.out.println("Returned message: "+ result);
         return result;
     }

Modified: incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java?view=diff&rev=534694&r1=534693&r2=534694
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java Wed May  2 19:25:35 2007
@@ -43,7 +43,7 @@
     }
 
     public void testEchoBinding() {
-        String result = service.invoke("foo");
+        String result = service.echo("foo");
         assertEquals(result, "foo");
     }
 



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