You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/09/20 22:44:04 UTC
svn commit: r577910 [1/6] - in /incubator/tuscany/java/sca: ./
demos/mortgage-creditcheck/
demos/mortgage-creditcheck/src/main/webapp/META-INF/ distribution/
distribution/bundle/ distribution/manifest/ distribution/src/main/assembly/
distribution/src/m...
Author: slaws
Date: Thu Sep 20 13:43:32 2007
New Revision: 577910
URL: http://svn.apache.org/viewvc?rev=577910&view=rev
Log:
Merge all the remaining changes from the V1.0 branch into trunk
Added:
incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/itest/ws-void-args-return/ (with props)
incubator/tuscany/java/sca/itest/ws-void-args-return/pom.xml
incubator/tuscany/java/sca/itest/ws-void-args-return/src/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/resources/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/resources/voidtest.composite
incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/voidtest/
incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
incubator/tuscany/java/sca/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/resources/wsdl/
incubator/tuscany/java/sca/samples/calculator-webapp/src/main/resources/wsdl/add.wsdl
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/ (with props)
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/README
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/build.xml
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png (with props)
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/java/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/test/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/test/java/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/README
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/ (with props)
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/README
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/build.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png (with props)
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/java/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/wsdl/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/test/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/test/java/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/test/java/helloworld/
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
incubator/tuscany/java/sca/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
incubator/tuscany/java/sca/samples/quote-xquery/README
incubator/tuscany/java/sca/samples/quote-xquery/build.xml
incubator/tuscany/java/sca/samples/quote-xquery/src/main/java/xquery/quote/QuoteDataUtil.java
incubator/tuscany/java/sca/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteClient.java
incubator/tuscany/java/sca/samples/quote-xquery/src/main/java/xquery/quote/XQueryQuoteServer.java
Removed:
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentialityTestCase.java
incubator/tuscany/java/sca/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java
Modified:
incubator/tuscany/java/sca/demos/mortgage-creditcheck/pom.xml
incubator/tuscany/java/sca/distribution/bundle/pom.xml
incubator/tuscany/java/sca/distribution/manifest/pom.xml
incubator/tuscany/java/sca/distribution/pom.xml
incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml
incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml
incubator/tuscany/java/sca/distribution/src/main/release/CHANGES
incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES
incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE
incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE
incubator/tuscany/java/sca/distribution/webapp/pom.xml
incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sca/itest/admin/src/test/resources/Iteration3Composite.composite
incubator/tuscany/java/sca/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml
incubator/tuscany/java/sca/itest/pom.xml
incubator/tuscany/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
incubator/tuscany/java/sca/itest/scopes/pom.xml
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Java2WSDLHelper.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
incubator/tuscany/java/sca/modules/contribution/pom.xml
incubator/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsDocumentProcessor.java
incubator/tuscany/java/sca/modules/definitions/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
incubator/tuscany/java/sca/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
incubator/tuscany/java/sca/modules/node-impl/ (props changed)
incubator/tuscany/java/sca/modules/policy-security/pom.xml
incubator/tuscany/java/sca/modules/policy-xml/pom.xml
incubator/tuscany/java/sca/modules/wsdl2java/pom.xml
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/sca/samples/binding-echo/README
incubator/tuscany/java/sca/samples/domain-webapp/ (props changed)
incubator/tuscany/java/sca/samples/helloworld-bpel/README
incubator/tuscany/java/sca/samples/helloworld-bpel/pom.xml
incubator/tuscany/java/sca/samples/implementation-composite/pom.xml
incubator/tuscany/java/sca/samples/pom.xml
incubator/tuscany/java/sca/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
incubator/tuscany/java/sca/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
incubator/tuscany/java/sca/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
incubator/tuscany/java/sca/tools/registry-inspector/ (props changed)
Modified: incubator/tuscany/java/sca/demos/mortgage-creditcheck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/mortgage-creditcheck/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/mortgage-creditcheck/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/mortgage-creditcheck/pom.xml Thu Sep 20 13:43:32 2007
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-webapp</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Added: incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml Thu Sep 20 13:43:32 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://credit"
+ xmlns:credit="http://credit">
+ <deployable composite="credit:CreditComposite"/>
+</contribution>
\ No newline at end of file
Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Thu Sep 20 13:43:32 2007
@@ -179,6 +179,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-domain-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-domain-impl</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -289,6 +294,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-xquery</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-node</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -339,13 +349,20 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Thu Sep 20 13:43:32 2007
@@ -287,6 +287,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-xquery</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-node</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -344,6 +349,13 @@
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: incubator/tuscany/java/sca/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/pom.xml Thu Sep 20 13:43:32 2007
@@ -73,6 +73,11 @@
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
+ <exclusion>
+ <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -84,6 +89,18 @@
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -116,7 +133,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<classifier>javadoc</classifier>
<version>${pom.version}</version>
</artifactItem>
Modified: incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml (original)
+++ incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml Thu Sep 20 13:43:32 2007
@@ -81,7 +81,11 @@
<exclude>helloworld-ws-reference/work/**/*</exclude>
<exclude>helloworld-ws-reference-secure/work</exclude>
<exclude>helloworld-ws-reference-secure/work/**/*</exclude>
+ <exclude>helloworld-ws-service-webapp</exclude>
+ <exclude>helloworld-ws-service-webapp/**/*</exclude>
<exclude>helloworld-ws-service/work</exclude>
+ <exclude>helloworld-ws-service/secure/work/**/*</exclude>
+ <exclude>helloworld-ws-service/secure/work</exclude>
<exclude>helloworld-ws-service/work/**/*</exclude>
<exclude>helloworld-ws-service-secure/work</exclude>
<exclude>helloworld-ws-service-secure/work/**/*</exclude>
@@ -91,12 +95,16 @@
<exclude>helloworld-ws-sdo/work/**/*</exclude>
<exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp</exclude>
<exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp/**/*</exclude>
+ <exclude>calculator-distributed/work</exclude>
+ <exclude>calculator-distributed/work/**/*</exclude>
<exclude>calculator-webapp/target/sample-calculator-webapp</exclude>
<exclude>calculator-webapp/target/sample-calculator-webapp/**/*</exclude>
<exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp</exclude>
<exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp/**/*</exclude>
<exclude>chat-webapp/target/sample-chat-webapp</exclude>
<exclude>chat-webapp/target/sample-chat-webapp/**/*</exclude>
+ <exclude>domain-webapp</exclude>
+ <exclude>domain-webapp/**/*</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
@@ -129,6 +137,13 @@
<exclude>*/target/sdo-source</exclude>
<exclude>*/target/sdo-source/**/*</exclude>
<exclude>*/**/*.svg</exclude>
+ <exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp.war</exclude>
+ <exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
+ <exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
+ <exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp.war</exclude>
+ <exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp.war</exclude>
+ <exclude>chat-webapp/target/sample-chat-webapp.war</exclude>
+ <exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp.war</exclude>
</excludes>
</fileSet>
<!-- Add all the demos to the demos directory -->
@@ -166,6 +181,10 @@
<exclude>*/target/surefire-reports/**/*</exclude>
<exclude>*/**/*.svg</exclude>
<exclude>*/**/*.ruleset</exclude>
+ <exclude>alert-aggregator-webapp/target</exclude>
+ <exclude>alert-aggregator-webapp/target/**/*</exclude>
+ <exclude>mortgage-creditcheck/target</exclude>
+ <exclude>mortgage-creditcheck/target/**/*</exclude>
</excludes>
</fileSet>
<!-- Add the generated tuscany manifest classpath jar to the lib directory -->
@@ -177,6 +196,14 @@
</includes>
</fileSet>
+ <!-- temporary fix since maven dependencies of rampart seems to refere to SNAPSHOT versions of the parent pom -->
+ <!--fileSet>
+ <directory>../modules/binding-ws-axis2/target/classes/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules</directory>
+ <outputDirectory>tuscany-sca-${tuscany.version}/lib</outputDirectory>
+ <includes>
+ <include>rampart-1.3.mar</include>
+ </includes>
+ </fileSet-->
</fileSets>
<dependencySets>
Modified: incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml (original)
+++ incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml Thu Sep 20 13:43:32 2007
@@ -92,6 +92,8 @@
<exclude>itest/callablereferences/work/**/*</exclude>
<exclude>itest/large-sdo-ws/work</exclude>
<exclude>itest/large-sdo-ws/work/**/*</exclude>
+ <exclude>itest/ws-void-args-return/work</exclude>
+ <exclude>itest/ws-void-args-return/work/**/*</exclude>
<exclude>itest/contribution-import-export/import-wsdl/work</exclude>
<exclude>itest/contribution-import-export/import-wsdl/work/**/*</exclude>
<exclude>itest/contribution-import-export/import-composite/work</exclude>
@@ -111,6 +113,8 @@
<exclude>modules/implementation-osgi/.felix/**/*</exclude>
<exclude>samples/old</exclude>
<exclude>samples/old/**/*</exclude>
+ <exclude>samples/calculator-distributed/work</exclude>
+ <exclude>samples/calculator-distributed/work/**/*</exclude>
<exclude>samples/company-das</exclude>
<exclude>samples/company-das/**/*</exclude>
<exclude>samples/company-das-webapp</exclude>
@@ -119,6 +123,8 @@
<exclude>samples/das-service/**/*</exclude>
<exclude>samples/das-service-web</exclude>
<exclude>samples/das-service-web/**/*</exclude>
+ <exclude>samples/domain-webapp</exclude>
+ <exclude>samples/domain-webapp/**/*</exclude>
<exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo</exclude>
<exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo/**/*</exclude>
<exclude>samples/helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
@@ -133,6 +139,8 @@
<exclude>samples/helloworld-ws-service/work/**/*</exclude>
<exclude>samples/helloworld-ws-service-secure/work</exclude>
<exclude>samples/helloworld-ws-service-secure/work/**/*</exclude>
+ <exclude>samples/helloworld-ws-service-webapp</exclude>
+ <exclude>samples/helloworld-ws-service-webapp/**/*</exclude>
<exclude>samples/osgi-supplychain/.felix</exclude>
<exclude>samples/osgi-supplychain/.felix/**/*</exclude>
<exclude>samples/quote-xquery</exclude>
Modified: incubator/tuscany/java/sca/distribution/src/main/release/CHANGES
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/CHANGES?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/CHANGES (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/CHANGES Thu Sep 20 13:43:32 2007
@@ -1,3 +1,80 @@
+Changes With Apache Tuscany SCA 1.0 (incubating) September 2007
+===============================================================
+
+- Tuscany Java SCA now implements V1.0 of the core SCA
+ specifications
+ SCA Assembly Model V1.0
+ SCA Java Common Annotations and APIs V1.0
+ SCA Java Component Implementation V1.0
+ SCA Web Services Binding V1.0
+ Including callbacks, conversations and callable references
+
+
+- Support for ws-security configurable in the web services binding
+ thro Tuscany SCA policy intents and policysets using the policy framework
+ introduced in the last release.
+
+ Note : This release supports specifications of policies around axis2
+ config params - see helloworld-ws-service-secure sample. The policy
+ intents that have been tested are authentication, integrity and
+ confidentiality.
+ There is no sample or test that exercises confidentiality since there
+ are some unresolved licensing issue around bouncycastle libraries.
+ However, users who are not encumbered by the bouncycastle license
+ restrictions can try the 'confidentiality' intent. See FAQ -
+ http://incubator.apache.org/tuscany/tuscany-sca-java-faq.html
+
+ This release does not include support for WS-Policy
+ attachments in Tuscany Policysets for ws-security.
+
+
+- An XQuery component implementation type
+ implementation-xquery
+
+
+- A Databinding for converting data to and from nodes for XQuery
+ processing
+ databinding-saxon
+
+
+- OSGI support has been extended to allow Tuscany contributions
+ packaged as OSGI bundles hence taking advantage of OSGI's bundle
+ loading an dependency management capabilities
+
+
+- A BPEL component implementation type experimental implementation
+based on SCA BPEL Client and Implementation V1.0. At the moment only
+supports BPEL process as services.
+ implementation-bpel
+
+
+- The distributed runtime implementation has been separated out
+ into
+ *) domain
+ *) node
+ It is now wrapped by a SCADomain interface as is the standalone
+ runtime.
+
+ Note: This release does not include support for WebApp host deployment
+ for a distributed SCA Domain
+
+
+
+- The web service binding will now generate WSDL automatically
+ based on the service interface if no WSDL is provided
+
+
+- A new "store" sample and associated document show how a
+ simple store front application can be constructed
+ samples/store
+
+- The following features of this release are still experimental:
+ - BPEL implementation type, integrating with Apache ODE
+ - OSGI implementation type, integrating with Apache Felix
+ - XQuery implementation type
+
+
+
Changes With Apache Tuscany SCA 0.99 (incubating) August 2007
=============================================================
@@ -5,15 +82,30 @@
over and above all of what was offered in release 0.91.
- A version of the default sca binding that works between
- components runing in separate Java vistual machines
+ components runing in separate Java virtual machines
binding-sca-axis
- A simple node implementation and a service discovery
- funtion for running sca applications distributed
+ function for running sca applications distributed
across more than one node
distributed
distributed-impl
+- integration with OSGi runtimes is now supported with
+ a new implementation-osgi component type
+
+- PUB/SUB interactions are now supported by using new
+ notification binding and implementation types, and
+ samples demonstrating the feature.
+
+- The Tuscany runtime now has a policy framework supporting
+ the SCA policy specification
+
+- the endpoint URIs used by SCA bindings has been rationalized
+ and now follows the SCA Assembly specification
+
+- binding-ajax has been renamed to binding-dwr
+
Changes With Apache Tuscany SCA 0.91 (incubating) July 2007
===========================================================
@@ -45,11 +137,7 @@
- Samples
Samples to demostrate use of Spring, Resource, AJAX extensions
-
-
------------------------------------------------------------
-
-Changed With Apache Tuscany SCA 0.90 (incubating) June 2007
+Changes With Apache Tuscany SCA 0.90 (incubating) June 2007
===========================================================
- Implementations for all of the Java Annotations and API Specification V1.0 found at
Modified: incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES Thu Sep 20 13:43:32 2007
@@ -1,22 +1,49 @@
-Apache Tuscany SCA 0.99 (incubating) August 2007 Release Notes
-==============================================================
+Apache Tuscany SCA 1.0 (incubating) September 2007 Release Notes
+================================================================
Apache Tuscany provides a runtime based on the Service Component
Architecture. SCA is a set of specifications aimed at simplifying SOA
Application Development which are being standardized at OASIS as part
-of Open Composite Services Architecture (Open CSA).
+of Open Composite Services Architecture (Open CSA) - http://www.oasis-opencsa.org/.
Overview
--------
- This 0.99 release of Apache Tuscany SCA is expected to be
- the last point release before 1.0 final release. It further
- builds on the stability and modularity established with the
- previous releases including more complete implementation of SCA
- specifications, support for distributed SCA domains, SCA policy,
- OSGi implementation types, and notification components for pub/sub
- interactions. Start up time and memory footprint of the Tuscany SCA
- runtime has also been reduced.
+ The Apache Tuscany SCA 1.0 release includes implementations of the
+ main SCA specifications including:
+
+ SCA Assembly Model V1.0
+ SCA Policy Framework V1.0
+ SCA Java Common Annotations and APIs V1.0
+ SCA Java Component Implementation V1.0
+ SCA Spring Component Implementation V1.0
+ SCA BPEL Client and Implementation V1.0
+ SCA Web Services Binding V1.0
+ SCA EJB Session Bean Binding V1.0
+
+ It also includes implementations of many features not yet defined
+ by SCA specifications, including:
+
+ - SCA bindings for Direct Web Remoting, RSS and ATOM Feeds,
+ HTTP resources, JSON-RPC, PUB/SUB Notifications, and RMI.
+ - SCA implementation types for OSGI, XQuery, BPEL, and various
+ dynamic languages including Groovy, Javascript, Python and Ruby
+ - Databindings for Service Data Objects (SDO), JAXB, XmlBeans,
+ Axis2's AXIOM, JSON, SAXON, DOM, SAX and StAX
+
+ The Tuscany SCA Runtime can be configured as a single node SCA domain or
+ as an SCA domain distributed across multiple nodes.
+ In addition Tuscany SCA supports the following host-deployment options: -
+ - running standalone
+ - running with distributed nodes across multiple JVMs
+ - running with embedded Jetty or Tomcat
+ - running as a standard web application
+ - running as a module in Geronimo (experimental).
+
+
+ The Wepapp samples included in this release have been tried and tested on Tomcat,
+ WebSphere.
+
See the CHANGES file for a detailed list of the features in this release.
@@ -30,7 +57,7 @@
Any issues with this release can be reported to Apache Tuscany
using the mailing lists or in the JIRA issue tracker.
- Mailing lists:
+ Mailing list archives:
http://mail-archives.apache.org/mod_mbox/ws-tuscany-user/
http://mail-archives.apache.org/mod_mbox/ws-tuscany-dev/
@@ -38,6 +65,10 @@
Jira:
http://issues.apache.org/jira/browse/TUSCANY
+
+To join the project's mailing lists follow the instructions at:
+
+ http://incubator.apache.org/tuscany/mailing-lists.html
To find out more about OASIS Open CSA go to:
Modified: incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE Thu Sep 20 13:43:32 2007
@@ -1424,7 +1424,7 @@
===============================================================================
The jars; activation, jaxb-api, jaxb-impl, jaxb-xjc, jsr181-api,
-jsr250, jaxws-api, mail, saaj-api, servlet-api-2.5.jar:
+jsr250-api, jaxws-api, mail, saaj-api, servlet-api-2.5.jar:
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
Modified: incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE Thu Sep 20 13:43:32 2007
@@ -46,6 +46,23 @@
This product includes/uses dojotoolkit (http://dojotoolkit.org/)
Copyright (c) 2005, The Dojo Foundation. All rights reserved.
+This product includes/uses Howl (http://howl.objectweb.org/)
+ Copyright (c) 2004, Bull S.A.
+
+This product includes/uses axion (http://axion.tigris.org/)
+ Copyright (c) 2002-2003 Axion Development Team.
+
+This product includes/uses javacc (https://javacc.dev.java.net/)
+ Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+
+The Program includes all or portions of the following software: "The
+Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under
+an MPL v1.0 license. Please refer to the homepage URL at
+http://www.saxonica.com/.
+
+This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:
+ Copyright (c) 2002, A. Abram White. All rights reserved.
+
This product also includes software under the BSD license
with the following copyright:
Modified: incubator/tuscany/java/sca/distribution/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/webapp/pom.xml Thu Sep 20 13:43:32 2007
@@ -268,7 +268,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java Thu Sep 20 13:43:32 2007
@@ -41,7 +41,7 @@
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.core.assembly.ActivationException;
import org.apache.tuscany.sca.node.impl.ContributionManagerImpl;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
+import org.apache.tuscany.sca.node.impl.SCANodeImpl;
/**
* A ServletContextListener for the Tuscany WAR distribution.
@@ -53,7 +53,7 @@
public class WarContextListener implements ServletContextListener {
private final static Logger logger = Logger.getLogger(WarContextListener.class.getName());
- protected NodeImpl node;
+ protected SCANodeImpl node;
protected AddableURLClassLoader classLoader;
protected File repository;
@@ -108,7 +108,7 @@
classLoader = new AddableURLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader());
Thread.currentThread().setContextClassLoader(classLoader);
- node = new NodeImpl(domainName, nodeName, classLoader);
+ node = new SCANodeImpl(domainName, nodeName, classLoader);
node.start();
existingContributions = new HashMap<URL, Long>();
@@ -126,9 +126,9 @@
}
- protected void addContribution(URL contribution) throws CompositeBuilderException, ActivationException, URISyntaxException {
+ protected void addContribution(URL contribution) throws CompositeBuilderException, ContributionException, IOException, ActivationException, URISyntaxException {
classLoader.addURL(contribution);
- ((ContributionManagerImpl)node.getContributionManager()).addContributionJAR(contribution);
+ ((ContributionManagerImpl)node.getContributionManager()).addContribution(contribution);
existingContributions.put(contribution, new Long(new File(contribution.toURI()).lastModified()));
logger.log(Level.INFO, "Added contribution: " + contribution);
}
@@ -260,13 +260,13 @@
if (servletContext.getInitParameter("domainName") != null) {
domainName = servletContext.getInitParameter("domainName");
} else {
- domainName = NodeImpl.LOCAL_DOMAIN_URI;
+ domainName = SCANodeImpl.LOCAL_DOMAIN_URI;
}
if (servletContext.getInitParameter("nodeName") != null) {
nodeName = servletContext.getInitParameter("nodeName");
} else {
- nodeName = NodeImpl.LOCAL_NODE_URI;
+ nodeName = SCANodeImpl.LOCAL_NODE_URI;
}
if (servletContext.getInitParameter("hotDeployInterval") != null) {
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/WEB-INF/web.xml Thu Sep 20 13:43:32 2007
@@ -30,11 +30,11 @@
<context-param>
<param-name>domainName</param-name>
- <param-value>mydomain</param-value>
+ <param-value>http://localhost:8080/</param-value>
</context-param>
<context-param>
<param-name>nodeName</param-name>
- <param-value>nodeB</param-value>
+ <param-value>http://localhost:8081/</param-value>
</context-param>
<context-param>
<param-name>hotDeployInterval</param-name>
Modified: incubator/tuscany/java/sca/itest/admin/src/test/resources/Iteration3Composite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/admin/src/test/resources/Iteration3Composite.composite?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/admin/src/test/resources/Iteration3Composite.composite (original)
+++ incubator/tuscany/java/sca/itest/admin/src/test/resources/Iteration3Composite.composite Thu Sep 20 13:43:32 2007
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
<composite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0" name="Iteration3Composite"
targetNamespace="http://foo" local="true" autowire="false" requires="cns:confidentiality"
Modified: incubator/tuscany/java/sca/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl (original)
+++ incubator/tuscany/java/sca/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl Thu Sep 20 13:43:32 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:ns0="http://example.com" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ns1="http://example.com/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://example.com">
<wsdl:types>
<xs:schema xmlns:ns="http://example.com" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org