tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r449096 - in /incubator/tuscany/java/sca/kernel: api/src/test/java/org/apache/tuscany/api/ core/src/main/java/org/apache/tuscany/core/builder/ core/src/main/java/org/apache/tuscany/core/idl/java/ core/src/main/java/org/apache/tuscany/core/i...
Date Fri, 22 Sep 2006 21:36:39 GMT
Author: jmarino
Date: Fri Sep 22 14:36:38 2006
New Revision: 449096

URL: http://svn.apache.org/viewvc?view=rev&rev=449096
Log:
cleanup checkstyle and PMD complaints

Modified:
    incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
    incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
    incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java
    incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java
    incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostRuntimeExceptionTestCase.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/WrapperInfo.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/artifact/Artifact.java

Modified: incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
(original)
+++ incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
Fri Sep 22 14:36:38 2006
@@ -19,6 +19,7 @@
 package org.apache.tuscany.api;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -26,11 +27,11 @@
  * @version $Rev$ $Date$
  */
 public class TuscanyExceptionTestCase extends TestCase {
-    private static final Throwable cause = new Throwable("Cause");
-    private static final String message = "Message";
-    private static final String identifier = "identifier";
-    private static final String context1 = "context1";
-    private static final String context2 = "context2";
+    private static final Throwable CAUSE = new Throwable("Cause");
+    private static final String MESSAGE = "Message";
+    private static final String IDENTIFIER = "IDENTIFIER";
+    private static final String CONTEXT1 = "CONTEXT1";
+    private static final String CONTEXT2 = "CONTEXT2";
 
     public void testNoArgConstructor() {
         TuscanyException ex = new DummyException();
@@ -41,61 +42,61 @@
     }
 
     public void testMessageConstructor() {
-        TuscanyException ex = new DummyException(message);
-        assertSame(message, ex.getMessage());
+        TuscanyException ex = new DummyException(MESSAGE);
+        assertSame(MESSAGE, ex.getMessage());
         assertNull(ex.getCause());
         assertNull(ex.getIdentifier());
         assertTrue(ex.returnContextNames().isEmpty());
     }
 
     public void testThrowableConstructor() {
-        TuscanyException ex = new DummyException(cause);
-        assertEquals(cause.getClass().getName() + ": " + cause.getMessage(), ex.getMessage());
-        assertSame(cause, ex.getCause());
+        TuscanyException ex = new DummyException(CAUSE);
+        assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
         assertNull(ex.getIdentifier());
         assertTrue(ex.returnContextNames().isEmpty());
     }
 
     public void testMessageThrowableConstructor() {
-        TuscanyException ex = new DummyException(message, cause);
-        assertSame(message, ex.getMessage());
-        assertSame(cause, ex.getCause());
+        TuscanyException ex = new DummyException(MESSAGE, CAUSE);
+        assertSame(MESSAGE, ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
         assertNull(ex.getIdentifier());
         assertTrue(ex.returnContextNames().isEmpty());
     }
 
     public void testIdentifier() {
-        TuscanyException ex = new DummyException(message);
-        ex.setIdentifier(identifier);
-        assertSame(identifier, ex.getIdentifier());
-        assertEquals(message + " [" + identifier + ']', ex.getMessage());
+        TuscanyException ex = new DummyException(MESSAGE);
+        ex.setIdentifier(IDENTIFIER);
+        assertSame(IDENTIFIER, ex.getIdentifier());
+        assertEquals(MESSAGE + " [" + IDENTIFIER + ']', ex.getMessage());
     }
 
     public void testContextStack() {
-        TuscanyException ex = new DummyException(message);
-        ArrayList<String> contexts = new ArrayList<String>();
-        contexts.add(context1);
-        ex.addContextName(context1);
+        TuscanyException ex = new DummyException(MESSAGE);
+        List<String> contexts = new ArrayList<String>();
+        contexts.add(CONTEXT1);
+        ex.addContextName(CONTEXT1);
         assertEquals(contexts, ex.returnContextNames());
-        contexts.add(context2);
-        ex.addContextName(context2);
+        contexts.add(CONTEXT2);
+        ex.addContextName(CONTEXT2);
         assertEquals(contexts, ex.returnContextNames());
     }
 
     public void testContextMessageWithNoIdentifier() {
-        TuscanyException ex = new DummyException(message);
-        ex.addContextName(context1);
-        ex.addContextName(context2);
-        assertEquals("Message\nContext stack trace: [context2][context1]", ex.getMessage());
+        TuscanyException ex = new DummyException(MESSAGE);
+        ex.addContextName(CONTEXT1);
+        ex.addContextName(CONTEXT2);
+        assertEquals("Message\nContext stack trace: [CONTEXT2][CONTEXT1]", ex.getMessage());
     }
 
 
     public void testContextMessageWithIdentifier() {
-        TuscanyException ex = new DummyException(message);
-        ex.setIdentifier(identifier);
-        ex.addContextName(context1);
-        ex.addContextName(context2);
-        assertEquals("Message [identifier]\nContext stack trace: [context2][context1]", ex.getMessage());
+        TuscanyException ex = new DummyException(MESSAGE);
+        ex.setIdentifier(IDENTIFIER);
+        ex.addContextName(CONTEXT1);
+        ex.addContextName(CONTEXT2);
+        assertEquals("Message [IDENTIFIER]\nContext stack trace: [CONTEXT2][CONTEXT1]", ex.getMessage());
     }
 
     public static class DummyException extends TuscanyException {

Modified: incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
(original)
+++ incubator/tuscany/java/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
Fri Sep 22 14:36:38 2006
@@ -19,6 +19,7 @@
 package org.apache.tuscany.api;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -26,11 +27,11 @@
  * @version $Rev$ $Date$
  */
 public class TuscanyRuntimeExceptionTestCase extends TestCase {
-    private static final Throwable cause = new Throwable("Cause");
-    private static final String message = "Message";
-    private static final String identifier = "identifier";
-    private static final String context1 = "context1";
-    private static final String context2 = "context2";
+    private static final Throwable CAUSE = new Throwable("Cause");
+    private static final String MESSAGE = "Message";
+    private static final String IDENTIFIER = "IDENTIFIER";
+    private static final String CONTEXT1 = "CONTEXT1";
+    private static final String CONTEXT2 = "CONTEXT2";
 
     public void testNoArgConstructor() {
         TuscanyRuntimeException ex = new DummyException();
@@ -41,61 +42,61 @@
     }
 
     public void testMessageConstructor() {
-        TuscanyRuntimeException ex = new DummyException(message);
-        assertSame(message, ex.getMessage());
+        TuscanyRuntimeException ex = new DummyException(MESSAGE);
+        assertSame(MESSAGE, ex.getMessage());
         assertNull(ex.getCause());
         assertNull(ex.getIdentifier());
         assertTrue(ex.returnContextNames().isEmpty());
     }
 
     public void testThrowableConstructor() {
-        TuscanyRuntimeException ex = new DummyException(cause);
-        assertEquals(cause.getClass().getName() + ": " + cause.getMessage(), ex.getMessage());
-        assertSame(cause, ex.getCause());
+        TuscanyRuntimeException ex = new DummyException(CAUSE);
+        assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
         assertNull(ex.getIdentifier());
         assertTrue(ex.returnContextNames().isEmpty());
     }
 
     public void testMessageThrowableConstructor() {
-        TuscanyRuntimeException ex = new DummyException(message, cause);
-        assertSame(message, ex.getMessage());
-        assertSame(cause, ex.getCause());
+        TuscanyRuntimeException ex = new DummyException(MESSAGE, CAUSE);
+        assertSame(MESSAGE, ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
         assertNull(ex.getIdentifier());
         assertTrue(ex.returnContextNames().isEmpty());
     }
 
     public void testIdentifier() {
-        TuscanyRuntimeException ex = new DummyException(message);
-        ex.setIdentifier(identifier);
-        assertSame(identifier, ex.getIdentifier());
-        assertEquals(message + " [" + identifier + ']', ex.getMessage());
+        TuscanyRuntimeException ex = new DummyException(MESSAGE);
+        ex.setIdentifier(IDENTIFIER);
+        assertSame(IDENTIFIER, ex.getIdentifier());
+        assertEquals(MESSAGE + " [" + IDENTIFIER + ']', ex.getMessage());
     }
 
     public void testContextStack() {
-        TuscanyRuntimeException ex = new DummyException(message);
-        ArrayList<String> contexts = new ArrayList<String>();
-        contexts.add(context1);
-        ex.addContextName(context1);
+        TuscanyRuntimeException ex = new DummyException(MESSAGE);
+        List<String> contexts = new ArrayList<String>();
+        contexts.add(CONTEXT1);
+        ex.addContextName(CONTEXT1);
         assertEquals(contexts, ex.returnContextNames());
-        contexts.add(context2);
-        ex.addContextName(context2);
+        contexts.add(CONTEXT2);
+        ex.addContextName(CONTEXT2);
         assertEquals(contexts, ex.returnContextNames());
     }
 
     public void testContextMessageWithNoIdentifier() {
-        TuscanyRuntimeException ex = new DummyException(message);
-        ex.addContextName(context1);
-        ex.addContextName(context2);
-        assertEquals("Message\nContext stack trace: [context2][context1]", ex.getMessage());
+        TuscanyRuntimeException ex = new DummyException(MESSAGE);
+        ex.addContextName(CONTEXT1);
+        ex.addContextName(CONTEXT2);
+        assertEquals("Message\nContext stack trace: [CONTEXT2][CONTEXT1]", ex.getMessage());
     }
 
 
     public void testContextMessageWithIdentifier() {
-        TuscanyRuntimeException ex = new DummyException(message);
-        ex.setIdentifier(identifier);
-        ex.addContextName(context1);
-        ex.addContextName(context2);
-        assertEquals("Message [identifier]\nContext stack trace: [context2][context1]", ex.getMessage());
+        TuscanyRuntimeException ex = new DummyException(MESSAGE);
+        ex.setIdentifier(IDENTIFIER);
+        ex.addContextName(CONTEXT1);
+        ex.addContextName(CONTEXT2);
+        assertEquals("Message [IDENTIFIER]\nContext stack trace: [CONTEXT2][CONTEXT1]", ex.getMessage());
     }
 
     public static class DummyException extends TuscanyRuntimeException {

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
Fri Sep 22 14:36:38 2006
@@ -242,7 +242,6 @@
                 throw e;
             }
             OutboundInvocationChain outboundChain = wireService.createOutboundChain(operation);
-            //  connectCallbackChain(source, outboundChain, inboundChain);
             targetWire.addSourceCallbackInvocationChain(source.getName(), operation, outboundChain);
             if (source instanceof Component) {
                 Component component = (Component) source;

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/InterfaceJavaLoader.java
Fri Sep 22 14:36:38 2006
@@ -20,7 +20,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
@@ -29,14 +28,13 @@
 import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
 import org.osoa.sca.annotations.Constructor;
 
-import org.apache.tuscany.core.loader.StAXUtil;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.LoaderExtension;
 import org.apache.tuscany.spi.idl.InvalidServiceContractException;
-import org.apache.tuscany.spi.idl.java.JavaServiceContract;
 import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
+import org.apache.tuscany.spi.idl.java.JavaServiceContract;
 import org.apache.tuscany.spi.loader.InvalidValueException;
 import org.apache.tuscany.spi.loader.LoaderException;
 import org.apache.tuscany.spi.loader.LoaderRegistry;
@@ -45,6 +43,8 @@
 import org.apache.tuscany.spi.model.InteractionScope;
 import org.apache.tuscany.spi.model.ModelObject;
 
+import org.apache.tuscany.core.loader.StAXUtil;
+
 /**
  * Loads a Java interface definition from an XML-based assembly file
  *
@@ -85,7 +85,7 @@
 
         name = reader.getAttributeValue(null, "callbackInterface");
         Class<?> callbackClass = (name != null) ? LoaderUtil.loadClass(name, deploymentContext.getClassLoader())
: null;
-        
+
         Map<Class<?>, ModelObject> extensions = new HashMap<Class<?>,
ModelObject>();
         while (true) {
             int event = reader.next();
@@ -94,12 +94,10 @@
                 if (mo != null) {
                     extensions.put(mo.getClass(), mo);
                 }
-            } else if (event == XMLStreamConstants.END_ELEMENT) {
-                if (reader.getName().equals(INTERFACE_JAVA)) {
-                    break;
-                }
+            } else if (event == XMLStreamConstants.END_ELEMENT && reader.getName().equals(INTERFACE_JAVA))
{
+                break;
             }
-        }        
+        }
         JavaServiceContract serviceContract;
         try {
             serviceContract = interfaceRegsitry.introspect(interfaceClass, callbackClass);
@@ -115,7 +113,7 @@
             serviceContract.setDataBinding(dataType.getDataBinding());
         }
         serviceContract.getExtensions().putAll(extensions);
-        
+
         serviceContract.setInteractionScope(interactionScope);
         return serviceContract;
     }

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/idl/java/JavaInterfaceProcessorRegistryImpl.java
Fri Sep 22 14:36:38 2006
@@ -48,10 +48,9 @@
  */
 public class JavaInterfaceProcessorRegistryImpl implements JavaInterfaceProcessorRegistry
{
 
+    public static final String IDL_INPUT = "idl:input";
     private static final String UNKNOWN_DATABINDING = null;
 
-    public static final String IDL_INPUT = "idl:input";
-    
     private List<JavaInterfaceProcessor> processors = new ArrayList<JavaInterfaceProcessor>();
 
     public JavaInterfaceProcessorRegistryImpl() {

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBuilder.java
Fri Sep 22 14:36:38 2006
@@ -34,7 +34,6 @@
 import org.apache.tuscany.spi.model.CompositeComponentType;
 import org.apache.tuscany.spi.model.CompositeImplementation;
 import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.Include;
 import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.model.ServiceDefinition;
 
@@ -46,8 +45,8 @@
 public class CompositeBuilder extends ComponentBuilderExtension<CompositeImplementation>
{
 
     public Component build(CompositeComponent parent,
-                              ComponentDefinition<CompositeImplementation> componentDefinition,
-                              DeploymentContext deploymentContext) throws BuilderConfigException
{
+                           ComponentDefinition<CompositeImplementation> componentDefinition,
+                           DeploymentContext deploymentContext) throws BuilderConfigException
{
         CompositeImplementation implementation = componentDefinition.getImplementation();
         CompositeComponentType<?, ?, ?> componentType = implementation.getComponentType();
 
@@ -99,10 +98,10 @@
         for (ReferenceDefinition targetlessReferenceDef : allTargetlessReferences) {
             component.register(builderRegistry.build(component, targetlessReferenceDef, deploymentContext));
         }
-        
+
         // HACK: [rfeng] We need a better way to propagate model extensions to SCAObject.
         component.getExtensions().putAll(componentType.getExtensions());
-        
+
         return component;
     }
 

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemCompositeBuilder.java
Fri Sep 22 14:36:38 2006
@@ -33,7 +33,6 @@
 import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.CompositeComponentType;
 import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.model.Include;
 import org.apache.tuscany.spi.model.ServiceDefinition;
 
 import org.apache.tuscany.core.component.AutowireComponent;
@@ -60,8 +59,8 @@
     }
 
     public Component build(CompositeComponent parent,
-                              ComponentDefinition<SystemCompositeImplementation> componentDefinition,
-                              DeploymentContext deploymentContext) throws BuilderConfigException
{
+                           ComponentDefinition<SystemCompositeImplementation> componentDefinition,
+                           DeploymentContext deploymentContext) throws BuilderConfigException
{
         SystemCompositeImplementation impl = componentDefinition.getImplementation();
         CompositeComponentType<?, ?, ?> componentType = impl.getComponentType();
 

Modified: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java
(original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java
Fri Sep 22 14:36:38 2006
@@ -76,7 +76,9 @@
             throw new IllegalStateException(e.getCause());
         }
     }
-
+        ///CLOVER:OFF
+    private LaunchHelper() {
+    }
     /**
      * Invoke a method on an object.
      *
@@ -98,7 +100,5 @@
         }
     }
 
-    ///CLOVER:OFF
-    private LaunchHelper() {
-    }
+
 }

Modified: incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java
(original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostExceptionTestCase.java
Fri Sep 22 14:36:38 2006
@@ -24,8 +24,8 @@
  * @version $Rev$ $Date$
  */
 public class RMIHostExceptionTestCase extends TestCase {
-    private static final Throwable cause = new Throwable("Cause");
-    private static final String message = "Message";
+    private static final Throwable CAUSE = new Throwable("Cause");
+    private static final String MESSAGE = "Message";
 
     public void testNoArgConstructor() {
         Exception ex = new RMIHostException();
@@ -34,21 +34,21 @@
     }
 
     public void testMessageConstructor() {
-        Exception ex = new RMIHostException(message);
-        assertSame(message, ex.getMessage());
+        Exception ex = new RMIHostException(MESSAGE);
+        assertSame(MESSAGE, ex.getMessage());
         assertNull(ex.getCause());
     }
 
     public void testThrowableConstructor() {
-        Exception ex = new RMIHostException(cause);
-        assertEquals(cause.getClass().getName() + ": " + cause.getMessage(), ex.getMessage());
-        assertSame(cause, ex.getCause());
+        Exception ex = new RMIHostException(CAUSE);
+        assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
     }
 
     public void testMessageThrowableConstructor() {
-        Exception ex = new RMIHostException(message, cause);
-        assertSame(message, ex.getMessage());
-        assertSame(cause, ex.getCause());
+        Exception ex = new RMIHostException(MESSAGE, CAUSE);
+        assertSame(MESSAGE, ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
     }
 
 }

Modified: incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostRuntimeExceptionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostRuntimeExceptionTestCase.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostRuntimeExceptionTestCase.java
(original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/rmi/RMIHostRuntimeExceptionTestCase.java
Fri Sep 22 14:36:38 2006
@@ -24,8 +24,8 @@
  * @version $Rev$ $Date$
  */
 public class RMIHostRuntimeExceptionTestCase extends TestCase {
-    private static final Throwable cause = new Throwable("Cause");
-    private static final String message = "Message";
+    private static final Throwable CAUSE = new Throwable("Cause");
+    private static final String MESSAGE = "Message";
 
     public void testNoArgConstructor() {
         Exception ex = new RMIHostRuntimeException();
@@ -34,21 +34,21 @@
     }
 
     public void testMessageConstructor() {
-        Exception ex = new RMIHostRuntimeException(message);
-        assertSame(message, ex.getMessage());
+        Exception ex = new RMIHostRuntimeException(MESSAGE);
+        assertSame(MESSAGE, ex.getMessage());
         assertNull(ex.getCause());
     }
 
     public void testThrowableConstructor() {
-        Exception ex = new RMIHostRuntimeException(cause);
-        assertEquals(cause.getClass().getName() + ": " + cause.getMessage(), ex.getMessage());
-        assertSame(cause, ex.getCause());
+        Exception ex = new RMIHostRuntimeException(CAUSE);
+        assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
     }
 
     public void testMessageThrowableConstructor() {
-        Exception ex = new RMIHostRuntimeException(message, cause);
-        assertSame(message, ex.getMessage());
-        assertSame(cause, ex.getCause());
+        Exception ex = new RMIHostRuntimeException(MESSAGE, CAUSE);
+        assertSame(MESSAGE, ex.getMessage());
+        assertSame(CAUSE, ex.getCause());
     }
 
 }

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/WrapperInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/WrapperInfo.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/WrapperInfo.java
(original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/idl/WrapperInfo.java
Fri Sep 22 14:36:38 2006
@@ -20,27 +20,22 @@
 package org.apache.tuscany.spi.idl;
 
 import java.util.List;
-
 import javax.xml.namespace.QName;
 
 import org.apache.tuscany.spi.model.DataType;
 
 /**
- * The "Wrapper Style" WSDL operation is defined by The Java API for XML-Based Web Services
(JAX-WS) 2.0
- * specification, section 2.3.1.2 Wrapper Style.
- * <p>
- * A WSDL operation qualifies for wrapper style mapping only if the following criteria are
met:
- * <ul>
- * <li>(i) The operation’s input and output messages (if present) each contain only
a single part
- * <li>(ii) The input message part refers to a global element declaration whose localname
is equal to the operation
- * name
- * <li>(iii) The output message part refers to a global element declaration
- * <li>(iv) The elements referred to by the input and output message parts (henceforth
referred to as wrapper
- * elements) are both complex types defined using the xsd:sequence compositor
- * <li>(v) The wrapper elements only contain child elements, they must not contain
other structures such as
- * wildcards (element or attribute), xsd:choice, substitution groups (element references
are not permitted) or
- * attributes; furthermore, they must not be nillable.
- * </ul>
+ * The "Wrapper Style" WSDL operation is defined by The Java API for XML-Based Web Services
(JAX-WS) 2.0 specification,
+ * section 2.3.1.2 Wrapper Style.
+ * <p/>
+ * A WSDL operation qualifies for wrapper style mapping only if the following criteria are
met: <ul> <li>(i) The
+ * operation’s input and output messages (if present) each contain only a single part <li>(ii)
The input message part
+ * refers to a global element declaration whose localname is equal to the operation name
<li>(iii) The output message
+ * part refers to a global element declaration <li>(iv) The elements referred to by
the input and output message parts
+ * (henceforth referred to as wrapper elements) are both complex types defined using the
xsd:sequence compositor <li>(v)
+ * The wrapper elements only contain child elements, they must not contain other structures
such as wildcards (element
+ * or attribute), xsd:choice, substitution groups (element references are not permitted)
or attributes; furthermore,
+ * they must not be nillable. </ul>
  */
 public class WrapperInfo {
     private ElementInfo inputWrapperElement;
@@ -63,7 +58,12 @@
      * @param unwrappedInputType
      * @param unwrappedOutputType
      */
-    public WrapperInfo(ElementInfo inputWrapperElement, ElementInfo outputWrapperElement,
List<ElementInfo> inputElements, List<ElementInfo> outputElements, DataType<List<DataType<QName>>>
unwrappedInputType, DataType<QName> unwrappedOutputType) {
+    public WrapperInfo(ElementInfo inputWrapperElement,
+                       ElementInfo outputWrapperElement,
+                       List<ElementInfo> inputElements,
+                       List<ElementInfo> outputElements,
+                       DataType<List<DataType<QName>>> unwrappedInputType,
+                       DataType<QName> unwrappedOutputType) {
         super();
         this.inputWrapperElement = inputWrapperElement;
         this.outputWrapperElement = outputWrapperElement;
@@ -72,7 +72,7 @@
         this.unwrappedInputType = unwrappedInputType;
         this.unwrappedOutputType = unwrappedOutputType;
     }
-    
+
     /**
      * @return the inputElements
      */

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/artifact/Artifact.java?view=diff&rev=449096&r1=449095&r2=449096
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/artifact/Artifact.java
(original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/services/artifact/Artifact.java
Fri Sep 22 14:36:38 2006
@@ -24,7 +24,7 @@
 
 /**
  * Description of some packaged artifact such as a JAR file or a Composite.
- * 
+ *
  * @version $Rev$ $Date$
  */
 public class Artifact {
@@ -52,6 +52,7 @@
 
     /**
      * Adds a transitive dependency to the artifact.
+     *
      * @param artifact Dependency to be added.
      */
     public void addDependency(Artifact artifact) {
@@ -60,6 +61,7 @@
 
     /**
      * Gets the URLs for all the transitive dependencies.
+     *
      * @return Sets of URLs for all the transitive dependencies.
      */
     public Set<URL> getUrls() {
@@ -76,9 +78,9 @@
     }
 
     /**
-     * Returns the name of a logical grouping to which this artifact belongs. For example,
this might represent the original publisher of the
-     * artifact.
-     * 
+     * Returns the name of a logical grouping to which this artifact belongs. For example,
this might represent the
+     * original publisher of the artifact.
+     *
      * @return the name of a logical grouping to which this artifact belongs
      */
     public String getGroup() {
@@ -87,9 +89,8 @@
 
     /**
      * Sets the name of a logical grouping to which this artifact belongs.
-     * 
-     * @param group
-     *            the name of a logical grouping to which this artifact belongs
+     *
+     * @param group the name of a logical grouping to which this artifact belongs
      */
     public void setGroup(String group) {
         this.group = group;
@@ -97,7 +98,7 @@
 
     /**
      * Returns the name of an artifact.
-     * 
+     *
      * @return the name of an artifact
      */
     public String getName() {
@@ -106,9 +107,8 @@
 
     /**
      * Sets the name of an artifact.
-     * 
-     * @param name
-     *            the name of an artifact
+     *
+     * @param name the name of an artifact
      */
     public void setName(String name) {
         this.name = name;
@@ -116,7 +116,7 @@
 
     /**
      * Returns the version of an artifact.
-     * 
+     *
      * @return the version of an artifact
      */
     public String getVersion() {
@@ -125,18 +125,18 @@
 
     /**
      * Sets the version of an artifact.
-     * 
-     * @param version
-     *            the version of an artifact
+     *
+     * @param version the version of an artifact
      */
     public void setVersion(String version) {
         this.version = version;
     }
 
     /**
-     * Returns a way of classifying an artifact. This can be used to distinguish variants
of an artifact that provide the same function but which may
-     * have platform specific requirements. For example, it may contain the name of a hardware
platform for artifacts that contain native code.
-     * 
+     * Returns a way of classifying an artifact. This can be used to distinguish variants
of an artifact that provide
+     * the same function but which may have platform specific requirements. For example,
it may contain the name of a
+     * hardware platform for artifacts that contain native code.
+     *
      * @return a way of classifying an artifact
      */
     public String getClassifier() {
@@ -145,9 +145,8 @@
 
     /**
      * Sets a way of classifying an artifact
-     * 
-     * @param classifier
-     *            a way of classifying an artifact
+     *
+     * @param classifier a way of classifying an artifact
      */
     public void setClassifier(String classifier) {
         this.classifier = classifier;
@@ -155,7 +154,7 @@
 
     /**
      * Returns the type of artifact.
-     * 
+     *
      * @return the type of artifact
      */
     public String getType() {
@@ -164,9 +163,8 @@
 
     /**
      * Sets the type of artifact.
-     * 
-     * @param type
-     *            the type of artifact
+     *
+     * @param type the type of artifact
      */
     public void setType(String type) {
         this.type = type;
@@ -174,7 +172,7 @@
 
     /**
      * Returns a URL from which the artifact can be obtained.
-     * 
+     *
      * @return a URL from which the artifact can be obtained
      */
     public URL getUrl() {
@@ -183,9 +181,8 @@
 
     /**
      * Sets a URL from which the artifact can be obtained.
-     * 
-     * @param url
-     *            a URL from which the artifact can be obtained
+     *
+     * @param url a URL from which the artifact can be obtained
      */
     public void setUrl(URL url) {
         this.url = url;



---------------------------------------------------------------------
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