From e0cc36eb4a509146edc912111f2074902dee1864 Mon Sep 17 00:00:00 2001 From: ramkumar Date: Fri, 5 Dec 2008 07:23:54 +0000 Subject: Fixes for TUSCANY-2716, 2717 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723636 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.4/distribution/bundle/pom.xml | 20 +++++++--------- .../distribution/src/main/assembly/bin.xml | 12 +++++++--- .../distribution/src/main/assembly/src.xml | 28 ++++++++++++++++++++-- .../sca-java-1.4/samples/callbacks-jms/build.xml | 4 ++-- .../sca-java-1.4/samples/callbacks-jms/pom.xml | 2 +- .../src/main/java/callbacks/CallbackJMSClient.java | 26 ++++++++++++++++++++ branches/sca-java-1.4/tutorials/store/README | 2 +- 7 files changed, 73 insertions(+), 21 deletions(-) create mode 100644 branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java (limited to 'branches/sca-java-1.4') diff --git a/branches/sca-java-1.4/distribution/bundle/pom.xml b/branches/sca-java-1.4/distribution/bundle/pom.xml index 0ef61b6c87..1221266c4b 100644 --- a/branches/sca-java-1.4/distribution/bundle/pom.xml +++ b/branches/sca-java-1.4/distribution/bundle/pom.xml @@ -177,10 +177,10 @@ bouncycastle bcprov-jdk15 - + @@ -228,11 +228,6 @@ tuscany-contribution-resource ${pom.version} - - ${pom.groupId} - tuscany-contribution-groovy - ${pom.version} - ${pom.groupId} tuscany-core @@ -388,11 +383,6 @@ tuscany-implementation-jee ${pom.version} - - ${pom.groupId} - tuscany-implementation-node - ${pom.version} - ${pom.groupId} tuscany-implementation-node-runtime @@ -691,6 +681,9 @@ META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint + + META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint + META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator @@ -709,6 +702,9 @@ META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory + + META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory + META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory diff --git a/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml b/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml index 7d93996640..77ae894dc8 100644 --- a/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml +++ b/branches/sca-java-1.4/distribution/src/main/assembly/bin.xml @@ -150,9 +150,13 @@ osgi-supplychain/.felix osgi-supplychain/.felix/**/* osgi-supplychain/target/sample-osgi-supplychain - osgi-supplychain/target/sample-osgi-supplychain/**/* + osgi-supplychain/target/sample-osgi-supplychain/**/* + simple-bigbank-spring/work + simple-bigbank-spring/work/**/* simple-bigbank-spring/src/main/resources/web/dojo simple-bigbank-spring/src/main/resources/web/dojo/**/* + spring-bigbank-stockquote/work + spring-bigbank-stockquote/work/**/* simple-callback-ws/work simple-callback-ws/work/**/* zipcode-jaxws/target/endorsed @@ -331,8 +335,10 @@ store/*/target/surefire-reports/**/* store/*/target/maven-archiver store/*/target/maven-archiver/**/* - store/catalog-webapp/target - store/catalog-webapp/target/**/* + store/catalog-webapp/target/war/ + store/catalog-webapp/target/war/**/* + store/catalog-webapp/target/tutorial-catalog-webapp/ + store/catalog-webapp/target/tutorial-catalog-webapp/**/* store/store-db/target/cart-db/ store/store-db/target/cart-db/**/* store/store-eu/target/cart-eu-db/ diff --git a/branches/sca-java-1.4/distribution/src/main/assembly/src.xml b/branches/sca-java-1.4/distribution/src/main/assembly/src.xml index fc0030a2cc..ce98738923 100644 --- a/branches/sca-java-1.4/distribution/src/main/assembly/src.xml +++ b/branches/sca-java-1.4/distribution/src/main/assembly/src.xml @@ -98,7 +98,7 @@ itest/contribution-import-export/import-wsdl/work/**/* itest/conversations-ws/work itest/conversations-ws/work/**/* - itest/databindings/jaxbgen/velocity.log + itest/databindings/jaxbgen/velocity.log itest/domain/work itest/domain/work/**/* itest/exceptions-simple-ws/work @@ -109,6 +109,14 @@ itest/policy/work/**/* itest/transaction/derbydb itest/transaction/derbydb/**/* + itest/late-reference-resolution/work + itest/late-reference-resolution/work/**/* + itest/policy-security-basicauth/work + itest/policy-security-basicauth/work/**/* + itest/policy-security-token/work + itest/policy-security-token/work/**/* + itest/spring/work + itest/spring/work/**/* itest/ws-void-args-return/work itest/ws-void-args-return/work/**/* vtest/wsbinding/nowsdl/defaultbinding/work @@ -121,6 +129,12 @@ vtest/wsbinding/nowsdl/soapversion/work/**/* vtest/wsbinding/service/work vtest/wsbinding/service/work/**/* + vtest/wsbinding/wsdlelement/binding/work + vtest/wsbinding/wsdlelement/binding/work/**/* + vtest/wsbinding/wsdlelement/port/work + vtest/wsbinding/wsdlelement/port/work/**/* + vtest/wsbinding/wsdlelement/service/work + vtest/wsbinding/wsdlelement/service/work/**/* modules/domain-impl/work modules/domain-impl/work/**/* modules/host-tomcat/work @@ -136,6 +150,12 @@ modules/implementation-osgi/.felix/**/* modules/osgi-runtime/.felix modules/osgi-runtime/.felix/**/* + modules/core-spi/src/main/java/org/apache/tuscany/sca/work + modules/core-spi/src/main/java/org/apache/tuscany/sca/work/**/* + modules/core/src/main/java/org/apache/tuscany/sca/core/work + modules/core/src/main/java/org/apache/tuscany/sca/core/work/**/* + modules/core/src/test/java/org/apache/tuscany/sca/core/work + modules/core/src/test/java/org/apache/tuscany/sca/core/work/**/* samples/old samples/old/**/* samples/calculator-distributed/work @@ -179,7 +199,11 @@ samples/simple-callback-ws/work samples/simple-callback-ws/work/**/* samples/simple-bigbank-spring/src/main/resources/web/dojo - samples/simple-bigbank-spring/src/main/resources/web/dojo/**/* + samples/simple-bigbank-spring/src/main/resources/web/dojo/**/* + samples/simple-bigbank-spring/work + samples/simple-bigbank-spring/work/**/* + samples/spring-bigbank-stockquote/work + samples/spring-bigbank-stockquote/work/**/* demos/alert-aggregator-webapp/bin demos/alert-aggregator-webapp/bin/**/* demos/alert-aggregator-webapp/src/main/webapp/dojo diff --git a/branches/sca-java-1.4/samples/callbacks-jms/build.xml b/branches/sca-java-1.4/samples/callbacks-jms/build.xml index 665feeca71..bc2c191fc2 100644 --- a/branches/sca-java-1.4/samples/callbacks-jms/build.xml +++ b/branches/sca-java-1.4/samples/callbacks-jms/build.xml @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. --> - - + + diff --git a/branches/sca-java-1.4/samples/callbacks-jms/pom.xml b/branches/sca-java-1.4/samples/callbacks-jms/pom.xml index 25f3f5592e..9a96fa6078 100644 --- a/branches/sca-java-1.4/samples/callbacks-jms/pom.xml +++ b/branches/sca-java-1.4/samples/callbacks-jms/pom.xml @@ -26,7 +26,7 @@ ../../pom.xml sample-callbacks-jms - Apache Tuscany SCA Callbacks with JMS Sample + Apache Tuscany SCA Sample Callbacks with JMS diff --git a/branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java b/branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java new file mode 100644 index 0000000000..a08d336180 --- /dev/null +++ b/branches/sca-java-1.4/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java @@ -0,0 +1,26 @@ +package callbacks; + +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; + +public class CallbackJMSClient { + + public static void main(String[] args) throws Exception { + + SCANodeFactory factory = SCANodeFactory.newInstance(); + SCANode node = factory.createSCANodeFromClassLoader("callbacks.composite", CallbackJMSClient.class.getClassLoader()); + node.start(); + + OrderServiceClient orderServiceClient = ((SCAClient)node).getService(OrderServiceClient.class, "ClientComponent"); + + // do something + orderServiceClient.doSomeOrdering(); + + // wait to give the service time to respond + Thread.sleep(500); + + node.stop(); + } + +} diff --git a/branches/sca-java-1.4/tutorials/store/README b/branches/sca-java-1.4/tutorials/store/README index c90604b1a5..3bf9db22f2 100644 --- a/branches/sca-java-1.4/tutorials/store/README +++ b/branches/sca-java-1.4/tutorials/store/README @@ -16,7 +16,7 @@ Running The Tutorial Application Start the SCA Domain Manager: cd domain - java -jar ../../modules/tuscany-node-launcher-1.4.jar domain + java -jar ../../../modules/tuscany-node-launcher-1.4.jar domain To access the SCA Manager application, point your Web browser to: http://localhost:9990/ui/cloud/ -- cgit v1.2.3