Author: jmarino
Date: Sun Dec 3 21:01:29 2006
New Revision: 482078
URL: http://svn.apache.org/viewvc?view=rev&rev=482078
Log:
modify testcases to create system composites with the system flag to true
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/implementation/composite/CompositeComponentImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
incubator/tuscany/java/sca/services/transaction/transaction.geronimo/src/test/java/org/apache/tuscany/transaction/geronimo/jta/integration/BootstrapTestCase.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=482078&r1=482077&r2=482078
==============================================================================
---
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 Dec 3 21:01:29 2006
@@ -116,7 +116,7 @@
public RuntimeComponent createRuntime() {
DefaultRuntime runtime = new DefaultRuntime();
CompositeComponent systemComponent =
- new CompositeComponentImpl(ComponentNames.TUSCANY_SYSTEM_ROOT,
runtime, null, null);
+ new CompositeComponentImpl(ComponentNames.TUSCANY_SYSTEM_ROOT,
runtime, null, true);
runtime.setSystemComponent(systemComponent);
CompositeComponent rootComponent =
new
CompositeComponentImpl(ComponentNames.TUSCANY_APPLICATION_ROOT, runtime, null,
null);
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java?view=diff&rev=482078&r1=482077&r2=482078
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImpl.java
Sun Dec 3 21:01:29 2006
@@ -34,6 +34,14 @@
private String uri;
private boolean systemComposite;
+ /**
+ * Constructor specifying property values
+ *
+ * @param name the name of this Component
+ * @param parent this component's parent
+ * @param connector the connector to use for wires
+ * @param propertyValues this composite's Property values
+ */
public CompositeComponentImpl(String name,
CompositeComponent parent,
Connector connector,
@@ -41,6 +49,14 @@
this(name, null, parent, connector, propertyValues);
}
+ /**
+ * Constructor specifying if the composite is a system composite
+ *
+ * @param name the name of this Component
+ * @param parent this component's parent
+ * @param connector the connector to use for wires
+ * @param systemComposite true if the composite is a system composite
+ */
public CompositeComponentImpl(String name,
CompositeComponent parent,
Connector connector,
@@ -54,7 +70,7 @@
* @param name the name of this Component
* @param uri the unique identifier for this component
* @param parent this component's parent
- * @param connector
+ * @param connector the connector to use for wires
* @param propertyValues this composite's Property values
*/
public CompositeComponentImpl(String name,
@@ -72,7 +88,7 @@
* @param name the name of this Component
* @param uri the unique identifier for this component
* @param parent this component's parent
- * @param connector
+ * @param connector the connector to use for wires
* @param propertyValues this composite's Property values
* @param systemComposite true if the composite is a system composite
*/
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java?view=diff&rev=482078&r1=482077&r2=482078
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireTestCase.java
Sun Dec 3 21:01:29 2006
@@ -43,7 +43,7 @@
* Tests autowiring to an system atomic component
*/
public void testSystemAtomicAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl("parent", null,
null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -99,7 +99,7 @@
* Tests autowiring to a system service which is wired to an atomic
component.
*/
public void testSystemServiceAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl("parent", null,
null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -174,7 +174,7 @@
* Tests autowiring to a system reference
*/
public void testSystemReferenceAutowire() throws Exception {
- CompositeComponent parent = new CompositeComponentImpl("parent", null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl("parent", null,
null, true);
parent.start();
Source refSource = new SourceImpl();
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java?view=diff&rev=482078&r1=482077&r2=482078
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentResolutionTestCase.java
Sun Dec 3 21:01:29 2006
@@ -40,7 +40,7 @@
public class CompositeComponentResolutionTestCase extends TestCase {
public void testSystemComponentResolution() throws NoSuchMethodException {
- CompositeComponent parent = new CompositeComponentImpl("foo", null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl("foo", null,
null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
@@ -60,7 +60,7 @@
}
public void testLocateSystemService() throws NoSuchMethodException {
- CompositeComponent parent = new CompositeComponentImpl("foo", null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl("foo", null,
null, true);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
interfaces.add(Source.class);
@@ -137,7 +137,7 @@
}
public void testSystemGetService() throws NoSuchMethodException {
- CompositeComponent parent = new CompositeComponentImpl("foo", null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl("foo", null,
null, true);
parent.start();
Service service = EasyMock.createMock(Service.class);
EasyMock.expect(service.getName()).andReturn("source").atLeastOnce();
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java?view=diff&rev=482078&r1=482077&r2=482078
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
Sun Dec 3 21:01:29 2006
@@ -64,7 +64,7 @@
Connector connector = new ConnectorImpl();
SystemComponentBuilder builder = new SystemComponentBuilder();
- CompositeComponent parent = new CompositeComponentImpl(null, null,
connector, null);
+ CompositeComponent parent = new CompositeComponentImpl(null, null,
connector, true);
ComponentDefinition<SystemImplementation> targetComponentDefinition =
MockComponentFactory.createTarget();
ComponentDefinition<SystemImplementation> sourceComponentDefinition =
@@ -100,8 +100,8 @@
SystemComponentBuilder builder = new SystemComponentBuilder();
SystemBindingBuilder bindingBuilder = new SystemBindingBuilder();
- CompositeComponent grandParent = new
CompositeComponentImpl("grandparent", null, null, null);
- CompositeComponent parent = new CompositeComponentImpl("parent",
grandParent, null, null);
+ CompositeComponent grandParent = new
CompositeComponentImpl("grandparent", null, null, true);
+ CompositeComponent parent = new CompositeComponentImpl("parent",
grandParent, null, true);
// create a context in the grandparent that the reference will be
autowired to
ComponentDefinition<SystemImplementation> targetComponentDefinition =
MockComponentFactory.createTarget();
@@ -145,7 +145,7 @@
SystemComponentBuilder builder = new SystemComponentBuilder();
SystemBindingBuilder bindingBuilder = new SystemBindingBuilder();
- CompositeComponent parent = new CompositeComponentImpl(null, null,
null, null);
+ CompositeComponent parent = new CompositeComponentImpl(null, null,
null, true);
BoundServiceDefinition<SystemBinding> serviceDefinition =
MockComponentFactory.createBoundService();
ComponentDefinition<SystemImplementation> componentDefinition =
MockComponentFactory.createTarget();
Modified:
incubator/tuscany/java/sca/services/transaction/transaction.geronimo/src/test/java/org/apache/tuscany/transaction/geronimo/jta/integration/BootstrapTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/transaction/transaction.geronimo/src/test/java/org/apache/tuscany/transaction/geronimo/jta/integration/BootstrapTestCase.java?view=diff&rev=482078&r1=482077&r2=482078
==============================================================================
---
incubator/tuscany/java/sca/services/transaction/transaction.geronimo/src/test/java/org/apache/tuscany/transaction/geronimo/jta/integration/BootstrapTestCase.java
(original)
+++
incubator/tuscany/java/sca/services/transaction/transaction.geronimo/src/test/java/org/apache/tuscany/transaction/geronimo/jta/integration/BootstrapTestCase.java
Sun Dec 3 21:01:29 2006
@@ -49,8 +49,8 @@
super.setUp();
RuntimeComponent runtime = (RuntimeComponent)
component.getParent().getParent();
CompositeComponent systemComposite = runtime.getSystemComponent();
- CompositeComponent topLevelComposite = (CompositeComponent)
systemComposite.getChild(TUSCANY_SYSTEM);
- jtaComposite = (CompositeComponent)
topLevelComposite.getChild("geronimo.jta");
+ CompositeComponent topLevelComposite = (CompositeComponent)
systemComposite.getSystemChild(TUSCANY_SYSTEM);
+ jtaComposite = (CompositeComponent)
topLevelComposite.getSystemChild("geronimo.jta");
}
protected void tearDown() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
