You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/07/10 00:51:50 UTC
svn commit: r675373 [1/2] - in /tuscany/branches/sca-java-1.3:
itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/
itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/
itest/late-reference-resol...
Author: rfeng
Date: Wed Jul 9 15:51:48 2008
New Revision: 675373
URL: http://svn.apache.org/viewvc?rev=675373&view=rev
Log:
Merge fix for TUSCANY-2409 from trunk
Added:
tuscany/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
- copied unchanged from r675358, tuscany/java/sca/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
Modified:
tuscany/branches/sca-java-1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
tuscany/branches/sca-java-1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
tuscany/branches/sca-java-1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
tuscany/branches/sca-java-1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
tuscany/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
tuscany/branches/sca-java-1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
tuscany/branches/sca-java-1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/branches/sca-java-1.3/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
tuscany/branches/sca-java-1.3/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
tuscany/branches/sca-java-1.3/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
tuscany/branches/sca-java-1.3/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
tuscany/branches/sca-java-1.3/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
tuscany/branches/sca-java-1.3/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
tuscany/branches/sca-java-1.3/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
tuscany/branches/sca-java-1.3/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
Modified: tuscany/branches/sca-java-1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java Wed Jul 9 15:51:48 2008
@@ -26,9 +26,9 @@
import junit.framework.Assert;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java Wed Jul 9 15:51:48 2008
@@ -25,9 +25,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java Wed Jul 9 15:51:48 2008
@@ -30,9 +30,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java Wed Jul 9 15:51:48 2008
@@ -31,9 +31,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java Wed Jul 9 15:51:48 2008
@@ -30,9 +30,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java Wed Jul 9 15:51:48 2008
@@ -30,9 +30,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: tuscany/branches/sca-java-1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java Wed Jul 9 15:51:48 2008
@@ -24,9 +24,9 @@
import junit.framework.Assert;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: tuscany/branches/sca-java-1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java Wed Jul 9 15:51:48 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.itest.oneway;
-import java.io.File;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Handler;
import java.util.logging.Level;
@@ -34,11 +33,8 @@
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -64,11 +60,7 @@
public void setUp() throws Exception {
SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/OneWayContribution").toURL().toString()));
-
-
+ node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);
node.start();
}
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
Binary files - no diff available.
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
Binary files - no diff available.
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java Wed Jul 9 15:51:48 2008
@@ -28,9 +28,9 @@
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java Wed Jul 9 15:51:48 2008
@@ -28,9 +28,9 @@
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java Wed Jul 9 15:51:48 2008
@@ -28,9 +28,9 @@
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java Wed Jul 9 15:51:48 2008
@@ -24,9 +24,9 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
/**
* This shows how to test the Calculator service component.
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java Wed Jul 9 15:51:48 2008
@@ -29,9 +29,9 @@
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java Wed Jul 9 15:51:48 2008
@@ -28,9 +28,9 @@
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
Modified: tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java (original)
+++ tuscany/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java Wed Jul 9 15:51:48 2008
@@ -23,9 +23,9 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
/**
* This shows how to test the Calculator service component.
Modified: tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java (original)
+++ tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java Wed Jul 9 15:51:48 2008
@@ -20,9 +20,9 @@
package org.apache.tuscany.sca.implementation.node.launcher;
import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.osoa.sca.CallableReference;
import org.osoa.sca.ServiceReference;
@@ -91,7 +91,7 @@
*/
public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception {
SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = new NodeFacade(nodeFactory.createSCANode(configurationURI));
+ node = new NodeFacade(nodeFactory.createSCANodeFromURL(configurationURI));
}
/**
Modified: tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java (original)
+++ tuscany/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java Wed Jul 9 15:51:48 2008
@@ -113,7 +113,7 @@
// Create the SCA node
SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(nodeConfiguration);
+ node = nodeFactory.createSCANodeFromURL(nodeConfiguration);
// Register the Servlet host
ServletHostExtensionPoint servletHosts = servletHosts(node);
Modified: tuscany/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java (original)
+++ tuscany/branches/sca-java-1.3/modules/node2-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java Wed Jul 9 15:51:48 2008
@@ -66,18 +66,38 @@
}
/**
- * Creates a new SCA node.
+ * Create a SCA node based on the discovery of the contribution on the classpath for the
+ * given classloader. This method should be treated a convinient shortcut with the following
+ * assumptions:
+ * <ul>
+ * <li>This is a standalone application and there is a deployable composite file on the classpath.
+ * <li>There is only one contribution which contains the deployable composite file physically in its packaging hierarchy.
+ * </ul>
+ * @param compositeURI The URI of the composite file relative to the root of the enclosing contribution
+ * @param classLoader The ClassLoader used to load the composite file as a resource. If the value is null,
+ * then thread context classloader will be used
+ * @return A newly created SCA node
+ */
+ public abstract SCANode2 createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader);
+
+ /**
+ * Creates a new SCA node from the configuration URL
*
- * @param configurationURI the URI of the node configuration
+ * @param configurationURL the URL of the node configuration which is the ATOM feed
+ * that contains the URI of the composite and a collection of URLs for the contributions
+ *
* @return a new SCA node.
*/
- public abstract SCANode2 createSCANode(String configurationURI);
+ public abstract SCANode2 createSCANodeFromURL(String configurationURL);
/**
* Creates a new SCA node.
*
* @param compositeURI the URI of the composite to use
- * @param contributions the URI of the contributions that provides the composites and related artifacts
+ * @param contributions the URI of the contributions that provides the composites and related
+ * artifacts. If the list is empty, then we will use the thread context classloader to discover
+ * the contribution on the classpath
+ *
* @return a new SCA node.
*/
public abstract SCANode2 createSCANode(String compositeURI, SCAContribution... contributions);
@@ -91,32 +111,5 @@
* @return a new SCA node.
*/
public abstract SCANode2 createSCANode(String compositeURI, String compositeContent, SCAContribution... contributions);
-
- /**
- * Represents an SCA contribution uri + location.
- */
- public static final class SCAContribution {
- private String uri;
- private String location;
-
- /**
- * Constructs a new SCA contribution.
- *
- * @param uri
- * @param location
- */
- public SCAContribution(String uri, String location) {
- this.uri = uri;
- this.location = location;
- }
-
- public String getURI() {
- return uri;
- }
-
- public String getLocation() {
- return location;
- }
- }
}
Modified: tuscany/branches/sca-java-1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=675373&r1=675372&r2=675373&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (original)
+++ tuscany/branches/sca-java-1.3/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java Wed Jul 9 15:51:48 2008
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.node.impl;
+import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode2;
import org.apache.tuscany.sca.node.SCANode2Factory;
@@ -28,12 +29,16 @@
* @version $Rev$ $Date$
*/
public class NodeFactoryImpl extends SCANode2Factory {
-
public NodeFactoryImpl() {
}
+
+ @Override
+ public SCANode2 createSCANodeFromClassLoader(String compositeURI, ClassLoader classLoader) {
+ return new NodeImpl(classLoader, compositeURI);
+ }
@Override
- public SCANode2 createSCANode(String configurationURI) {
+ public SCANode2 createSCANodeFromURL(String configurationURI) {
return new NodeImpl(configurationURI);
}