You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/06/17 19:28:14 UTC

svn commit: r415032 [5/5] - in /incubator/tuscany/sandbox/jboynes/sca: ./ buildtools/src/main/resources/ core2/ core2/src/main/java/org/apache/tuscany/core/bootstrap/ core2/src/main/java/org/apache/tuscany/core/builder/ core2/src/main/java/org/apache/t...

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java Sat Jun 17 10:28:07 2006
@@ -36,8 +36,8 @@
         doneSignal.await();
 
         assertFalse(done.contains(Thread.currentThread()));
-        assert(done.size() == workManager.getScheduledMaximumPoolSize());
-        assert(count == max);
+        assert done.size() == workManager.getScheduledMaximumPoolSize();
+        assert count == max;
         done = null;
         count = 0;
         workManager.destroy();

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/GeronimoWorkManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/GeronimoWorkManagerTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/GeronimoWorkManagerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/GeronimoWorkManagerTestCase.java Sat Jun 17 10:28:07 2006
@@ -53,7 +53,7 @@
     }
 
     private class TestThread extends Thread {
-        public final TestWorkListener listener;
+        private final TestWorkListener listener;
         private final int timeout;
         private final int delay;
 
@@ -94,10 +94,10 @@
     }
 
     public class TestWorkListener implements WorkListener {
-        public WorkEvent acceptedEvent;
-        public WorkEvent rejectedEvent;
-        public WorkEvent startedEvent;
-        public WorkEvent completedEvent;
+        private WorkEvent acceptedEvent;
+        private WorkEvent rejectedEvent;
+        private WorkEvent startedEvent;
+        private WorkEvent completedEvent;
 
         public void workAccepted(WorkEvent e) {
             acceptedEvent = e;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java Sat Jun 17 10:28:07 2006
@@ -31,13 +31,21 @@
  */
 public class WSDLDefinitionRegistryTestCase extends TestCase {
     private static final String NS = "http://www.example.org";
+    private static final WSDLDefinitionRegistryImpl.Monitor NULL_MONITOR = new WSDLDefinitionRegistryImpl.Monitor() {
+        public void readingWSDL(String namespace, URL location) {
+        }
+
+        public void cachingDefinition(String namespace, URL location) {
+        }
+    };
     private WSDLDefinitionRegistryImpl wsdlRegistry;
     private ClassLoader rl;
 
 
     public void testLoadFromAbsoluteWSDLLocation() {
         try {
-            Definition def = wsdlRegistry.loadDefinition(NS + ' ' + rl.getResource("org/apache/tuscany/core/services/wsdl/example.wsdl"), rl);
+            Definition def = wsdlRegistry.loadDefinition(
+                NS + ' ' + rl.getResource("org/apache/tuscany/core/services/wsdl/example.wsdl"), rl);
             assertNotNull(def.getPortType(new QName(NS, "HelloWorld")));
         } catch (IOException e) {
             fail(e.getMessage());
@@ -48,7 +56,8 @@
 
     public void testLoadFromRelativeWSDLLocation() {
         try {
-            Definition def = wsdlRegistry.loadDefinition(NS + " org/apache/tuscany/core/services/wsdl/example.wsdl", rl);
+            Definition def =
+                wsdlRegistry.loadDefinition(NS + " org/apache/tuscany/core/services/wsdl/example.wsdl", rl);
             assertNotNull(def.getPortType(new QName(NS, "HelloWorld")));
         } catch (IOException e) {
             fail(e.getMessage());
@@ -64,11 +73,4 @@
         rl = getClass().getClassLoader();
     }
 
-    private static final WSDLDefinitionRegistryImpl.Monitor NULL_MONITOR = new WSDLDefinitionRegistryImpl.Monitor() {
-        public void readingWSDL(String namespace, URL location) {
-        }
-
-        public void cachingDefinition(String namespace, URL location) {
-        }
-    };
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireResolutionTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireResolutionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireResolutionTestCase.java Sat Jun 17 10:28:07 2006
@@ -52,7 +52,9 @@
         super.setUp();
         parent = mock(CompositeComponent.class);
         autowire = mock(AutowireComponent.class);
-        context = new SystemCompositeComponentImpl("test", (CompositeComponent) parent.proxy(), (AutowireComponent) autowire.proxy());
+        context = new SystemCompositeComponentImpl("test",
+            (CompositeComponent) parent.proxy(),
+            (AutowireComponent) autowire.proxy());
     }
 
     public static interface Foo {

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java Sat Jun 17 10:28:07 2006
@@ -17,7 +17,8 @@
 
     public void testContextCreationAndInit() throws Exception {
         ObjectFactory<Foo> factory = new PojoObjectFactory<Foo>(Foo.class.getConstructor((Class[]) null), null);
-        SystemAtomicComponent context = new SystemAtomicComponentImpl("foo", null, null, Foo.class, factory, false, initInvoker, null, null, null);
+        SystemAtomicComponent context = new SystemAtomicComponentImpl("foo", null, null, Foo.class, factory, false,
+            initInvoker, null, null, null);
         Foo foo = (Foo) context.createInstance();
         context.init(foo);
         assertNotNull(foo);

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicComponentWireInvocationTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicComponentWireInvocationTestCase.java Sat Jun 17 10:28:07 2006
@@ -36,11 +36,14 @@
         members.put("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
         List<Class<?>> interfaces = new ArrayList<Class<?>>();
         interfaces.add(Source.class);
-        SystemAtomicComponent sourceContext = MockContextFactory.createSystemAtomicContext("source", scope, interfaces, SourceImpl.class, null, members);
-        OutboundWire<Target> outboundWire = new SystemOutboundWireImpl<Target>("setTarget", new QualifiedName("service"), Target.class);
+        SystemAtomicComponent sourceContext = MockContextFactory
+            .createSystemAtomicContext("source", scope, interfaces, SourceImpl.class, null, members);
+        OutboundWire<Target> outboundWire =
+            new SystemOutboundWireImpl<Target>("setTarget", new QualifiedName("service"), Target.class);
         outboundWire.setTargetWire(inboundWire);
         sourceContext.addOutboundWire(outboundWire);
         sourceContext.start();
-        assertSame(((Source) sourceContext.getServiceInstance()).getTarget(), target); // wires should pass back direct ref
+        assertSame(((Source) sourceContext.getServiceInstance()).getTarget(),
+            target); // wires should pass back direct ref
     }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemOutboundToInboundTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemOutboundToInboundTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemOutboundToInboundTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemOutboundToInboundTestCase.java Sat Jun 17 10:28:07 2006
@@ -18,7 +18,8 @@
         Mock mockWire = mock(SystemInboundWire.class);
         mockWire.expects(atLeastOnce()).method("getTargetService").will(returnValue(target));
         SystemInboundWire<Target> inboundWire = (SystemInboundWire<Target>) mockWire.proxy();
-        SystemOutboundWire<Target> outboundWire = new SystemOutboundWireImpl<Target>("setTarget", new QualifiedName("service"), Target.class);
+        SystemOutboundWire<Target> outboundWire =
+            new SystemOutboundWireImpl<Target>("setTarget", new QualifiedName("service"), Target.class);
         outboundWire.setTargetWire(inboundWire);
         assertSame(outboundWire.getTargetService(), target);
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceComponentWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceComponentWireTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceComponentWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceComponentWireTestCase.java Sat Jun 17 10:28:07 2006
@@ -8,8 +8,7 @@
 import org.jmock.MockObjectTestCase;
 
 /**
- * Verifies that a system context interacts correctly with configured, connected inbound and outbound system
- * wires
+ * Verifies that a system context interacts correctly with configured, connected inbound and outbound system wires
  *
  * @version $$Rev$$ $$Date$$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java Sat Jun 17 10:28:07 2006
@@ -5,12 +5,10 @@
 
     public static final int ALL_BEAN1_FIELDS = 6 + ALL_SUPER_FIELDS;
     public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS;
-
-    public static final int ALL__BEAN1_METHODS = 4 + ALL_SUPER_METHODS - 1;
-
-    private String field1;
-    protected String field2;
+    public static final int ALL_BEAN1_METHODS = 4 + ALL_SUPER_METHODS - 1;
     public String field3;
+    protected String field2;
+    private String field1;
 
     public void setMethod1(String param) {
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java Sat Jun 17 10:28:07 2006
@@ -7,6 +7,7 @@
 public class Bean2 {
 
     private List methodList;
+    private List fieldList;
 
     public List getMethodList() {
         return methodList;
@@ -15,8 +16,6 @@
     public void setMethodList(List list) {
         methodList = list;
     }
-
-    private List fieldList;
 
     public List getfieldList() {
         return fieldList;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/JavaIntrospectionHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/JavaIntrospectionHelperTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/JavaIntrospectionHelperTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/JavaIntrospectionHelperTestCase.java Sat Jun 17 10:28:07 2006
@@ -12,6 +12,12 @@
 
 public class JavaIntrospectionHelperTestCase extends TestCase {
 
+    private List testNoGenericsList;
+    private List<String> testList;
+    private Map<String, Bean1> testMap;
+    private Target[] testArray;
+    private String[] testStringArray;
+
     public JavaIntrospectionHelperTestCase() {
         super();
     }
@@ -42,7 +48,7 @@
 
     public void testGetBean1AllMethods() throws Exception {
         Set<Method> beanMethods = JavaIntrospectionHelper.getAllUniqueMethods(Bean1.class);
-        assertEquals(Bean1.ALL__BEAN1_METHODS, beanMethods.size());
+        assertEquals(Bean1.ALL_BEAN1_METHODS, beanMethods.size());
     }
 
     public void testOverrideMethod() throws Exception {
@@ -106,7 +112,8 @@
         assertEquals(1, classes.size());
         assertEquals(String.class, classes.get(0));
 
-        classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testNoGenericsList").getGenericType());
+        classes =
+            JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testNoGenericsList").getGenericType());
         assertEquals(0, classes.size());
 
         classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testMap").getGenericType());
@@ -114,23 +121,19 @@
         assertEquals(String.class, classes.get(0));
         assertEquals(Bean1.class, classes.get(1));
 
-        classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredMethod("fooMethod", Map.class).getGenericParameterTypes()[0]);
+        classes = JavaIntrospectionHelper
+            .getGenerics(getClass().getDeclaredMethod("fooMethod", Map.class).getGenericParameterTypes()[0]);
         assertEquals(2, classes.size());
         assertEquals(String.class, classes.get(0));
         assertEquals(Bean1.class, classes.get(1));
 
-        classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredMethod("fooMethod", List.class).getGenericParameterTypes()[0]);
+        classes = JavaIntrospectionHelper
+            .getGenerics(getClass().getDeclaredMethod("fooMethod", List.class).getGenericParameterTypes()[0]);
         assertEquals(1, classes.size());
         assertEquals(String.class, classes.get(0));
 
     }
 
-    private List testNoGenericsList;
-
-    private List<String> testList;
-
-    private Map<String, Bean1> testMap;
-
     private void fooMethod(List<String> foo) {
 
     }
@@ -138,9 +141,6 @@
     private void fooMethod(Map<String, Bean1> foo) {
 
     }
-
-    private Target[] testArray;
-    private String[] testStringArray;
 
     public void setTestArray(Target[] array) {
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/SuperBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/SuperBean.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/SuperBean.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/SuperBean.java Sat Jun 17 10:28:07 2006
@@ -7,14 +7,12 @@
 
     public static final int ALL_SUPER_FIELDS = 6;
     public static final int ALL_SUPER_PUBLIC_PROTECTED_FIELDS = 5;
-
     public static final int ALL_SUPER_METHODS = 4;
-
-    private String superField1;
-
     public String superField2;
 
     protected String superField3;
+
+    private String superField1;
 
     public void setSuperMethod1(String param) {
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java Sat Jun 17 10:28:07 2006
@@ -31,8 +31,10 @@
     }
 
     public void setUp() throws Exception {
-        checkedMethod = InboundInvocationErrorTestCase.TestBean.class.getDeclaredMethod("checkedException", (Class[]) null);
-        runtimeMethod = InboundInvocationErrorTestCase.TestBean.class.getDeclaredMethod("runtimeException", (Class[]) null);
+        checkedMethod =
+            InboundInvocationErrorTestCase.TestBean.class.getDeclaredMethod("checkedException", (Class[]) null);
+        runtimeMethod =
+            InboundInvocationErrorTestCase.TestBean.class.getDeclaredMethod("runtimeException", (Class[]) null);
         assertNotNull(checkedMethod);
         assertNotNull(runtimeMethod);
     }
@@ -42,7 +44,8 @@
         chains.put(checkedMethod, createChain(checkedMethod));
         JDKInboundInvocationHandler handler = new JDKInboundInvocationHandler(chains);
         try {
-            InboundInvocationErrorTestCase.TestBean proxy = (InboundInvocationErrorTestCase.TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
+            InboundInvocationErrorTestCase.TestBean proxy = (InboundInvocationErrorTestCase.TestBean) Proxy
+                .newProxyInstance(Thread.currentThread().getContextClassLoader(),
                     new Class[]{InboundInvocationErrorTestCase.TestBean.class}, handler);
             proxy.checkedException();
         } catch (InboundInvocationErrorTestCase.TestException e) {
@@ -56,7 +59,8 @@
         chains.put(runtimeMethod, createChain(runtimeMethod));
         JDKInboundInvocationHandler handler = new JDKInboundInvocationHandler(chains);
         try {
-            InboundInvocationErrorTestCase.TestBean proxy = (InboundInvocationErrorTestCase.TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
+            InboundInvocationErrorTestCase.TestBean proxy = (InboundInvocationErrorTestCase.TestBean) Proxy
+                .newProxyInstance(Thread.currentThread().getContextClassLoader(),
                     new Class[]{InboundInvocationErrorTestCase.TestBean.class}, handler);
             proxy.runtimeException();
         } catch (InboundInvocationErrorTestCase.TestRuntimeException e) {
@@ -78,9 +82,9 @@
 
     public interface TestBean {
 
-        public void checkedException() throws InboundInvocationErrorTestCase.TestException;
+        void checkedException() throws InboundInvocationErrorTestCase.TestException;
 
-        public void runtimeException() throws InboundInvocationErrorTestCase.TestRuntimeException;
+        void runtimeException() throws InboundInvocationErrorTestCase.TestRuntimeException;
 
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java Sat Jun 17 10:28:07 2006
@@ -39,7 +39,7 @@
 
     public interface Hello {
 
-        public String hello(String message) throws Exception;
+        String hello(String message) throws Exception;
 
     }
 }

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java Sat Jun 17 10:28:07 2006
@@ -59,7 +59,7 @@
         JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(chains);
         try {
             TestBean proxy = (TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
-                    new Class[]{TestBean.class}, handler);
+                new Class[]{TestBean.class}, handler);
             proxy.checkedException();
         } catch (TestException e) {
             return;
@@ -73,7 +73,7 @@
         JDKOutboundInvocationHandler handler = new JDKOutboundInvocationHandler(chains);
         try {
             TestBean proxy = (TestBean) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
-                    new Class[]{TestBean.class}, handler);
+                new Class[]{TestBean.class}, handler);
             proxy.runtimeException();
         } catch (TestRuntimeException e) {
             return;
@@ -94,9 +94,9 @@
 
     public interface TestBean {
 
-        public void checkedException() throws TestException;
+        void checkedException() throws TestException;
 
-        public void runtimeException() throws TestRuntimeException;
+        void runtimeException() throws TestRuntimeException;
 
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java Sat Jun 17 10:28:07 2006
@@ -97,6 +97,7 @@
                 return;
             }
         } catch (Throwable e) {
+            //ok
         }
         fail(TestException.class.getName() + " should have been thrown");
     }

Modified: incubator/tuscany/sandbox/jboynes/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/pom.xml?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/pom.xml Sat Jun 17 10:28:07 2006
@@ -96,6 +96,7 @@
                             <phase>process-sources</phase>
                             <configuration>
                                 <configLocation>tuscany-checkstyle.xml</configLocation>
+										  <suppressionsLocation>tuscany-suppressions.xml</suppressionsLocation>
                                 <consoleOutput>true</consoleOutput>
                                 <failsOnError>true</failsOnError>
                                 <linkXRef>false</linkXRef>

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset Sat Jun 17 10:28:07 2006
@@ -116,7 +116,7 @@
 <!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
 
   <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
-  <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>
+  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
   <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
   <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
   <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->

Modified: incubator/tuscany/sandbox/jboynes/sca/tuscany-checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/tuscany-checkstyle.xml?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/tuscany-checkstyle.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/tuscany-checkstyle.xml Sat Jun 17 10:28:07 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?>
 <!--
   Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
 
@@ -28,10 +28,13 @@
 -->
 
 <module name="Checker">
+
+	
     <property name="severity"
              value="${checkstyle.severity}"
              default="warning"/>
 
+
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
     <!--
@@ -88,10 +91,10 @@
         <!-- defaults to sun.* packages -->
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
-        <module name="ImportOrder">
-            <property name="groups" value="java,javax,org.w3c,org.xml,w3c"/>
+        <!--<module name="ImportOrder">
+            <property name="groups" value="java,javax,org.w3c,org.xml,w3c,org.osoa"/>
             <property name="ordered" value="true"/>
-        </module>
+        </module>-->
         <!--
         <module name="ImportControl">
             <property name="file" value="etc/import-control.xml"/>
@@ -116,7 +119,7 @@
             <property name="countEmpty" value="false"/>
         </module>
         <module name="ParameterNumber">
-            <property name="max" value="7"/>
+            <property name="max" value="15"/>
         </module>
 
         <!-- Checks for whitespace                               -->
@@ -179,7 +182,7 @@
         <!--<module name="IllegalTokenText"/>-->
         <!--<module name="InnerAssignment"/>-->
         <!--<module name="MagicNumber"/>-->
-        <module name="MissingSwitchDefault"/>
+        <!--<module name="MissingSwitchDefault"/>-->
         <module name="ModifiedControlVariable"/>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
@@ -224,7 +227,7 @@
         <module name="FinalClass"/>
         <module name="HideUtilityClassConstructor"/>
         <module name="InterfaceIsType"/>
-        <module name="MutableException"/>
+        <!--<module name="MutableException"/>-->
         <module name="ThrowsCount">
             <property name="max" value="5"/>
         </module>

Added: incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml?rev=415032&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml (added)
+++ incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml Sat Jun 17 10:28:07 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ -->
+<!DOCTYPE suppressions PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+        "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+
+<suppressions>
+    <suppress checks="VisibilityModifier"
+              files="^.*TestCase$.java|BasicInterfaceImpl.java|Bean1.java|SuperBean.java"
+              />
+</suppressions>
\ No newline at end of file

Propchange: incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date



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