You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/02/08 09:35:54 UTC

svn commit: r742021 - in /tuscany/java/sca/samples/binding-ws-calculator: README src/main/java/sample/SampleClientImpl.java src/main/resources/META-INF/ src/main/resources/META-INF/sca-contribution.xml

Author: lresende
Date: Sun Feb  8 08:35:54 2009
New Revision: 742021

URL: http://svn.apache.org/viewvc?rev=742021&view=rev
Log:
Adding sca-contribution to allow same sample client to run from ant and command line without modifications plus some updates to README

Added:
    tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/
    tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml   (with props)
Modified:
    tuscany/java/sca/samples/binding-ws-calculator/README
    tuscany/java/sca/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java

Modified: tuscany/java/sca/samples/binding-ws-calculator/README
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-ws-calculator/README?rev=742021&r1=742020&r2=742021&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-ws-calculator/README (original)
+++ tuscany/java/sca/samples/binding-ws-calculator/README Sun Feb  8 08:35:54 2009
@@ -13,11 +13,11 @@
 
 OR if you don't have ant, on Windows do
 
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
+java -cp ..\..\features\tuscany-sca-manifest.jar;target\sample-binding-ws-calculator.jar sample.SampleClientImpl
 
 and on *nix do
 
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
+java -cp ../../features/tuscany-sca-manifest.jar:target/sample-binding-ws-calculator.jar sample.SampleClientImpl
 
 Sample Overview
 ---------------

Modified: tuscany/java/sca/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java?rev=742021&r1=742020&r2=742021&view=diff
==============================================================================
--- tuscany/java/sca/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java (original)
+++ tuscany/java/sca/samples/binding-ws-calculator/src/main/java/sample/SampleClientImpl.java Sun Feb  8 08:35:54 2009
@@ -19,7 +19,6 @@
 
 package sample;
 
-import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 
@@ -29,8 +28,8 @@
  */
 public class SampleClientImpl {
     public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.newInstance().createNode("Calculator.composite", 
-                                                         new Contribution("c1", "target/classes"));
+        Node node = NodeFactory.newInstance().createNode();
+        
         node.start();
 
         SampleClient sampleClient = node.getService(SampleClient.class, "SampleClient");

Added: tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml?rev=742021&view=auto
==============================================================================
--- tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml Sun Feb  8 08:35:54 2009
@@ -0,0 +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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Calculator"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml