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/09/10 05:41:14 UTC
svn commit: r441893 [3/4] - in /incubator/tuscany/java/sca:
bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/
bindings/binding.axis2/src/test/java/org/apache/tuscany/binding/axis2/
bindings/binding.celtix/src/main/java/org/apache/t...
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/integration/component/ScopeReferenceTestCase.java Sat Sep 9 20:41:09 2006
@@ -32,11 +32,6 @@
import org.apache.tuscany.spi.component.WorkContext;
import junit.framework.TestCase;
-import org.apache.tuscany.core.implementation.java.mock.MockFactory;
-import org.apache.tuscany.core.implementation.java.mock.components.Source;
-import org.apache.tuscany.core.implementation.java.mock.components.SourceImpl;
-import org.apache.tuscany.core.implementation.java.mock.components.Target;
-import org.apache.tuscany.core.implementation.java.mock.components.TargetImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.event.CompositeStart;
import org.apache.tuscany.core.component.event.CompositeStop;
@@ -48,6 +43,11 @@
import org.apache.tuscany.core.component.scope.ModuleScopeContainer;
import org.apache.tuscany.core.component.scope.RequestScopeContainer;
import org.apache.tuscany.core.component.scope.StatelessScopeContainer;
+import org.apache.tuscany.core.implementation.java.mock.MockFactory;
+import org.apache.tuscany.core.implementation.java.mock.components.Source;
+import org.apache.tuscany.core.implementation.java.mock.components.SourceImpl;
+import org.apache.tuscany.core.implementation.java.mock.components.Target;
+import org.apache.tuscany.core.implementation.java.mock.components.TargetImpl;
import org.apache.tuscany.core.util.JavaIntrospectionHelper;
/**
@@ -62,7 +62,6 @@
/**
* Tests a module-to-module scoped wire
*/
- @SuppressWarnings("unchecked")
public void testModuleToModule() throws Exception {
ScopeContainer scope = new ModuleScopeContainer(null);
scope.start();
@@ -70,10 +69,10 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
scope, members, "target", Target.class, TargetImpl.class, scope);
scope.onEvent(new CompositeStart(this, null));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -86,7 +85,6 @@
/**
* Tests a module-to-session scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testModuleToSession() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
@@ -100,10 +98,10 @@
Object session1 = new Object();
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -117,7 +115,7 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
@@ -135,7 +133,6 @@
/**
* Tests a module-to-request scoped wire
*/
- @SuppressWarnings("unchecked")
public void testModuleToRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
@@ -148,10 +145,10 @@
moduleScope.onEvent(new CompositeStart(this, null));
requestScope.onEvent(new RequestStart(this));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- final Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ final AtomicComponent targetComponent = contexts.get("target");
+ final Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -163,7 +160,7 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -184,7 +181,6 @@
/**
* Tests a module-to-stateless scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testModuleToStateless() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
@@ -196,16 +192,16 @@
moduleScope, members, "target", Target.class, TargetImpl.class, statelessScope);
moduleScope.onEvent(new CompositeStart(this, null));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -218,7 +214,6 @@
/**
* Tests a session-to-session scoped wire
*/
- @SuppressWarnings("unchecked")
public void testSessionToSession() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
@@ -230,10 +225,10 @@
Object session1 = new Object();
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
source.getTarget().setString("foo");
source.getTarget().setString("foo");
assertEquals("foo", target.getString());
@@ -246,9 +241,9 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Source source2 = sourceComponent.getServiceInstance();
+ Source source2 = (Source) sourceComponent.getServiceInstance();
assertNotNull(source2);
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertNotNull(target2);
assertNull(target2.getString());
@@ -265,7 +260,6 @@
/**
* Tests a session-to-module scoped wire
*/
- @SuppressWarnings("unchecked")
public void testSessionToModule() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer moduleScope = new ModuleScopeContainer(ctx);
@@ -279,10 +273,10 @@
Object session1 = new Object();
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -296,8 +290,8 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getServiceInstance();
- Source source2 = sourceComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
+ Source source2 = (Source) sourceComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("baz");
@@ -313,7 +307,6 @@
/**
* Tests a session-to-request scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testSessionToRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx);
@@ -327,10 +320,10 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
requestScope.onEvent(new RequestStart(this));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- final Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ final AtomicComponent targetComponent = contexts.get("target");
+ final Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -342,7 +335,7 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -365,7 +358,6 @@
/**
* Tests a session-to-stateless scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testSessionToStateless() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer sessionScope = new HttpSessionScopeContainer(ctx);
@@ -380,16 +372,16 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -403,7 +395,6 @@
/**
* Tests a request-to-request scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testRequestToRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx);
@@ -413,10 +404,10 @@
requestScope, members, "target", Target.class, TargetImpl.class, requestScope);
requestScope.onEvent(new RequestStart(this));
- final AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ final AtomicComponent sourceComponent = contexts.get("source");
+ final AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -428,8 +419,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = sourceComponent.getServiceInstance();
- Target target2 = targetComponent.getServiceInstance();
+ Source source2 = (Source) sourceComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source2.getTarget().getString()));
source2.getTarget().setString("bar");
@@ -447,7 +438,6 @@
/**
* Tests a request-to-module scoped wire
*/
- @SuppressWarnings("unchecked")
public void testRequestToModule() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx);
@@ -460,10 +450,10 @@
requestScope, members, "target", Target.class, TargetImpl.class, moduleScope);
requestScope.onEvent(new RequestStart(this));
- final AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ final AtomicComponent sourceComponent = contexts.get("source");
+ final AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -475,8 +465,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = sourceComponent.getServiceInstance();
- Target target2 = targetComponent.getServiceInstance();
+ Source source2 = (Source) sourceComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("bar");
@@ -498,7 +488,6 @@
/**
* Tests a request-to-session scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testRequestToSession() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx);
@@ -512,11 +501,11 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
requestScope, members, "target", Target.class, TargetImpl.class, sessionScope);
- final AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
+ final AtomicComponent sourceComponent = contexts.get("source");
+ final AtomicComponent targetComponent = contexts.get("target");
requestScope.onEvent(new RequestStart(this));
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -528,8 +517,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = sourceComponent.getServiceInstance();
- Target target2 = targetComponent.getServiceInstance();
+ Source source2 = (Source) sourceComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("bar");
@@ -553,7 +542,6 @@
/**
* Tests a request-to-stateless scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testRequestToStateless() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer requestScope = new RequestScopeContainer(ctx);
@@ -564,17 +552,17 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
requestScope, members, "target", Target.class, TargetImpl.class, statelessScope);
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
requestScope.onEvent(new RequestStart(this));
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -587,7 +575,6 @@
/**
* Tests a stateless-to-stateless scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testStatelessToStateless() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
@@ -596,16 +583,16 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
statelessScope, members, "target", Target.class, TargetImpl.class, statelessScope);
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -615,7 +602,6 @@
/**
* Tests a stateless-to-request scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testStatelessToRequest() throws Exception {
WorkContext ctx = new WorkContextImpl();
final ScopeContainer requestScope = new RequestScopeContainer(ctx);
@@ -626,10 +612,10 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
statelessScope, members, "target", Target.class, TargetImpl.class, requestScope);
requestScope.onEvent(new RequestStart(this));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- final Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ final AtomicComponent targetComponent = contexts.get("target");
+ final Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -641,7 +627,7 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -659,7 +645,6 @@
/**
* Tests a stateless-to-session scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testStatelessToSession() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
@@ -672,10 +657,10 @@
Object session1 = new Object();
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session1);
sessionScope.onEvent(new HttpSessionStart(this, session1));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -689,7 +674,7 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
@@ -707,7 +692,6 @@
/**
* Tests a stateless-to-module scoped wire is setup properly by the runtime
*/
- @SuppressWarnings("unchecked")
public void testStatelessToModule() throws Exception {
WorkContext ctx = new WorkContextImpl();
ScopeContainer statelessScope = new StatelessScopeContainer(ctx);
@@ -718,10 +702,10 @@
Map<String, AtomicComponent> contexts = MockFactory.createWiredComponents("source", SourceImpl.class,
statelessScope, members, "target", Target.class, TargetImpl.class, moduleScope);
moduleScope.onEvent(new CompositeStart(this, null));
- AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
- AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getServiceInstance();
- Target target = targetComponent.getServiceInstance();
+ AtomicComponent sourceComponent = contexts.get("source");
+ AtomicComponent targetComponent = contexts.get("target");
+ Source source = (Source) sourceComponent.getServiceInstance();
+ Target target = (Target) targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -733,7 +717,7 @@
ctx.setIdentifier(HttpSessionScopeContainer.HTTP_IDENTIFIER, session2);
moduleScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getServiceInstance();
+ Target target2 = (Target) targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source.getTarget().getString());
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/java/mock/MockFactory.java Sat Sep 9 20:41:09 2006
@@ -74,7 +74,7 @@
* Creates a JavaAtomicComponent which returns the given instance
*/
@SuppressWarnings("unchecked")
- public static <T> JavaAtomicComponent<T> createJavaComponent(T instance) {
+ public static <T> JavaAtomicComponent createJavaComponent(T instance) {
ScopeContainer scope = createMock(ScopeContainer.class);
scope.getScope();
expectLastCall().andReturn(Scope.MODULE);
@@ -94,7 +94,7 @@
}
@SuppressWarnings("unchecked")
- public static <T> JavaAtomicComponent<T> createJavaComponent(String name, ScopeContainer scope, Class<T> clazz)
+ public static <T> JavaAtomicComponent createJavaComponent(String name, ScopeContainer scope, Class<T> clazz)
throws NoSuchMethodException {
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(scope);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilderTestCase.java Sat Sep 9 20:41:09 2006
@@ -149,7 +149,7 @@
target.setReferenceName("ref");
target.addTarget(new URI("foo"));
definition.add(target);
- AtomicComponent<?> component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(parent, definition, deploymentContext);
OutboundWire wire = component.getOutboundWires().get("ref").get(0);
Mock mock = mock(SystemInboundWire.class);
FooImpl targetFoo = new FooImpl();
@@ -188,7 +188,7 @@
AutowireComponent autowireParent = (AutowireComponent) mock.proxy();
FooImpl targetFoo = new FooImpl();
mock.expects(once()).method("resolveInstance").will(returnValue(targetFoo));
- AtomicComponent<?> component = builder.build(autowireParent, definition, deploymentContext);
+ AtomicComponent component = builder.build(autowireParent, definition, deploymentContext);
component.start();
FooImpl foo = (FooImpl) component.getServiceInstance();
assertNotNull(foo.ref);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireResolutionTestCase.java Sat Sep 9 20:41:09 2006
@@ -36,11 +36,11 @@
public class AutowireResolutionTestCase extends TestCase {
public void testConstruction() {
- CompositeComponent<?> parent = createMock(CompositeComponent.class);
- AutowireComponent<?> autowire = createMock(AutowireComponent.class);
+ CompositeComponent parent = createMock(CompositeComponent.class);
+ AutowireComponent autowire = createMock(AutowireComponent.class);
replay(parent);
replay(autowire);
- SystemCompositeComponent<?> component = new SystemCompositeComponentImpl("test", parent, autowire, null, null);
+ SystemCompositeComponent component = new SystemCompositeComponentImpl("test", parent, autowire, null, null);
assertEquals("test", component.getName());
assertSame(parent, component.getParent());
verify(parent);
@@ -48,11 +48,11 @@
}
public void testResolveToSelf() {
- CompositeComponent<?> parent = createMock(CompositeComponent.class);
- AutowireComponent<?> autowire = createMock(AutowireComponent.class);
+ CompositeComponent parent = createMock(CompositeComponent.class);
+ AutowireComponent autowire = createMock(AutowireComponent.class);
replay(parent);
replay(autowire);
- SystemCompositeComponent<?> component = new SystemCompositeComponentImpl("test", parent, autowire, null, null);
+ SystemCompositeComponent component = new SystemCompositeComponentImpl("test", parent, autowire, null, null);
assertSame(component, component.resolveInstance(CompositeComponent.class));
assertSame(component, component.resolveInstance(SystemCompositeComponent.class));
verify(parent);
@@ -62,12 +62,12 @@
public void testResolvedByAutowire() {
Foo foo = new Foo() {
};
- CompositeComponent<?> parent = createMock(CompositeComponent.class);
- AutowireComponent<?> autowire = createMock(AutowireComponent.class);
+ CompositeComponent parent = createMock(CompositeComponent.class);
+ AutowireComponent autowire = createMock(AutowireComponent.class);
EasyMock.expect(autowire.resolveInstance(eq(Foo.class))).andReturn(foo);
replay(parent);
replay(autowire);
- SystemCompositeComponent<?> component = new SystemCompositeComponentImpl("test", parent, autowire, null, null);
+ SystemCompositeComponent component = new SystemCompositeComponentImpl("test", parent, autowire, null, null);
assertSame(foo, component.resolveInstance(Foo.class));
verify(parent);
verify(autowire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/AutowireTestCase.java Sat Sep 9 20:41:09 2006
@@ -37,7 +37,7 @@
* @throws Exception
*/
public void testAtomicAutowire() throws Exception {
- SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl("parent", null, null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -62,7 +62,7 @@
* Tests autowiring to a service context which is wired to an atomic context.
*/
public void testServiceAutowire() throws Exception {
- SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl("parent", null, null, null, null);
parent.start();
List<Class<?>> interfaces = new ArrayList<Class<?>>();
@@ -95,7 +95,7 @@
* Tests autowiring to a reference
*/
public void testReferenceAutowire() throws Exception {
- SystemCompositeComponent<?> parent = new SystemCompositeComponentImpl("parent", null, null, null, null);
+ SystemCompositeComponent parent = new SystemCompositeComponentImpl("parent", null, null, null, null);
parent.start();
Source refSource = new SourceImpl();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/component/SystemObjectRegistrationTestCase.java Sat Sep 9 20:41:09 2006
@@ -30,7 +30,7 @@
* @version $Rev$ $Date$
*/
public class SystemObjectRegistrationTestCase extends TestCase {
- private SystemCompositeComponent<?> systemContext;
+ private SystemCompositeComponent systemContext;
public void testRegistration() throws Exception {
MockComponent instance = new MockComponent();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemOutboundAutowireTestCase.java Sat Sep 9 20:41:09 2006
@@ -15,7 +15,7 @@
public class SystemOutboundAutowireTestCase extends TestCase {
public void testAutowire() {
- AutowireComponent<?> component = createMock(AutowireComponent.class);
+ AutowireComponent component = createMock(AutowireComponent.class);
expect(component.resolveInstance(Object.class)).andReturn(new Object());
replay(component);
SystemOutboundAutowire wire = new SystemOutboundAutowire("foo", Object.class, component, false);
@@ -25,7 +25,7 @@
public void testNonExistentAutowire() {
- AutowireComponent<?> component = createMock(AutowireComponent.class);
+ AutowireComponent component = createMock(AutowireComponent.class);
expect(component.resolveInstance(Object.class)).andReturn(null);
replay(component);
SystemOutboundAutowire wire = new SystemOutboundAutowire("foo", Object.class, component, true);
@@ -40,7 +40,7 @@
public void testNonExistentAutowireNotRequired() {
- AutowireComponent<?> component = createMock(AutowireComponent.class);
+ AutowireComponent component = createMock(AutowireComponent.class);
expect(component.resolveInstance(Object.class)).andReturn(null);
replay(component);
SystemOutboundAutowire wire = new SystemOutboundAutowire("foo", Object.class, component, false);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/wire/SystemServiceComponentWireTestCase.java Sat Sep 9 20:41:09 2006
@@ -39,7 +39,7 @@
SystemOutboundWire outboundWire = (SystemOutboundWire) mockWire.proxy();
SystemInboundWire wire = new SystemInboundWireImpl("Target", Target.class);
- SystemService<Target> serviceContext = new SystemServiceImpl<Target>("service", null);
+ SystemService serviceContext = new SystemServiceImpl("service", null);
serviceContext.setInboundWire(wire);
serviceContext.setOutboundWire(outboundWire);
wire.setTargetWire(outboundWire);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/builder/JavaBuilderPropertyTestCase.java Sat Sep 9 20:41:09 2006
@@ -49,7 +49,7 @@
public class JavaBuilderPropertyTestCase extends MockObjectTestCase {
private DeploymentContext deploymentContext;
- private CompositeComponent<?> parent;
+ private CompositeComponent parent;
private ScopeRegistry registry;
public void testPropertyHandling() throws Exception {
@@ -68,7 +68,7 @@
impl.setComponentType(type);
impl.setImplementationClass(Foo.class);
ComponentDefinition<JavaImplementation> definition = new ComponentDefinition<JavaImplementation>(impl);
- AtomicComponent<?> component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(parent, definition, deploymentContext);
JavaBuilderPropertyTestCase.Foo foo = (JavaBuilderPropertyTestCase.Foo) component.createInstance();
assertEquals("foo", foo.getTest());
}
@@ -77,7 +77,7 @@
super.setUp();
deploymentContext = new RootDeploymentContext(null, null, null, null);
Mock mock = mock(AutowireComponent.class);
- parent = (CompositeComponent<?>) mock.proxy();
+ parent = (CompositeComponent) mock.proxy();
registry = new ScopeRegistryImpl(new WorkContextImpl());
new StatelessScopeObjectFactory(registry);
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/SystemBuilderPropertyTestCase.java Sat Sep 9 20:41:09 2006
@@ -46,7 +46,7 @@
public class SystemBuilderPropertyTestCase extends MockObjectTestCase {
DeploymentContext deploymentContext;
- CompositeComponent<?> parent;
+ CompositeComponent parent;
@SuppressWarnings("unchecked")
public void testPropertyHandling() throws Exception {
@@ -63,7 +63,7 @@
impl.setComponentType(type);
impl.setImplementationClass(Foo.class);
ComponentDefinition<SystemImplementation> definition = new ComponentDefinition<SystemImplementation>(impl);
- AtomicComponent<?> component = builder.build(parent, definition, deploymentContext);
+ AtomicComponent component = builder.build(parent, definition, deploymentContext);
Foo foo = (Foo) component.createInstance();
assertEquals("foo", foo.getTest());
}
@@ -72,7 +72,7 @@
super.setUp();
deploymentContext = new RootDeploymentContext(null, null, null, null);
Mock mock = mock(AutowireComponent.class);
- parent = (CompositeComponent<?>) mock.proxy();
+ parent = (CompositeComponent) mock.proxy();
}
private static class Foo {
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=441893&r1=441892&r2=441893
==============================================================================
--- 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 Sat Sep 9 20:41:09 2006
@@ -71,8 +71,8 @@
ComponentDefinition<SystemImplementation> sourceComponentDefinition =
MockComponentFactory.createSourceWithTargetReference();
- AtomicComponent<?> sourceComponent = builder.build(parent, sourceComponentDefinition, deploymentContext);
- AtomicComponent<?> targetComponent = builder.build(parent, targetComponentDefinition, deploymentContext);
+ AtomicComponent sourceComponent = builder.build(parent, sourceComponentDefinition, deploymentContext);
+ AtomicComponent targetComponent = builder.build(parent, targetComponentDefinition, deploymentContext);
parent.register(sourceComponent);
parent.register(targetComponent);
@@ -114,7 +114,7 @@
ComponentDefinition<SystemImplementation> sourceComponentDefinition =
MockComponentFactory.createSourceWithTargetReference();
- AtomicComponent<?> sourceComponent = builder.build(parent, sourceComponentDefinition, deploymentContext);
+ AtomicComponent sourceComponent = builder.build(parent, sourceComponentDefinition, deploymentContext);
Reference reference = bindingBuilder.build(parent, targetReferenceDefinition, deploymentContext);
parent.register(sourceComponent);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/bootstrap/RuntimeComponent.java Sat Sep 9 20:41:09 2006
@@ -26,7 +26,7 @@
*
* @version $Rev$ $Date$
*/
-public interface RuntimeComponent<S extends CompositeComponent> extends CompositeComponent<Void> {
+public interface RuntimeComponent<S extends CompositeComponent> extends CompositeComponent {
/**
* Returns the component that forms the root of the user component tree. All user components will be managed by
* composites that are children of this root.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java Sat Sep 9 20:41:09 2006
@@ -34,11 +34,11 @@
* @version $Rev$ $Date$
*/
public interface BindingBuilder<B extends Binding> {
- Service<?> build(CompositeComponent parent,
+ Service build(CompositeComponent parent,
BoundServiceDefinition<B> boundServiceDefinition,
DeploymentContext deploymentContext);
- Reference<?> build(CompositeComponent parent,
+ Reference build(CompositeComponent parent,
BoundReferenceDefinition<B> boundReferenceDefinition,
DeploymentContext deploymentContext);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java Sat Sep 9 20:41:09 2006
@@ -34,11 +34,11 @@
*/
public interface BindlessBuilder {
- Service<?> build(CompositeComponent parent,
+ Service build(CompositeComponent parent,
BindlessServiceDefinition serviceDefinition,
DeploymentContext deploymentContext);
- Reference<?> build(CompositeComponent parent,
+ Reference build(CompositeComponent parent,
ReferenceDefinition referenceDefinition,
DeploymentContext deploymentContext);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Builder.java Sat Sep 9 20:41:09 2006
@@ -44,7 +44,7 @@
* @param deploymentContext the current deployment context
* @return a newly created component
*/
- <I extends Implementation<?>> Component<?> build(CompositeComponent<?> parent,
+ <I extends Implementation<?>> Component build(CompositeComponent parent,
ComponentDefinition<I> componentDefinition,
DeploymentContext deploymentContext);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/ComponentBuilder.java Sat Sep 9 20:41:09 2006
@@ -30,7 +30,7 @@
* @version $Rev$ $Date$
*/
public interface ComponentBuilder<I extends Implementation<?>> {
- Component<?> build(CompositeComponent<?> parent,
+ Component build(CompositeComponent parent,
ComponentDefinition<I> componentDefinition,
DeploymentContext deploymentContext) throws BuilderConfigException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/Connector.java Sat Sep 9 20:41:09 2006
@@ -35,7 +35,7 @@
* @param source the source artifact to context, i.e. a <code>Service</code>, <code>Component</code>, or
* <code>Reference</code>
*/
- void connect(SCAObject<?> source);
+ void connect(SCAObject source);
/**
* Bridges the invocation chains associated with an inbound and outbound wire.
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java Sat Sep 9 20:41:09 2006
@@ -34,14 +34,14 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AbstractSCAObject<T> extends AbstractLifecycle implements SCAObject<T> {
+public abstract class AbstractSCAObject extends AbstractLifecycle implements SCAObject {
protected static final EventFilter TRUE_FILTER = new TrueFilter();
protected Map<EventFilter, List<RuntimeEventListener>> listeners;
private final String name;
private final CompositeComponent parent;
- public AbstractSCAObject(String name, CompositeComponent<?> parent) {
+ public AbstractSCAObject(String name, CompositeComponent parent) {
this.name = name;
this.parent = parent;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AtomicComponent.java Sat Sep 9 20:41:09 2006
@@ -25,7 +25,7 @@
*
* @version $Rev$ $Date$
*/
-public interface AtomicComponent<T> extends Component<T> {
+public interface AtomicComponent extends Component {
/**
* Returns whether component instances should be eagerly initialized
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Sat Sep 9 20:41:09 2006
@@ -31,7 +31,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public interface Component<T> extends SCAObject<T> {
+public interface Component extends SCAObject {
/**
* Returns a service associated with the given name
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/CompositeComponent.java Sat Sep 9 20:41:09 2006
@@ -30,14 +30,14 @@
*
* @version $Rev$ $Date$
*/
-public interface CompositeComponent<T> extends Component<T>, RuntimeEventListener {
+public interface CompositeComponent extends Component, RuntimeEventListener {
/**
* Registers a child of this composite.
*
* @param context the context to add as a child
* @throws InvalidComponentTypeException
*/
- void register(SCAObject<?> context) throws InvalidComponentTypeException;
+ void register(SCAObject context) throws InvalidComponentTypeException;
/**
* Returns the child associated with a given name
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Reference.java Sat Sep 9 20:41:09 2006
@@ -30,12 +30,12 @@
*
* @version $Rev$ $Date$
*/
-public interface Reference<T> extends SCAObject<T> {
+public interface Reference extends SCAObject {
/**
* Returns the service interface configured for the reference
*/
- Class<T> getInterface();
+ Class<?> getInterface();
/**
* Returns the handler responsible for flowing a request through the reference
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java Sat Sep 9 20:41:09 2006
@@ -27,7 +27,7 @@
*
* @version $Rev$ $Date$
*/
-public interface SCAObject<T> extends EventPublisher, Lifecycle {
+public interface SCAObject extends EventPublisher, Lifecycle {
/**
* Returns the artifact name
@@ -49,7 +49,7 @@
*
* @throws TargetException if an error occurs retrieving the instance
*/
- T getServiceInstance() throws TargetException;
+ Object getServiceInstance() throws TargetException;
/**
* Called to signal that the composite should perform and required steps prior to registration with its parent such
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Service.java Sat Sep 9 20:41:09 2006
@@ -30,7 +30,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Service<T> extends SCAObject<T> {
+public interface Service extends SCAObject {
/**
* Returns the handler responsible for flowing a request through the service
@@ -42,7 +42,7 @@
/**
* Returns the service interface configured for the service
*/
- Class<T> getInterface();
+ Class<?> getInterface();
/**
* Returns the inbound wire for flowing a request through the service
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/Deployer.java Sat Sep 9 20:41:09 2006
@@ -40,7 +40,7 @@
* @param componentDefinition the component definition as parsed from an assembly
* @return the newly deployed component
*/
- <I extends Implementation<?>> Component<?> deploy(CompositeComponent<?> parent,
+ <I extends Implementation<?>> Component deploy(CompositeComponent parent,
ComponentDefinition<I> componentDefinition)
throws LoaderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/event/EventPublisher.java Sat Sep 9 20:41:09 2006
@@ -25,6 +25,9 @@
*/
public interface EventPublisher {
+ /**
+ * Publish an event
+ */
void publish(Event object);
/**
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Sat Sep 9 20:41:09 2006
@@ -44,7 +44,7 @@
*
* @version $$Rev$$ $$Date$$
*/
-public abstract class AtomicComponentExtension<T> extends AbstractSCAObject<T> implements AtomicComponent<T> {
+public abstract class AtomicComponentExtension extends AbstractSCAObject implements AtomicComponent {
protected ScopeContainer scopeContainer;
protected Scope scope;
@@ -56,7 +56,7 @@
private final int initLevel;
protected AtomicComponentExtension(String name,
- CompositeComponent<?> parent,
+ CompositeComponent parent,
ScopeContainer scopeContainer,
WireService wireService,
WorkContext workContext,
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java Sat Sep 9 20:41:09 2006
@@ -60,13 +60,13 @@
builderRegistry.register(getBindingType(), this);
}
- public Service<?> build(CompositeComponent parent,
+ public Service build(CompositeComponent parent,
BoundServiceDefinition<B> boundServiceDefinition,
DeploymentContext deploymentContext) {
return null;
}
- public Reference<?> build(CompositeComponent parent,
+ public Reference build(CompositeComponent parent,
BoundReferenceDefinition<B> boundReferenceDefinition,
DeploymentContext deploymentContext) {
return null;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Sat Sep 9 20:41:09 2006
@@ -51,16 +51,16 @@
*
* @version $$Rev$$ $$Date$$
*/
-public abstract class CompositeComponentExtension<T> extends AbstractSCAObject<T> implements CompositeComponent<T> {
+public abstract class CompositeComponentExtension extends AbstractSCAObject implements CompositeComponent {
- protected final Map<String, SCAObject<?>> children = new ConcurrentHashMap<String, SCAObject<?>>();
+ protected final Map<String, SCAObject> children = new ConcurrentHashMap<String, SCAObject>();
protected final List<Service> services = new ArrayList<Service>();
protected final List<Reference> references = new ArrayList<Reference>();
protected final Map<String, Document> propertyValues;
protected final Connector connector;
protected CompositeComponentExtension(String name,
- CompositeComponent<?> parent,
+ CompositeComponent parent,
Connector connector,
Map<String, Document> propertyValues) {
super(name, parent);
@@ -76,7 +76,7 @@
publish(event);
}
- public void register(SCAObject<?> child) {
+ public void register(SCAObject child) {
assert child != null : "child was null";
if (children.get(child.getName()) != null) {
DuplicateNameException e = new DuplicateNameException("A context is already registered with name");
@@ -144,7 +144,7 @@
return Collections.unmodifiableList(references);
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
//TODO implement
return null;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java Sat Sep 9 20:41:09 2006
@@ -36,16 +36,16 @@
*
* @version $Rev$ $Date$
*/
-public abstract class ReferenceExtension<T> extends AbstractSCAObject<T> implements Reference<T> {
+public abstract class ReferenceExtension extends AbstractSCAObject implements Reference {
protected InboundWire inboundWire;
protected OutboundWire outboundWire;
- protected Class<T> referenceInterface;
+ protected Class<?> referenceInterface;
protected WireService wireService;
protected ReferenceExtension(String name,
- Class<T> referenceInterface,
- CompositeComponent<?> parent,
+ Class<?> referenceInterface,
+ CompositeComponent parent,
WireService wireService) {
super(name, parent);
this.referenceInterface = referenceInterface;
@@ -72,12 +72,12 @@
this.outboundWire = outboundWire;
}
- public Class<T> getInterface() {
+ public Class<?> getInterface() {
return referenceInterface;
}
- public T getServiceInstance() throws TargetException {
- return (T) wireService.createProxy(inboundWire);
+ public Object getServiceInstance() throws TargetException {
+ return wireService.createProxy(inboundWire);
}
public WireInvocationHandler getHandler() throws TargetException {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java Sat Sep 9 20:41:09 2006
@@ -37,14 +37,14 @@
*
* @version $Rev$ $Date$
*/
-public class ServiceExtension<T> extends AbstractSCAObject<T> implements Service<T> {
+public class ServiceExtension extends AbstractSCAObject implements Service {
- protected Class<T> interfaze;
+ protected Class<?> interfaze;
protected InboundWire inboundWire;
protected OutboundWire outboundWire;
protected WireService wireService;
- public ServiceExtension(String name, Class<T> interfaze, CompositeComponent parent, WireService wireService)
+ public ServiceExtension(String name, Class<?> interfaze, CompositeComponent parent, WireService wireService)
throws CoreRuntimeException {
super(name, parent);
this.interfaze = interfaze;
@@ -75,15 +75,15 @@
throw new UnsupportedOperationException();
}
- public T getServiceInstance() throws TargetException {
- return (T) wireService.createProxy(inboundWire);
+ public Object getServiceInstance() throws TargetException {
+ return wireService.createProxy(inboundWire);
}
public WireInvocationHandler getHandler() {
return wireService.createHandler(inboundWire);
}
- public Class<T> getInterface() {
+ public Class<?> getInterface() {
return interfaze;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessor.java Sat Sep 9 20:41:09 2006
@@ -46,7 +46,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitClass(CompositeComponent<?> parent,
+ void visitClass(CompositeComponent parent,
Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -60,7 +60,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitSuperClass(CompositeComponent<?> parent,
+ void visitSuperClass(CompositeComponent parent,
Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -74,7 +74,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitMethod(CompositeComponent<?> parent,
+ void visitMethod(CompositeComponent parent,
Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -90,7 +90,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitConstructor(CompositeComponent<?> parent,
+ void visitConstructor(CompositeComponent parent,
Constructor<?> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
@@ -105,7 +105,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitField(CompositeComponent<?> parent,
+ void visitField(CompositeComponent parent,
Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
@@ -120,7 +120,7 @@
* @param context the current deployment context
* @throws ProcessingException if an error is encountered while processing metadata
*/
- void visitEnd(CompositeComponent<?> parent,
+ void visitEnd(CompositeComponent parent,
Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/ImplementationProcessorExtension.java Sat Sep 9 20:41:09 2006
@@ -52,36 +52,36 @@
registry.unregisterProcessor(this);
}
- public void visitClass(CompositeComponent<?> parent, Class<?> clazz,
+ public void visitClass(CompositeComponent parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitSuperClass(CompositeComponent<?> parent, Class<?> clazz,
+ public void visitSuperClass(CompositeComponent parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitMethod(CompositeComponent<?> parent, Method method,
+ public void visitMethod(CompositeComponent parent, Method method,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitConstructor(CompositeComponent<?> parent, Constructor<?> constructor,
+ public void visitConstructor(CompositeComponent parent, Constructor<?> constructor,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
}
- public void visitField(CompositeComponent<?> parent, Field field,
+ public void visitField(CompositeComponent parent, Field field,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
}
- public void visitEnd(CompositeComponent<?> parent, Class<?> clazz,
+ public void visitEnd(CompositeComponent parent, Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/implementation/java/Introspector.java Sat Sep 9 20:41:09 2006
@@ -38,7 +38,7 @@
* @return the updated component type
* @throws ProcessingException if an error is encountered evaluating the implementation class
*/
- PojoComponentType introspect(CompositeComponent<?> parent,
+ PojoComponentType introspect(CompositeComponent parent,
Class<?> clazz,
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/ComponentTypeLoader.java Sat Sep 9 20:41:09 2006
@@ -40,6 +40,6 @@
* @param deploymentContext the current deployment context
* @throws LoaderException if there was a problem loading the configuration type
*/
- void load(CompositeComponent<?> parent, I implementation, DeploymentContext deploymentContext)
+ void load(CompositeComponent parent, I implementation, DeploymentContext deploymentContext)
throws LoaderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/loader/Loader.java Sat Sep 9 20:41:09 2006
@@ -75,7 +75,7 @@
* @param deploymentContext the current deployment context
* @throws LoaderException if there was a problem loading the component type definition
*/
- <I extends Implementation<?>> void loadComponentType(CompositeComponent<?> parent, I implementation,
+ <I extends Implementation<?>> void loadComponentType(CompositeComponent parent, I implementation,
DeploymentContext deploymentContext)
throws LoaderException;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java Sat Sep 9 20:41:09 2006
@@ -119,7 +119,7 @@
* @param reference the reference
* @param contract the model artifact representing the service contract for the reference
*/
- <T> void createWires(Reference<T> reference, ServiceContract<?> contract);
+ <T> void createWires(Reference reference, ServiceContract<?> contract);
/**
* Creates wires for a service and injects them on the service
@@ -127,7 +127,7 @@
* @param service the service
* @param def the model artifact representing the service
*/
- void createWires(Service<?> service, BoundServiceDefinition<?> def);
+ void createWires(Service service, BoundServiceDefinition<?> def);
/**
* Creates wires for a composite service and injects them on the service
@@ -135,7 +135,7 @@
* @param service the service
* @param def the model artifact representing the service
*/
- void createWires(Service<?> service, BindlessServiceDefinition def);
+ void createWires(Service service, BindlessServiceDefinition def);
/**
* Check the compatiblity of the source and the target service contracts.<p>
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/component/AbstractSCAObjectTestCase.java Sat Sep 9 20:41:09 2006
@@ -90,7 +90,7 @@
}
- private class TestSCAObject<T> extends AbstractSCAObject<T> {
+ private class TestSCAObject extends AbstractSCAObject {
public TestSCAObject(String name, CompositeComponent parent) {
super(name, parent);
}
@@ -99,7 +99,7 @@
return null;
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return null;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java?view=diff&rev=441893&r1=441892&r2=441893
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/extension/AtomicComponentExtensionTestCase.java Sat Sep 9 20:41:09 2006
@@ -57,12 +57,12 @@
ext.getInboundWire(null);
}
- private class TestExtension<T> extends AtomicComponentExtension<T> {
+ private class TestExtension extends AtomicComponentExtension {
public TestExtension() {
super(null, null, null, null, null, null, 0);
}
- public T getServiceInstance() throws TargetException {
+ public Object getServiceInstance() throws TargetException {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org