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/24 17:26:13 UTC
svn commit: r416931 [3/3] - in /incubator/tuscany/sandbox/jboynes/sca:
core2/src/main/java/org/apache/tuscany/core/implementation/
core2/src/main/java/org/apache/tuscany/core/implementation/java/
core2/src/main/java/org/apache/tuscany/core/implementati...
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java?rev=416931&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java Sat Jun 24 08:26:09 2006
@@ -0,0 +1,79 @@
+package org.apache.tuscany.core.implementation.processor;
+
+import org.apache.tuscany.spi.model.Scope;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.implementation.PojoComponentType;
+import org.apache.tuscany.core.implementation.ProcessingException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ScopeProcessorTestCase extends TestCase {
+
+ public void testModuleScope() throws ProcessingException {
+ ScopeProcessor processor = new ScopeProcessor();
+ PojoComponentType type = new PojoComponentType();
+ processor.visitClass(Module.class, type, null);
+ assertEquals(Scope.MODULE, type.getLifecycleScope());
+ }
+
+ public void testSessionScope() throws ProcessingException {
+ ScopeProcessor processor = new ScopeProcessor();
+ PojoComponentType type = new PojoComponentType();
+ processor.visitClass(Session.class, type, null);
+ assertEquals(Scope.SESSION, type.getLifecycleScope());
+ }
+
+ public void testRequestScope() throws ProcessingException {
+ ScopeProcessor processor = new ScopeProcessor();
+ PojoComponentType type = new PojoComponentType();
+ processor.visitClass(Request.class, type, null);
+ assertEquals(Scope.REQUEST, type.getLifecycleScope());
+ }
+
+ public void testCompositeScope() throws ProcessingException {
+ ScopeProcessor processor = new ScopeProcessor();
+ PojoComponentType type = new PojoComponentType();
+ processor.visitClass(Composite.class, type, null);
+ assertEquals(Scope.COMPOSITE, type.getLifecycleScope());
+ }
+
+ public void testStatelessScope() throws ProcessingException {
+ ScopeProcessor processor = new ScopeProcessor();
+ PojoComponentType type = new PojoComponentType();
+ processor.visitClass(Stateless.class, type, null);
+ assertEquals(Scope.STATELESS, type.getLifecycleScope());
+ }
+
+ public void testNoScope() throws ProcessingException {
+ ScopeProcessor processor = new ScopeProcessor();
+ PojoComponentType type = new PojoComponentType();
+ processor.visitClass(None.class, type, null);
+ assertEquals(Scope.STATELESS, type.getLifecycleScope());
+ }
+
+ @org.osoa.sca.annotations.Scope("MODULE")
+ private class Module {
+ }
+
+ @org.osoa.sca.annotations.Scope("SESSION")
+ private class Session {
+ }
+
+ @org.osoa.sca.annotations.Scope("REQUEST")
+ private class Request {
+ }
+
+ @org.osoa.sca.annotations.Scope("COMPOSITE")
+ private class Composite {
+ }
+
+ @org.osoa.sca.annotations.Scope("STATELESS")
+ private class Stateless {
+ }
+
+ private class None {
+ }
+
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java?rev=416931&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java Sat Jun 24 08:26:09 2006
@@ -0,0 +1,129 @@
+/**
+ *
+ * Copyright 2006 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.
+ */
+package org.apache.tuscany.core.implementation.processor;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Remotable;
+import org.osoa.sca.annotations.Service;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.implementation.JavaMappedProperty;
+import org.apache.tuscany.core.implementation.JavaMappedReference;
+import org.apache.tuscany.core.implementation.JavaMappedService;
+import org.apache.tuscany.core.implementation.JavaServiceContract;
+import org.apache.tuscany.core.implementation.PojoComponentType;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ServiceProcessorTestCase extends TestCase {
+
+ private ServiceProcessor processor;
+ private PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type;
+
+ public void testMultipleInterfaces() throws Exception {
+ processor.visitClass(FooMultiple.class, type, null);
+ assertEquals(2, type.getServices().size());
+ JavaMappedService service = type.getServices().get("ServiceProcessorTestCase$Baz");
+ JavaServiceContract contract = (JavaServiceContract) service.getServiceContract();
+ assertEquals(Baz.class, contract.getInterfaceClass());
+ assertEquals(Bar.class, contract.getCallbackClass());
+ assertEquals("ServiceProcessorTestCase$Bar", contract.getCallbackName());
+ assertNotNull(type.getServices().get("ServiceProcessorTestCase$Bar"));
+ }
+
+ public void testSingleInterfaces() throws Exception {
+ processor.visitClass(FooSingle.class, type, null);
+ assertEquals(1, type.getServices().size());
+ assertNotNull(type.getServices().get("ServiceProcessorTestCase$Baz"));
+ }
+
+ public void testMultipleNoService() throws Exception {
+ processor.visitClass(FooMultipleNoService.class, type, null);
+ assertEquals(0, type.getServices().size());
+ }
+
+ public void testRemotableNoService() throws Exception {
+ processor.visitClass(FooRemotableNoService.class, type, null);
+ assertEquals(1, type.getServices().size());
+ JavaMappedService service = type.getServices().get("ServiceProcessorTestCase$BazRemotable");
+ JavaServiceContract contract = (JavaServiceContract) service.getServiceContract();
+ assertEquals(BazRemotable.class, contract.getInterfaceClass());
+ }
+
+ public void testNonInterface() throws Exception {
+ try {
+ processor.visitClass(BadImpl.class, type, null);
+ fail();
+ } catch (InvalidServiceType e) {
+ //expected
+ }
+ }
+
+ public void testNoInterfaces() throws Exception {
+ try {
+ processor.visitClass(BadDefinition.class, type, null);
+ fail();
+ } catch (IllegalServiceDefinitionException e) {
+ //expected
+ }
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ processor = new ServiceProcessor();
+ type = new PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>>();
+ }
+
+ @Callback(Bar.class)
+ private interface Baz {
+ }
+
+ private interface Bar {
+ }
+
+ @Remotable
+ private interface BazRemotable {
+ }
+
+ @Service(interfaces = {Baz.class, Bar.class})
+ private class FooMultiple implements Baz, Bar {
+
+ }
+
+ @Service(Baz.class)
+ private class FooSingle implements Baz, Bar {
+
+ }
+
+ private class FooMultipleNoService implements Baz, Bar {
+
+ }
+
+ private class FooRemotableNoService implements BazRemotable, Bar {
+
+ }
+
+ @Service(FooSingle.class)
+ private class BadImpl extends FooSingle {
+
+ }
+
+
+ @Service()
+ private class BadDefinition extends FooSingle {
+
+ }
+
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/system/wire/AtomicComponentWireInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/system/wire/AtomicComponentWireInvocationTestCase.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/system/wire/AtomicComponentWireInvocationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/implementation/system/wire/AtomicComponentWireInvocationTestCase.java Sat Jun 24 08:26:09 2006
@@ -32,7 +32,7 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
- configuration.addMember("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
+ configuration.addReferenceMember("setTarget", SourceImpl.class.getMethod("setTarget", Target.class));
configuration.addServiceInterface(Source.class);
configuration.setObjectFactory(new PojoObjectFactory(SourceImpl.class.getConstructor()));
SystemAtomicComponent sourceContext = new SystemAtomicComponentImpl("source", configuration);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/FieldInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/FieldInjectorTestCase.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/FieldInjectorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/FieldInjectorTestCase.java Sat Jun 24 08:26:09 2006
@@ -9,22 +9,19 @@
*/
public class FieldInjectorTestCase extends TestCase {
- private Field privateField;
+ protected Field protectedField;
public void testIllegalAccess() throws Exception {
- FieldInjector<Foo> injector = new FieldInjector<Foo>(privateField, new SingletonObjectFactory<String>("foo"));
- try {
- injector.inject(new Foo());
- fail();
- } catch (AssertionError e) {
- //expected
- }
+ FieldInjector<Foo> injector = new FieldInjector<Foo>(protectedField, new SingletonObjectFactory<String>("foo"));
+ Foo foo = new Foo();
+ injector.inject(foo);
+ assertEquals("foo", foo.hidden);
}
protected void setUp() throws Exception {
super.setUp();
- privateField = Foo.class.getDeclaredField("hidden");
+ protectedField = Foo.class.getDeclaredField("hidden");
}
private class Foo {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java Sat Jun 24 08:26:09 2006
@@ -26,17 +26,6 @@
}
}
- public void testIllegalAccess() throws Exception {
- ObjectFactory<Object> factory = new SingletonObjectFactory<Object>("foo");
- MethodInjector<Foo> injector = new MethodInjector<Foo>(privateMethod, factory);
- try {
- injector.inject(new Foo());
- fail();
- } catch (AssertionError e) {
- // expected
- }
- }
-
public void testException() throws Exception {
ObjectFactory<Object> factory = new SingletonObjectFactory<Object>("foo");
MethodInjector<Foo> injector = new MethodInjector<Foo>(exceptionMethod, factory);
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java?rev=416931&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java Sat Jun 24 08:26:09 2006
@@ -0,0 +1,78 @@
+package org.apache.tuscany.core.integration.implementation.java.builder;
+
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.Scope;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
+import org.apache.tuscany.core.component.AutowireComponent;
+import org.apache.tuscany.core.component.WorkContextImpl;
+import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
+import org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory;
+import org.apache.tuscany.core.implementation.JavaMappedProperty;
+import org.apache.tuscany.core.implementation.PojoComponentType;
+import org.apache.tuscany.core.implementation.java.JavaComponentBuilder;
+import org.apache.tuscany.core.implementation.java.JavaImplementation;
+import org.apache.tuscany.core.injection.SingletonObjectFactory;
+import org.jmock.Mock;
+import org.jmock.MockObjectTestCase;
+
+/**
+ * Verifies that the system builder handles configured properties correctly
+ *
+ * @version $Rev$ $Date$
+ */
+public class JavaBuilderPropertyTestCase extends MockObjectTestCase {
+
+ private DeploymentContext deploymentContext;
+ private CompositeComponent<?> parent;
+ private ScopeRegistry registry;
+
+ public void testPropertyHandling() throws Exception {
+ JavaComponentBuilder builder = new JavaComponentBuilder();
+ builder.setScopeRegistry(registry);
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>> type =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
+ JavaMappedProperty<String> property = new JavaMappedProperty<String>();
+ property.setName("test");
+ property.setDefaultValueFactory(new SingletonObjectFactory<String>("foo"));
+ property.setMember(JavaBuilderPropertyTestCase.Foo.class.getMethod("setTest", String.class));
+ type.add(property);
+ type.setLifecycleScope(Scope.STATELESS);
+ JavaImplementation impl = new JavaImplementation();
+ impl.setComponentType(type);
+ impl.setImplementationClass(JavaBuilderPropertyTestCase.Foo.class);
+ ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
+ AtomicComponent<?> component = builder.build(parent, definition, deploymentContext);
+ JavaBuilderPropertyTestCase.Foo foo = (JavaBuilderPropertyTestCase.Foo) component.createInstance();
+ assertEquals("foo", foo.getTest());
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ deploymentContext = new DeploymentContext(null, null, null);
+ Mock mock = mock(AutowireComponent.class);
+ parent = (CompositeComponent<?>) mock.proxy();
+ registry = new ScopeRegistryImpl(new WorkContextImpl());
+ registry.registerFactory(Scope.STATELESS, new StatelessScopeObjectFactory());
+ }
+
+ private static class Foo {
+ private String test;
+
+ public Foo() {
+ }
+
+ public String getTest() {
+ return test;
+ }
+
+ public void setTest(String test) {
+ this.test = test;
+ }
+ }
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java?rev=416931&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java Sat Jun 24 08:26:09 2006
@@ -0,0 +1,81 @@
+/**
+ *
+ * Copyright 2006 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.
+ */
+package org.apache.tuscany.core.integration.implementation.system.builder;
+
+import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
+import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.ServiceDefinition;
+
+import org.apache.tuscany.core.component.AutowireComponent;
+import org.apache.tuscany.core.implementation.JavaMappedProperty;
+import org.apache.tuscany.core.implementation.PojoComponentType;
+import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
+import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
+import org.apache.tuscany.core.injection.SingletonObjectFactory;
+import org.jmock.Mock;
+import org.jmock.MockObjectTestCase;
+
+/**
+ * Verifies that the system builder handles configured properties correctly
+ *
+ * @version $Rev$ $Date$
+ */
+public class SystemBuilderPropertyTestCase extends MockObjectTestCase {
+
+ DeploymentContext deploymentContext;
+ CompositeComponent<?> parent;
+
+ public void testPropertyHandling() throws Exception {
+ SystemComponentBuilder builder = new SystemComponentBuilder();
+ PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>> type =
+ new PojoComponentType<ServiceDefinition, ReferenceDefinition, JavaMappedProperty<?>>();
+ JavaMappedProperty<String> property = new JavaMappedProperty<String>();
+ property.setName("test");
+ property.setDefaultValueFactory(new SingletonObjectFactory<String>("foo"));
+ property.setMember(Foo.class.getMethod("setTest", String.class));
+ type.add(property);
+ SystemImplementation impl = new SystemImplementation();
+ impl.setComponentType(type);
+ impl.setImplementationClass(Foo.class);
+ ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
+ AtomicComponent<?> component = builder.build(parent, definition, deploymentContext);
+ Foo foo = (Foo) component.createInstance();
+ assertEquals("foo", foo.getTest());
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ deploymentContext = new DeploymentContext(null, null, null);
+ Mock mock = mock(AutowireComponent.class);
+ parent = (CompositeComponent<?>) mock.proxy();
+ }
+
+ private static class Foo {
+ private String test;
+
+ public Foo() {
+ }
+
+ public String getTest() {
+ return test;
+ }
+
+ public void setTest(String test) {
+ this.test = test;
+ }
+ }
+}
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java (from r416333, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java&r1=416333&r2=416931&rev=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java Sat Jun 24 08:26:09 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.core.integration.system.builder;
+package org.apache.tuscany.core.integration.implementation.system.builder;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Reference;
@@ -17,22 +17,22 @@
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
-import org.apache.tuscany.core.mock.component.Source;
-import org.apache.tuscany.core.mock.component.Target;
-import org.apache.tuscany.core.mock.factories.MockComponentFactory;
import org.apache.tuscany.core.implementation.system.builder.SystemBindingBuilder;
import org.apache.tuscany.core.implementation.system.builder.SystemComponentBuilder;
import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponentImpl;
import org.apache.tuscany.core.implementation.system.model.SystemBinding;
import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
+import org.apache.tuscany.core.mock.component.Source;
+import org.apache.tuscany.core.mock.component.Target;
+import org.apache.tuscany.core.mock.factories.MockComponentFactory;
/**
* Validates that system builders and the default connector create properly wired contexts
*
* @version $$Rev$$ $$Date$$
*/
-public class SystemBuildersTestCase extends TestCase {
+public class SystemBuilderWireTestCase extends TestCase {
private DeploymentContext deploymentContext;
/**
@@ -89,17 +89,15 @@
// create a context in the grandparent that the reference will be autowired to
ComponentDefinition<SystemImplementation> targetComponentDefinition = MockComponentFactory.createTarget();
- AtomicComponent targetComponentComponent =
- (AtomicComponent) builder.build(parent, targetComponentDefinition, deploymentContext);
+ AtomicComponent targetComponentComponent = builder.build(parent, targetComponentDefinition, deploymentContext);
grandParent.register(targetComponentComponent);
BoundReferenceDefinition<SystemBinding> targetReferenceDefinition = MockComponentFactory.createBoundReference();
ComponentDefinition<SystemImplementation> sourceComponentDefinition =
MockComponentFactory.createSourceWithTargetReference();
- AtomicComponent<?> sourceComponent =
- (AtomicComponent) builder.build(parent, sourceComponentDefinition, deploymentContext);
- Reference reference = (Reference) bindingBuilder.build(parent, targetReferenceDefinition, deploymentContext);
+ AtomicComponent<?> sourceComponent = builder.build(parent, sourceComponentDefinition, deploymentContext);
+ Reference reference = bindingBuilder.build(parent, targetReferenceDefinition, deploymentContext);
parent.register(sourceComponent);
parent.register(reference);
@@ -137,9 +135,8 @@
BoundServiceDefinition<SystemBinding> serviceDefinition = MockComponentFactory.createBoundService();
ComponentDefinition<SystemImplementation> componentDefinition = MockComponentFactory.createTarget();
- AtomicComponent sourceComponent =
- (AtomicComponent) builder.build(parent, componentDefinition, deploymentContext);
- Service service = (Service) bindingBuilder.build(parent, serviceDefinition, deploymentContext);
+ AtomicComponent sourceComponent = builder.build(parent, componentDefinition, deploymentContext);
+ Service service = bindingBuilder.build(parent, serviceDefinition, deploymentContext);
connector.connect(service.getInboundWire(), service.getOutboundWire(), true);
parent.register(sourceComponent);
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderWireTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponent.java Sat Jun 24 08:26:09 2006
@@ -22,7 +22,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public interface ModuleScopeComponent extends GenericComponent {
+public interface ModuleScopeComponent {
//public boolean isInit();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java Sat Jun 24 08:26:09 2006
@@ -23,7 +23,7 @@
* @version $Rev$ $Date$
*/
@Scope("MODULE")
-public class ModuleScopeComponentImpl extends AbstractGenericComponent implements
+public class ModuleScopeComponentImpl implements
ModuleScopeComponent {
private String foo;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeComponent.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeComponent.java Sat Jun 24 08:26:09 2006
@@ -22,7 +22,7 @@
* @version $Rev$ $Date$
*/
@Scope("REQUEST")
-public interface RequestScopeComponent extends GenericComponent {
+public interface RequestScopeComponent {
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponent.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponent.java Sat Jun 24 08:26:09 2006
@@ -22,7 +22,7 @@
* @version $Rev$ $Date$
*/
@Scope("SESSION")
-public interface SessionScopeComponent extends GenericComponent {
+public interface SessionScopeComponent {
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponentImpl.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponentImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponentImpl.java Sat Jun 24 08:26:09 2006
@@ -22,7 +22,7 @@
* @version $Rev$ $Date$
*/
@Scope("SESSION")
-public class SessionScopeComponentImpl extends AbstractGenericComponent implements
+public class SessionScopeComponentImpl implements
SessionScopeComponent {
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponent.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponent.java Sat Jun 24 08:26:09 2006
@@ -22,7 +22,7 @@
* @version $Rev$ $Date$
*/
@Scope("STATELESS")
-public interface StatelessComponent extends GenericComponent {
+public interface StatelessComponent {
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponentImpl.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponentImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponentImpl.java Sat Jun 24 08:26:09 2006
@@ -19,7 +19,7 @@
/**
* @version $Rev$ $Date$
*/
-public class StatelessComponentImpl extends AbstractGenericComponent implements
+public class StatelessComponentImpl implements
StatelessComponent {
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java Sat Jun 24 08:26:09 2006
@@ -6,19 +6,19 @@
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.JavaServiceContract;
-import org.apache.tuscany.core.implementation.PojoComponentType;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ReferenceTarget;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.model.ServiceDefinition;
+import org.apache.tuscany.core.implementation.JavaMappedReference;
+import org.apache.tuscany.core.implementation.JavaServiceContract;
+import org.apache.tuscany.core.implementation.PojoComponentType;
+import org.apache.tuscany.core.implementation.system.model.SystemBinding;
+import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
import org.apache.tuscany.core.mock.component.SourceImpl;
import org.apache.tuscany.core.mock.component.Target;
import org.apache.tuscany.core.mock.component.TargetImpl;
-import org.apache.tuscany.core.implementation.system.model.SystemBinding;
-import org.apache.tuscany.core.implementation.system.model.SystemImplementation;
/**
* @version $$Rev$$ $$Date$$
@@ -35,14 +35,15 @@
SystemImplementation impl = new SystemImplementation();
PojoComponentType componentType = new PojoComponentType();
componentType.setLifecycleScope(Scope.MODULE);
- ReferenceDefinition referenceDefinition = new ReferenceDefinition();
- referenceDefinition.setName("target");
- ServiceContract contract = new JavaServiceContract();
- contract.setInterfaceClass(Target.class);
- referenceDefinition.setServiceContract(contract);
- componentType.add(referenceDefinition);
+ JavaMappedReference reference;
try {
- componentType.addReferenceMember("target", SourceImpl.class.getMethod("setTarget", Target.class));
+ reference = new JavaMappedReference();
+ reference.setName("target");
+ reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
+ ServiceContract contract = new JavaServiceContract();
+ contract.setInterfaceClass(Target.class);
+ reference.setServiceContract(contract);
+ componentType.add(reference);
} catch (NoSuchMethodException e) {
throw new AssertionError(e);
}
@@ -53,7 +54,7 @@
sourceComponentDefinition.setName("source");
ReferenceTarget referenceTarget = new ReferenceTarget();
- referenceTarget.setReference(referenceDefinition);
+ referenceTarget.setReference(reference);
referenceTarget.setReferenceName("target");
try {
referenceTarget.addTarget(new URI("target/Target"));
@@ -71,15 +72,16 @@
SystemImplementation impl = new SystemImplementation();
PojoComponentType componentType = new PojoComponentType();
componentType.setLifecycleScope(Scope.MODULE);
- ReferenceDefinition referenceDefinition = new ReferenceDefinition();
- referenceDefinition.setName("target");
- referenceDefinition.setAutowire(true);
- ServiceContract contract = new JavaServiceContract();
- contract.setInterfaceClass(Target.class);
- referenceDefinition.setServiceContract(contract);
- componentType.add(referenceDefinition);
+ JavaMappedReference reference;
try {
- componentType.addReferenceMember("target", SourceImpl.class.getMethod("setTarget", Target.class));
+ reference = new JavaMappedReference();
+ reference.setName("target");
+ reference.setMember(SourceImpl.class.getMethod("setTarget", Target.class));
+ reference.setAutowire(true);
+ ServiceContract contract = new JavaServiceContract();
+ contract.setInterfaceClass(Target.class);
+ reference.setServiceContract(contract);
+ componentType.add(reference);
} catch (NoSuchMethodException e) {
throw new AssertionError(e);
}
@@ -90,7 +92,7 @@
sourceComponentDefinition.setName("source");
ReferenceTarget referenceTarget = new ReferenceTarget();
- referenceTarget.setReference(referenceDefinition);
+ referenceTarget.setReference(reference);
referenceTarget.setReferenceName("target");
sourceComponentDefinition.add(referenceTarget);
return sourceComponentDefinition;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockFactory.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockFactory.java Sat Jun 24 08:26:09 2006
@@ -99,7 +99,7 @@
throw new IllegalArgumentException("No setter found on source for target");
}
- sourceConfig.addMember(setter.getName(), setter);
+ sourceConfig.addReferenceMember(setter.getName(), setter);
SystemAtomicComponent sourceCtx = new SystemAtomicComponentImpl(source, sourceConfig);
QualifiedName targetName = new QualifiedName(target);
SystemOutboundWire wire = new SystemOutboundWireImpl(setter.getName(), targetName, targetClass);
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=416931&r1=416930&r2=416931&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 24 08:26:09 2006
@@ -26,33 +26,23 @@
super(arg0);
}
- public void testGetSuperAllFields() throws Exception {
- Set<Field> superBeanFields = JavaIntrospectionHelper.getAllFields(SuperBean.class);
- assertEquals(SuperBean.ALL_SUPER_FIELDS, superBeanFields.size());
- }
-
public void testBean1AllPublicProtectedFields() throws Exception {
Set<Field> beanFields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(Bean1.class);
assertEquals(4, beanFields.size()); //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS
}
- public void testBean1AllFields() throws Exception {
- Set<Field> beanFields = JavaIntrospectionHelper.getAllFields(Bean1.class);
- assertEquals(Bean1.ALL_BEAN1_FIELDS, beanFields.size());
- }
-
public void testGetSuperAllMethods() throws Exception {
- Set<Method> superBeanMethods = JavaIntrospectionHelper.getAllUniqueMethods(SuperBean.class);
+ Set<Method> superBeanMethods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(SuperBean.class);
assertEquals(SuperBean.ALL_SUPER_METHODS, superBeanMethods.size());
}
public void testGetBean1AllMethods() throws Exception {
- Set<Method> beanMethods = JavaIntrospectionHelper.getAllUniqueMethods(Bean1.class);
+ Set<Method> beanMethods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class);
assertEquals(Bean1.ALL_BEAN1_METHODS, beanMethods.size());
}
public void testOverrideMethod() throws Exception {
- Set<Method> beanFields = JavaIntrospectionHelper.getAllUniqueMethods(Bean1.class);
+ Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class);
boolean invoked = false;
for (Method method : beanFields) {
if (method.getName().equals("override")) {
@@ -66,7 +56,7 @@
}
public void testNoOverrideMethod() throws Exception {
- Set<Method> beanFields = JavaIntrospectionHelper.getAllUniqueMethods(Bean1.class);
+ Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class);
boolean found = false;
for (Method method : beanFields) {
if (method.getName().equals("noOverride") && method.getParameterTypes().length == 0) {
@@ -78,29 +68,10 @@
}
}
- public void testGetBean1AllFields() throws Exception {
- Set<Field> bean1 = JavaIntrospectionHelper.getAllFields(Bean1.class);
- assertEquals(Bean1.ALL_BEAN1_FIELDS, bean1.size());
- }
-
public void testDefaultConstructor() throws Exception {
Constructor ctr = JavaIntrospectionHelper.getDefaultConstructor(Bean2.class);
assertEquals(ctr, Bean2.class.getConstructor());
assertTrue(Bean2.class == ctr.newInstance((Object[]) null).getClass());
- }
-
-
- public void testFindMultiplicityByFieldName() throws Exception {
- Set<Field> fields = JavaIntrospectionHelper.getAllFields(getClass());
- Set<Method> methods = JavaIntrospectionHelper.getAllUniqueMethods(getClass());
-
- assertNotNull(JavaIntrospectionHelper.findMultiplicityFieldByName("testList", fields));
- assertNotNull(JavaIntrospectionHelper.findMultiplicityMethodByName("fooMethod", methods));
-
- // this array is not an interface
- assertNull(JavaIntrospectionHelper.findMultiplicityFieldByName("testStringArray", fields));
- assertNotNull(JavaIntrospectionHelper.findMultiplicityFieldByName("testArray", fields));
- assertNotNull(JavaIntrospectionHelper.findMultiplicityMethodByName("setTestArray", methods));
}
/**
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml Sat Jun 24 08:26:09 2006
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api</artifactId>
- <version>incubating-M1</version>
+ <version>SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java Sat Jun 24 08:26:09 2006
@@ -27,8 +27,8 @@
private B binding;
private URI target;
- public BoundServiceDefinition(String name, ServiceContract serviceContract, B binding, URI target) {
- super(name, serviceContract);
+ public BoundServiceDefinition(String name, ServiceContract contract, boolean remotable, B binding, URI target) {
+ super(name, contract, remotable);
this.binding = binding;
this.target = target;
}
@@ -51,4 +51,5 @@
public void setTarget(URI target) {
this.target = target;
}
+
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java Sat Jun 24 08:26:09 2006
@@ -18,6 +18,8 @@
import javax.xml.namespace.QName;
+import org.apache.tuscany.spi.ObjectFactory;
+
/**
* A component property
*
@@ -25,7 +27,7 @@
*/
public class Property<T> extends ModelObject {
private String name;
- private T defaultValue;
+ private ObjectFactory<T> defaultValueFactory;
private QName xmlType;
private Class<T> javaType;
private boolean many;
@@ -48,12 +50,12 @@
this.name = name;
}
- public T getDefaultValue() {
- return defaultValue;
+ public ObjectFactory<T> getDefaultValueFactory() {
+ return defaultValueFactory;
}
- public void setDefaultValue(T defaultValue) {
- this.defaultValue = defaultValue;
+ public void setDefaultValueFactory(ObjectFactory<T> factory) {
+ this.defaultValueFactory = factory;
}
public QName getXmlType() {
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java Sat Jun 24 08:26:09 2006
@@ -26,6 +26,7 @@
private ServiceContract serviceContract;
private Multiplicity multiplicity;
private boolean autowire;
+ private boolean required;
public ReferenceDefinition() {
}
@@ -65,5 +66,13 @@
public void setAutowire(boolean autowire) {
this.autowire = autowire;
+ }
+
+ public boolean isRequired() {
+ return required;
+ }
+
+ public void setRequired(boolean required) {
+ this.required = required;
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java Sat Jun 24 08:26:09 2006
@@ -24,10 +24,12 @@
public class ServiceDefinition extends ModelObject {
private String name;
private ServiceContract serviceContract;
+ private boolean remotable;
- public ServiceDefinition(String name, ServiceContract serviceContract) {
+ public ServiceDefinition(String name, ServiceContract serviceContract, boolean remotable) {
this.name = name;
this.serviceContract = serviceContract;
+ this.remotable = remotable;
}
public ServiceDefinition() {
@@ -47,5 +49,13 @@
public void setServiceContract(ServiceContract serviceContract) {
this.serviceContract = serviceContract;
+ }
+
+ public boolean isRemotable() {
+ return remotable;
+ }
+
+ public void setRemotable(boolean remotable) {
+ this.remotable = remotable;
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/annotation/ConstructorAnnotationTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/annotation/ConstructorAnnotationTest.java?rev=416931&r1=416930&r2=416931&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/annotation/ConstructorAnnotationTest.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/test/java/org/apache/tuscany/spi/annotation/ConstructorAnnotationTest.java Sat Jun 24 08:26:09 2006
@@ -18,6 +18,8 @@
import java.util.Arrays;
+import org.osoa.sca.annotations.Constructor;
+
import junit.framework.TestCase;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org