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 2007/02/12 06:56:26 UTC
svn commit: r506303 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/bootstrap/
main/java/org/apache/tuscany/core/databinding/impl/
main/java/org/apache/tuscany/core/runtime/
test/java/org/apache/tuscany/core/bootstra...
Author: jmarino
Date: Sun Feb 11 21:56:24 2007
New Revision: 506303
URL: http://svn.apache.org/viewvc?view=rev&rev=506303
Log:
fix sourcheck and PMD
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Sun Feb 11 21:56:24 2007
@@ -35,7 +35,6 @@
import org.apache.tuscany.spi.implementation.java.Introspector;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.PropertyObjectFactory;
-import org.apache.tuscany.spi.services.management.TuscanyManagementService;
import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
@@ -92,30 +91,27 @@
private final MonitorFactory monitorFactory;
private final XMLInputFactory xmlFactory;
private final ComponentManager componentManager;
- private final TuscanyManagementService managementService;
private final AutowireResolver resolver;
private final Connector connector;
/**
* Create a default bootstrapper.
*
- * @param monitorFactory the MonitorFactory to be used to create monitors for the primordial components
- * @param xmlFactory the XMLInputFactory to be used by the components to load XML artifacts
- * @param componentManager the component manager for the runtime instance
- * @param resolver the autowire resolver for the runtime instance
- * @param connector the connector for the runtime instance
- * @param managementService management service used by the runtime.
+ * @param monitorFactory the MonitorFactory to be used to create monitors for the primordial components
+ * @param xmlFactory the XMLInputFactory to be used by the components to load XML artifacts
+ * @param componentManager the component manager for the runtime instance
+ * @param resolver the autowire resolver for the runtime instance
+ * @param connector the connector for the runtime instance
*/
public DefaultBootstrapper(MonitorFactory monitorFactory,
XMLInputFactory xmlFactory,
ComponentManager componentManager,
AutowireResolver resolver,
- Connector connector,
- TuscanyManagementService managementService) {
+ Connector connector
+ ) {
this.monitorFactory = monitorFactory;
this.xmlFactory = xmlFactory;
this.componentManager = componentManager;
- this.managementService = managementService;
this.resolver = resolver;
this.connector = connector;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingJavaInterfaceProcessor.java Sun Feb 11 21:56:24 2007
@@ -51,7 +51,7 @@
private static final String SIMPLE_JAVA_OBJECTS = "java.lang.Object";
private static final Class[] SIMPLE_JAVA_TYPES =
- {Byte.class, Character.class, Short.class, Integer.class, Long.class, Float.class, Double.class, Date.class,
+ {Byte.class, Character.class, Short.class, Integer.class, Long.class, Float.class, Double.class, Date.class,
Calendar.class, GregorianCalendar.class, Duration.class, XMLGregorianCalendar.class, BigInteger.class,
BigDecimal.class};
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Sun Feb 11 21:56:24 2007
@@ -217,7 +217,7 @@
resolver = new DefaultAutowireResolver();
componentManager = new ComponentManagerImpl(tms, resolver);
Connector connector = new ConnectorImpl(componentManager);
- return new DefaultBootstrapper(getMonitorFactory(), xmlFactory, componentManager, resolver, connector, tms);
+ return new DefaultBootstrapper(getMonitorFactory(), xmlFactory, componentManager, resolver, connector);
}
protected void registerSystemComponents() throws InitializationException {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/bootstrap/BootstrapperTestCase.java Sun Feb 11 21:56:24 2007
@@ -37,6 +37,6 @@
protected void setUp() throws Exception {
super.setUp();
- bootstrapper = new DefaultBootstrapper(new NullMonitorFactory(), null, null, null, null, null);
+ bootstrapper = new DefaultBootstrapper(new NullMonitorFactory(), null, null, null, null);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/SystemWireConnectionTestCase.java Sun Feb 11 21:56:24 2007
@@ -101,7 +101,7 @@
* Verifies an application component cannot be wired to a service in a different scheme in the same composite
*/
public void testSchemeIsolationWire() throws Exception {
- OutboundWire outbound = new OutboundWireImpl();// EasyMock.createMock(OutboundWire.class);
+ OutboundWire outbound = new OutboundWireImpl();
outbound.setUri(URI.create("ref"));
outbound.setTargetUri(URI.create("sca://target#bar"));
List<OutboundWire> wires = new ArrayList<OutboundWire>();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java Sun Feb 11 21:56:24 2007
@@ -24,7 +24,7 @@
* @version $Rev$ $Date$
*/
public class InstanceWrapperBaseTestClass extends TestCase {
- private static final Object instance = new Object();
+ private static final Object INSTANCE = new Object();
private InstanceWrapperBase<Object> wrapper;
public void testLifecycle() throws Exception {
@@ -37,7 +37,7 @@
}
wrapper.start();
assertTrue(wrapper.isStarted());
- assertSame(instance, wrapper.getInstance());
+ assertSame(INSTANCE, wrapper.getInstance());
wrapper.stop();
assertFalse(wrapper.isStarted());
try {
@@ -59,6 +59,6 @@
protected void setUp() throws Exception {
super.setUp();
- wrapper = new InstanceWrapperBase<Object>(instance);
+ wrapper = new InstanceWrapperBase<Object>(INSTANCE);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java Sun Feb 11 21:56:24 2007
@@ -46,15 +46,7 @@
* @version $Rev$ $Date$
*/
public class DOMNode2JavaBeanTransformerTestCase extends TestCase {
-
- private DOMNode2JavaBeanTransformer dom2JavaTransformer = new DOMNode2JavaBeanTransformer();
-
- /**
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
+ private DOMNode2JavaBeanTransformer dom2JavaTransformer = new DOMNode2JavaBeanTransformer();
public void testFieldSettings() throws Exception {
String samplePropertyXML =
@@ -121,12 +113,14 @@
}
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
- public static class SamplePropertyBean {
-
+ private static class SamplePropertyBean {
+ public boolean[] boolArray;
private float floatNumber = 50;
private SamplePropertyBean innerProperty;
- public boolean[] boolArray;
private double doubleNumber = 75;
private int integerNumber = 25;
private String[] stringArray;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java?view=diff&rev=506303&r1=506302&r2=506303
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java Sun Feb 11 21:56:24 2007
@@ -156,7 +156,7 @@
manager.registerJavaObject(URI.create("ComponentManager"), ComponentManager.class, manager);
NullMonitorFactory monitorFactory = new NullMonitorFactory();
Bootstrapper bootstrapper =
- new DefaultBootstrapper(monitorFactory, xmlFactory, manager, resolver, connector, null);
+ new DefaultBootstrapper(monitorFactory, xmlFactory, manager, resolver, connector);
deployer = (DeployerImpl) bootstrapper.createDeployer();
deploymentContext = new RootDeploymentContext(null, xmlFactory, null, null);
implementation = new SystemCompositeImplementation();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org