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 2007/10/24 06:31:01 UTC
svn commit: r587778 [12/13] - in /incubator/tuscany/branches/sca-java-1.0.1:
./ distribution/ distribution/bundle/ distribution/manifest/
distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/
distribution/webapp/src/main/resources/_node/ dis...
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java Tue Oct 23 21:30:02 2007
@@ -18,9 +18,7 @@
*/
package org.apache.tuscany.sca.policy.security.ws;
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
import org.apache.axiom.om.OMElement;
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java Tue Oct 23 21:30:02 2007
@@ -106,7 +106,7 @@
while (true) {
switch (reader.next()) {
case XMLStreamConstants.START_ELEMENT:
- //since the axis2 code checks against a no namespace we need to generate accordingly
+ //since the axis2 code checks against a no namespace we need to generate accordingly
QName name = new QName(reader.getName().getLocalPart());
OMElement child = fac.createOMElement(name, current);
@@ -129,9 +129,11 @@
String qname = reader.getAttributeLocalName(i);
String value = reader.getAttributeValue(i);
- child.addAttribute(qname, value, fac.createOMNamespace(ns, prefix));
if (ns != null) {
+ child.addAttribute(qname, value, fac.createOMNamespace(ns, prefix));
child.declareNamespace(ns, prefix);
+ } else {
+ child.addAttribute(qname, value, null);
}
}
current = child;
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Tue Oct 23 21:30:02 2007
@@ -37,7 +37,9 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.neethi.PolicyEngine;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
@@ -58,7 +60,10 @@
private PolicyFactory policyFactory;
private StAXArtifactProcessor<Object> extensionProcessor;
-
+ public PolicySetProcessor(ModelFactoryExtensionPoint modelFactories) {
+ this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
+ }
+
public PolicySetProcessor(PolicyFactory policyFactory, StAXArtifactProcessor<Object> extensionProcessor) {
this.policyFactory = policyFactory;
this.extensionProcessor = extensionProcessor;
@@ -284,6 +289,7 @@
OMFactory fac = OMAbstractFactory.getOMFactory();
OMElement head = fac.createOMElement(reader.getName());
OMElement current = head;
+
while (true) {
switch (reader.next()) {
case XMLStreamConstants.START_ELEMENT:
@@ -304,12 +310,17 @@
// add the attributes for this element
count = reader.getAttributeCount();
for (int i = 0; i < count; i++) {
+ OMNamespace omNs = null;
String ns = reader.getAttributeNamespace(i);
String prefix = reader.getAttributePrefix(i);
String qname = reader.getAttributeLocalName(i);
String value = reader.getAttributeValue(i);
- child.addAttribute(qname, value, fac.createOMNamespace(ns, prefix));
+ if ( ns != null ) {
+ omNs = fac.createOMNamespace(ns, prefix);
+ }
+
+ child.addAttribute(qname, value, omNs);
if (ns != null) {
child.declareNamespace(ns, prefix);
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java Tue Oct 23 21:30:02 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.policy.xml;
+import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.QualifiedIntent;
@@ -29,6 +30,10 @@
public class QualifiedIntentProcessor extends PolicyIntentProcessor<QualifiedIntent> {
+ public QualifiedIntentProcessor(ModelFactoryExtensionPoint modelFactories) {
+ super(modelFactories.getFactory(PolicyFactory.class), null);
+ }
+
public QualifiedIntentProcessor(PolicyFactory policyFactory, StAXArtifactProcessor<Object> extensionProcessor) {
super(policyFactory, extensionProcessor);
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Tue Oct 23 21:30:02 2007
@@ -16,7 +16,7 @@
# under the License.
# Implementation class for the artifact processor extension
+#org.apache.tuscany.sca.policy.xml.SimpleIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.Intent
#org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#policySet,model=org.apache.tuscany.sca.policy.PolicySet
-#org.apache.tuscany.sca.policy.xml.PolicyIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.Intent
#org.apache.tuscany.sca.policy.xml.ProfileIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.ProfileIntent
#org.apache.tuscany.sca.policy.xml.QualifiedIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.QualifiedIntent
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java Tue Oct 23 21:30:02 2007
@@ -20,8 +20,6 @@
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
-import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
/**
* Default implementation for IntentAttachPointTypeFactory
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/pom.xml Tue Oct 23 21:30:02 2007
@@ -44,6 +44,9 @@
<module>binding-ejb</module>
<module>binding-feed</module>
<module>binding-http</module>
+ <!--
+ <module>binding-jms</module>
+ -->
<module>binding-jsonrpc</module>
<module>binding-notification</module>
<module>binding-rmi</module>
@@ -74,16 +77,14 @@
<module>databinding-saxon</module>
<module>databinding-xmlbeans</module>
<!--
- <module>discovery-jms</module>
+ <module>databinding-fastinfoset</module>
+ <module>data-engine-helper</module>
-->
<module>domain</module>
<module>domain-api</module>
<module>domain-impl</module>
<module>extension-helper</module>
<module>host-embedded</module>
- <!--
- <module>host-home</module>
- -->
<module>host-http</module>
<module>host-rmi</module>
<module>host-webapp</module>
@@ -95,6 +96,10 @@
<module>interface-wsdl</module>
<module>interface-wsdl-xml</module>
<module>implementation-bpel</module>
+ <!--
+ <module>implementation-das</module>
+ <module>implementation-data</module>
+ -->
<module>implementation-java</module>
<module>implementation-java-xml</module>
<module>implementation-java-runtime</module>
@@ -104,26 +109,26 @@
<module>implementation-notification</module>
<module>implementation-osgi</module>
<module>osgi-runtime</module>
-
<module>implementation-resource</module>
<module>implementation-script</module>
<module>implementation-spring</module>
<module>implementation-xquery</module>
<module>java2wsdl</module>
- <!--
- <module>jmx</module>
- -->
<module>maven-java2wsdl</module>
<module>maven-wsdl2java</module>
+ <!--
+ <module>maven-ant-generator</module>
+ -->
<module>node</module>
+ <module>node-api</module>
<module>node-impl</module>
<module>policy</module>
<module>policy-xml</module>
+ <module>policy-logging</module>
<module>policy-security</module>
<module>sca-api</module>
<module>definitions</module>
- <module>topology</module>
- <module>topology-xml</module>
+ <module>definitions-xml</module>
<module>wsdl2java</module>
</modules>
</profile>
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/sca-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/sca-api/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/sca-api/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/sca-api/pom.xml Tue Oct 23 21:30:02 2007
@@ -29,31 +29,4 @@
<artifactId>tuscany-sca-api</artifactId>
<name>Apache Tuscany SCA API</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- <quiet>true</quiet>
- <bottom>Apache Tuscany is an effort undergoing incubation at the Apache Software Foundation(ASF) and sponsored by the Apache WS PMC.</bottom>
- <header>Apache Tuscany OSOA SCA API</header>
- <footer>Apache Tuscany OSOA SCA API</footer>
- <sourcepath>${basedir}/src/main/java</sourcepath>
- <subpackages>org.osoa.sca</subpackages>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/wsdl2java/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/wsdl2java/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/wsdl2java/pom.xml Tue Oct 23 21:30:02 2007
@@ -48,6 +48,26 @@
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.4</version>
+ <scope>runtime</scope>
+ <!-- Replacing stax 1.0 with stax 1.0.1 -->
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
@@ -112,6 +132,12 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-1.0.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/pom.xml Tue Oct 23 21:30:02 2007
@@ -23,6 +23,7 @@
<groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
<version>2-incubating</version>
+ <relativePath>../pom/parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
@@ -85,6 +86,7 @@
<module>samples</module>
<module>itest</module>
<module>demos</module>
+ <module>tutorial</module>
<module>distribution</module>
</modules>
</profile>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/build.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/build.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/build.xml Tue Oct 23 21:30:02 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="calculator" default="runDomainNode">
+<project name="calculator" default="runDomain">
<property name="node.class" value="node.CalculatorNode" />
<property name="domain.class" value="node.DomainNode" />
<property name="test.jar" value="sample-calculator-distributed.jar" />
@@ -45,7 +45,7 @@
</jar>
</target>
- <target name="runDomainNode">
+ <target name="runDomain">
<java classname="${domain.class}"
fork="true">
<classpath>
@@ -108,194 +108,117 @@
<!-- If you want to test without building the distribution jars set the -->
<!-- localtion value of the m2.repo on your machine and use the targets below -->
<property name="m2.repo" value="${user.home}\.m2\repository" />
- <path id="repo.classpath">
- <pathelement location="target/classes"/>
- <pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
- <pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
- <pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0.1-incubating-SNAPSHOT\tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
- <pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
- <pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0.1-incubating-SNAPSHOT\tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0.1-incubating-SNAPSHOT\tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.0.1-incubating-SNAPSHOT\tuscany-domain-api-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.0.1-incubating-SNAPSHOT\tuscany-extension-helper-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.0.1-incubating-SNAPSHOT\tuscany-binding-jsonrpc-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\bouncycastle\bcprov-jdk15\136\bcprov-jdk15-136.jar"/>
- <pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
- <pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.0.1-incubating-SNAPSHOT\tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.0.1-incubating-SNAPSHOT\tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0.1-incubating-SNAPSHOT\tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0.1-incubating-SNAPSHOT\tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-impl\1.0.1-incubating-SNAPSHOT\tuscany-domain-impl-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.0.1-incubating-SNAPSHOT\tuscany-policy-security-1.0.1-incubating-SNAPSHOT.jar"/>
+ <path id="repo.classpath">
+ <pathelement location=".\target\classes"/>
<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.0.1-incubating-SNAPSHOT\tuscany-core-spi-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
- <pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.0.1-incubating-SNAPSHOT\tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
- <pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0.1-incubating-SNAPSHOT\tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0.1-incubating-SNAPSHOT\tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0.1-incubating-SNAPSHOT\tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.0.1-incubating-SNAPSHOT\tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0.1-incubating-SNAPSHOT\tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-impl\1.0.1-incubating-SNAPSHOT\tuscany-node-impl-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
- <pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0.1-incubating-SNAPSHOT\tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
- <pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
- <pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
- <pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0.1-incubating-SNAPSHOT\tuscany-host-http-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0.1-incubating-SNAPSHOT\tuscany-databinding-axiom-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0.1-incubating-SNAPSHOT\tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0.1-incubating-SNAPSHOT\tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-resource\1.0.1-incubating-SNAPSHOT\tuscany-implementation-resource-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xsd-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0.1-incubating-SNAPSHOT\tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0.1-incubating-SNAPSHOT\tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.0.1-incubating-SNAPSHOT\tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0.1-incubating-SNAPSHOT\tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.0.1-incubating-SNAPSHOT\tuscany-extension-helper-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-api\1.0.1-incubating-SNAPSHOT\tuscany-node-api-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\ant\ant-nodeps\1.7.0\ant-nodeps-1.7.0.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.0.1-incubating-SNAPSHOT\tuscany-host-tomcat-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.0.1-incubating-SNAPSHOT\tuscany-binding-http-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\opensaml\opensaml\1.1\opensaml-1.1.jar"/>
<pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
- <pathelement location="${m2.repo}\bouncycastle\bcprov-jdk15\136\bcprov-jdk15-136.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xsd-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-xmlbeans\1.3\axis2-xmlbeans-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.0.1-incubating-SNAPSHOT\tuscany-policy-security-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.0.1-incubating-SNAPSHOT\tuscany-binding-http-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.0.1-incubating-SNAPSHOT\tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0.1-incubating-SNAPSHOT\tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-impl\1.0.1-incubating-SNAPSHOT\tuscany-domain-impl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0.1-incubating-SNAPSHOT\tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\1.0.1-incubating-SNAPSHOT\tuscany-policy-security-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\1.0.1-incubating-SNAPSHOT\tuscany-domain-api-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\tomcat\catalina\6.0.10\catalina-6.0.10.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.0.1-incubating-SNAPSHOT\tuscany-core-spi-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
<pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.0.1-incubating-SNAPSHOT\tuscany-binding-jsonrpc-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0.1-incubating-SNAPSHOT\tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-resource\1.0.1-incubating-SNAPSHOT\tuscany-implementation-resource-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0.1-incubating-SNAPSHOT\tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\1.0.1-incubating-SNAPSHOT\tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/>
<pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.0.1-incubating-SNAPSHOT\tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0.1-incubating-SNAPSHOT\tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.0.1-incubating-SNAPSHOT\tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0.1-incubating-SNAPSHOT\tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0.1-incubating-SNAPSHOT\tuscany-host-http-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0.1-incubating-SNAPSHOT\tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-impl\1.0.1-incubating-SNAPSHOT\tuscany-node-impl-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/>
<pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0.1-incubating-SNAPSHOT\tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0.1-incubating-SNAPSHOT\tuscany-host-http-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0.1-incubating-SNAPSHOT\tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-runtime-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
+ <pathelement location="${m2.repo}\xmlbeans\xbean\2.1.0\xbean-2.1.0.jar"/>
<pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0.1-incubating-SNAPSHOT\tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-api\1.0.1-incubating-SNAPSHOT\tuscany-node-api-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0.1-incubating-SNAPSHOT\tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\bouncycastle\bcprov-jdk15\132\bcprov-jdk15-132.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0.1-incubating-SNAPSHOT\tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0.1-incubating-SNAPSHOT\tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/>
<pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions-xml\1.0.1-incubating-SNAPSHOT\tuscany-definitions-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0.1-incubating-SNAPSHOT\tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.0.1-incubating-SNAPSHOT\tuscany-binding-jsonrpc-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0.1-incubating-SNAPSHOT\tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0.1-incubating-SNAPSHOT\tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\1.0.1-incubating-SNAPSHOT\tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\1.0.1-incubating-SNAPSHOT\tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0.1-incubating-SNAPSHOT\tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-collections\commons-collections\3.1\commons-collections-3.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-xml-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-runtime-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0.1-incubating-SNAPSHOT\tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-adb-codegen\1.3\axis2-adb-codegen-1.3.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\1.0.1-incubating-SNAPSHOT\tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\tomcat\coyote\6.0.10\coyote-6.0.10.jar"/>
<pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-impl\1.0.1-incubating-SNAPSHOT\tuscany-domain-impl-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\commons-discovery\commons-discovery\0.2\commons-discovery-0.2.jar"/>
<pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0.1-incubating-SNAPSHOT\tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.0.1-incubating-SNAPSHOT\tuscany-implementation-java-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0.1-incubating-SNAPSHOT\tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0.1-incubating-SNAPSHOT\tuscany-databinding-axiom-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\tomcat\annotations-api\6.0.10\annotations-api-6.0.10.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node-impl\1.0.1-incubating-SNAPSHOT\tuscany-node-impl-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0.1-incubating-SNAPSHOT\tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-wsdl-xml-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\org\apache\tomcat\juli\6.0.10\juli-6.0.10.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0.1-incubating-SNAPSHOT\tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.0.1-incubating-SNAPSHOT\tuscany-extension-helper-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
<pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
<pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/>
<pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0.1-incubating-SNAPSHOT\tuscany-binding-ws-axis2-1.0.1-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0.1-incubating-SNAPSHOT\tuscany-databinding-axiom-1.0.1-incubating-SNAPSHOT.jar"/>
<pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0.1-incubating-SNAPSHOT\tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0.1-incubating-SNAPSHOT\tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.0.1-incubating-SNAPSHOT\tuscany-host-tomcat-1.0.1-incubating-SNAPSHOT.jar"/>
+ <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-logging\1.0.1-incubating-SNAPSHOT\tuscany-policy-logging-1.0.1-incubating-SNAPSHOT.jar"/>
</path>
- <target name="runDomainNodeRepo">
+ <target name="runDomainRepo">
<java classname="${domain.class}"
fork="true">
<classpath>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/pom.xml Tue Oct 23 21:30:02 2007
@@ -41,17 +41,16 @@
<artifactId>tuscany-host-embedded</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-impl</artifactId>
+ <artifactId>tuscany-domain-api</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
@@ -86,7 +85,21 @@
<artifactId>tuscany-host-tomcat</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain-impl</artifactId>
+ <version>1.0.1-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.0.1-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java Tue Oct 23 21:30:02 2007
@@ -21,8 +21,11 @@
import java.io.IOException;
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import calculator.CalculatorService;
@@ -47,15 +50,21 @@
try {
String domainName = args[0];
String nodeName = args[1];
+
+ ClassLoader cl = CalculatorNode.class.getClassLoader();
- SCADomain domainNode = SCADomain.newInstance(domainName, nodeName, null, nodeName + "/Calculator.composite");
-
+ SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ SCANode node = nodeFactory.createSCANode(nodeName, domainName);
+ node.addContribution(nodeName, cl.getResource(nodeName + "/"));
+ node.deployComposite(new QName("http://sample", "Calculator"));
+ node.start();
+
// nodeA is the head node and runs some tests while all other nodes
// simply listen for incoming messages
if ( nodeName.equals("nodeA") ) {
// do some application stuff
CalculatorService calculatorService =
- domainNode.getService(CalculatorService.class, "CalculatorServiceComponent");
+ node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentA");
// Calculate
System.out.println("3 + 2=" + calculatorService.add(3, 2));
@@ -84,7 +93,7 @@
}
// stop the node and all the domains in it
- domainNode.close();
+ node.stop();
} catch(Exception ex) {
System.err.println("Exception in node - " + ex.getMessage());
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/DomainNode.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/DomainNode.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/DomainNode.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/java/node/DomainNode.java Tue Oct 23 21:30:02 2007
@@ -19,8 +19,7 @@
package node;
import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import org.apache.tuscany.sca.node.impl.SCANodeUtil;
+import org.apache.tuscany.sca.domain.SCADomainFactory;
/**
@@ -30,20 +29,24 @@
*/
public class DomainNode {
+ private static String DEFAULT_DOMAIN_URI = "http://localhost:8877";
+
public static void main(String[] args) {
try {
- SCADomain domainNode = SCADomain.newInstance("domain.composite");
+ SCADomainFactory domainFactory = SCADomainFactory.newInstance();
+ SCADomain domain = domainFactory.createSCADomain(DEFAULT_DOMAIN_URI);
+ domain.start();
- System.out.println("Domain node started (press enter to shutdown)");
+ System.out.println("Domain started (press enter to shutdown)");
System.in.read();
- domainNode.close();
+ domain.stop();
} catch (Exception e) {
e.printStackTrace();
}
- System.out.println("Domain node stopped");
+ System.out.println("Domain stopped");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite Tue Oct 23 21:30:02 2007
@@ -22,19 +22,19 @@
xmlns:sample="http://sample"
name="Calculator">
- <component name="CalculatorServiceComponent">
+ <component name="CalculatorServiceComponentA">
<implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent" />
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent"/>
- <reference name="divideService" target="DivideServiceComponent" />
+ <reference name="addService" target="AddServiceComponentB" />
+ <reference name="subtractService" target="SubtractServiceComponentC" />
+ <reference name="multiplyService" target="MultiplyServiceComponentA"/>
+ <reference name="divideService" target="DivideServiceComponentA" />
</component>
- <component name="MultiplyServiceComponent">
+ <component name="MultiplyServiceComponentA">
<implementation.java class="calculator.MultiplyServiceImpl" />
</component>
- <component name="DivideServiceComponent">
+ <component name="DivideServiceComponentA">
<implementation.java class="calculator.DivideServiceImpl" />
</component>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite Tue Oct 23 21:30:02 2007
@@ -22,7 +22,7 @@
xmlns:sample="http://sample"
name="Calculator">
- <component name="AddServiceComponent">
+ <component name="AddServiceComponentB">
<implementation.java class="calculator.AddServiceImpl" />
</component>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite Tue Oct 23 21:30:02 2007
@@ -22,10 +22,10 @@
xmlns:sample="http://sample"
name="Calculator">
- <component name="SubtractServiceComponent">
+ <component name="SubtractServiceComponentC">
<implementation.java class="calculator.SubtractServiceImpl" />
<service name="SubtractService">
- <binding.sca uri="http://localhost:8086/SubtractServiceComponent"/>
+ <binding.sca uri="http://localhost:8086/SubtractServiceComponentC"/>
</service>
</component>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java Tue Oct 23 21:30:02 2007
@@ -19,11 +19,15 @@
package calculator;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.impl.SCANodeImpl;
-import org.apache.tuscany.sca.node.impl.SCANodeUtil;
+import org.apache.tuscany.sca.domain.SCADomainFactory;
+import org.apache.tuscany.sca.node.SCADomainFinder;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,50 +40,72 @@
*/
public class DomainInMemoryTestCase {
- private static String DEFAULT_DOMAIN_URL = "http://localhost:8877";
+ private static String DEFAULT_DOMAIN_URI = "http://localhost:8877";
+ private static SCADomain domainManager;
+ private static SCANode nodeA;
+ private static SCANode nodeB;
+ private static SCANode nodeC;
private static SCADomain domain;
- private static SCADomain domainNodeA;
- private static SCADomain domainNodeB;
- private static SCADomain domainNodeC;
-
private static CalculatorService calculatorServiceA;
+ private static CalculatorService calculatorServiceB;
+ private static AddService addServiceB;
@BeforeClass
public static void init() throws Exception {
-
+
try {
- System.out.println("Setting up domain registry");
- domain = SCADomain.newInstance("domain.composite");
-
- System.out.println("Setting up distributed nodes");
-
- // Create the domain representation
- domainNodeA = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeA", null, "nodeA/Calculator.composite");
-
- // Create the domain representation
- domainNodeB = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeB", null, "nodeB/Calculator.composite");
-
- // create the node that runs the
- // subtract component
- domainNodeC = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeC", null, "nodeC/Calculator.composite");
-
- // get a reference to the calculator service from domainA
- // which will be running this component
- calculatorServiceA = domainNodeA.getService(CalculatorService.class, "CalculatorServiceComponent");
+ System.out.println("Setting up domain manager");
+
+ SCADomainFactory domainFactory = SCADomainFactory.newInstance();
+ domainManager = domainFactory.createSCADomain(DEFAULT_DOMAIN_URI);
+
+ System.out.println("Setting up calculator nodes");
+
+ ClassLoader cl = DomainInMemoryTestCase.class.getClassLoader();
+
+ SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+
+ nodeA = nodeFactory.createSCANode("nodeA", DEFAULT_DOMAIN_URI);
+ nodeA.addContribution("nodeA", cl.getResource("nodeA/"));
+ nodeA.deployComposite(new QName("http://sample", "Calculator"));
+ nodeA.start();
+
+
+ nodeB = nodeFactory.createSCANode("nodeB", DEFAULT_DOMAIN_URI);
+ nodeB.addContribution("nodeB", cl.getResource("nodeB/"));
+ nodeB.deployComposite(new QName("http://sample", "Calculator"));
+ nodeB.start();
+
+
+ nodeC = nodeFactory.createSCANode("nodeC", DEFAULT_DOMAIN_URI);
+ nodeC.addContribution("nodeC", cl.getResource("nodeC/"));
+ nodeC.deployComposite(new QName("http://sample", "Calculator"));
+ nodeC.start();
+
+ SCADomainFinder domainFinder = SCADomainFinder.newInstance();
+ domain = domainFinder.getSCADomain(DEFAULT_DOMAIN_URI);
+
+ // get a reference to various services in the domain
+ calculatorServiceA = nodeA.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentA");
+ calculatorServiceB = nodeB.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentB");
+
+ //addServiceB = domain.getService(AddService.class, "AddServiceComponentB");
+ addServiceB = nodeA.getDomain().getService(AddService.class, "AddServiceComponentB");
+
} catch(Exception ex){
- System.err.println(ex.toString());
- }
+ System.err.println(ex.toString());
+ }
+
}
@AfterClass
public static void destroy() throws Exception {
- // stop the domain and hence the nodes it contains
- domainNodeA.close();
- domainNodeB.close();
- domainNodeC.close();
- domain.close();
- }
+ // stop the nodes and hence the domains they contain
+ nodeA.stop();
+ nodeB.stop();
+ nodeC.stop();
+ }
@Test
public void testCalculator() throws Exception {
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/AddServiceImpl.java Tue Oct 23 21:30:02 2007
@@ -18,12 +18,17 @@
*/
package calculator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* An implementation of the Add service
*/
public class AddServiceImpl implements AddService {
public double add(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
return n1 + n2;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/DivideServiceImpl.java Tue Oct 23 21:30:02 2007
@@ -18,12 +18,17 @@
*/
package calculator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* An implementation of the Divide service.
*/
public class DivideServiceImpl implements DivideService {
public double divide(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2);
return n1 / n2;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java Tue Oct 23 21:30:02 2007
@@ -18,12 +18,17 @@
*/
package calculator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* An implementation of the Multiply service.
*/
public class MultiplyServiceImpl implements MultiplyService {
public double multiply(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2);
return n1 * n2;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java Tue Oct 23 21:30:02 2007
@@ -18,12 +18,17 @@
*/
package calculator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* An implementation of the subtract service.
*/
public class SubtractServiceImpl implements SubtractService {
public double subtract(double n1, double n2) {
+ Logger logger = Logger.getLogger("calculator");
+ logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2);
return n1 - n2;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/Calculator.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/calculator/src/main/resources/Calculator.composite Tue Oct 23 21:30:02 2007
@@ -31,7 +31,7 @@
</component>
<component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
+ <implementation.java class="calculator.AddServiceImpl" requires="logging"/>
</component>
<component name="SubtractServiceComponent">
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/build.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/build.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/build.xml Tue Oct 23 21:30:02 2007
@@ -62,7 +62,7 @@
<classpath>
<pathelement path="target/${test.jar}"/>
<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar "/>
+ <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
</classpath>
</java>
</target>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/databinding-echo/pom.xml Tue Oct 23 21:30:02 2007
@@ -59,7 +59,13 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>sample-binding-echo</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl-xml</artifactId>
+ <version>1.0.1-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-bpel/pom.xml Tue Oct 23 21:30:02 2007
@@ -59,14 +59,14 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -83,12 +83,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
+ <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
+ <version>2.3.1-SNAPSHOT</version>
<configuration>
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
- <skip>true</skip>
- <!--useSystemClassLoader>true</useSystemClassLoader-->
+ <useSystemClassLoader>true</useSystemClassLoader>
</configuration>
</plugin>
<plugin>
@@ -119,7 +119,7 @@
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<executions>
<execution>
<id>generate-bpel-helloworld</id>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html Tue Oct 23 21:30:02 2007
@@ -20,9 +20,11 @@
<head>
<title>Tuscany JSON-RPC HelloWorld Example</TITLE>
- <script type="text/javascript" src="SCADomain/scaDomain.js"></script>
+ <script type="text/javascript" src="jsonrpc.js"></script>
<script language="JavaScript">
+ /* Reference */
+ HelloWorldService = new JSONRpcClient("HelloWorldService").HelloWorldService;
function getGreeting() {
var name = document.getElementById("name").value;
Propchange: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 23 21:30:02 2007
@@ -1,13 +1,14 @@
-target
-*.iws
-*.ipr
-*.iml
-.project
-.classpath
-maven.log
-velocity.log*
-junit*.properties
-.settings
-.deployables
-.wtpmodules
-work
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+work
+activemq-data
Propchange: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-jms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 23 21:30:02 2007
@@ -0,0 +1,19 @@
+dojo
+work
+target
+activemq-data
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+
Copied: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-jms/pom.xml (from r587600, incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-jms/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-jms/pom.xml&p1=incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml&r1=587600&r2=587778&rev=587778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-reference-jms/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-jms/pom.xml Tue Oct 23 21:30:02 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-helloworld-ws-reference-jms</artifactId>
@@ -39,27 +39,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>sample-helloworld-ws-service</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/README?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/README (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/README Tue Oct 23 21:30:02 2007
@@ -63,7 +63,12 @@
deploys the helloworldwsclient
.composite. It then calls the
HelloWorldServiceComponent
- ClientPWCBHandler.java - Callback handler class to provide client password
+ ClientPWCBHandler.java - Callback handler class to provide client password. The
+ handle(Callback[] callbacks) method of this class is where
+ code for accessing user registries and retrieving passwords
+ for given user identifiers can be encapsulated. For example
+ here is where one could access LDAP registries to obtain or
+ compare user identities and passwords.
resources/
wsdl
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java Tue Oct 23 21:30:02 2007
@@ -36,7 +36,9 @@
for (int i = 0; i < callbacks.length; i++) {
System.out.println("*** Calling Client UserId/Password Handler .... ");
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
+ System.out.println("User Id = " + pwcb.getIdentifer());
pwcb.setPassword("TuscanyWsUserPasswd");
+ System.out.println("Set Password = " + pwcb.getPassword());
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java Tue Oct 23 21:30:02 2007
@@ -32,6 +32,10 @@
String value = helloWorldService.getGreetings("World");
System.out.println(value);
+
+ helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldWsPolicyServiceComponent");
+ value = helloWorldService.getGreetings("WsPolicyWorld");
+ System.out.println(value);
scaDomain.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org