tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fm...@apache.org
Subject svn commit: r1003399 - in /tuscany/sca-java-2.x/trunk/samples/learning-more: binding-comet/ binding-jms/ binding-jms/helloworld-jms/ binding-jsonrpc/ binding-jsonrpc/calculator-contribution/ binding-jsonrpc/calculator-webapp/ binding-jsonrpc/contributi...
Date Fri, 01 Oct 2010 06:15:11 GMT
Author: fmoga
Date: Fri Oct  1 06:15:10 2010
New Revision: 1003399

URL: http://svn.apache.org/viewvc?rev=1003399&view=rev
Log:
Changed contribution-* samples to *-contribution.

Added:
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/   (props
changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/helloworld-jms/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml   (contents, props
changed)
      - copied, changed from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/
  (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/  
(props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/
  (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/
  (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/
  (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/ 
 (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/
    tuscany/sca-java-2.x/trunk/samples/learning-more/helloworld-scribe/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/logging-scribe/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/
  (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/
  (props changed)
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/
    tuscany/sca-java-2.x/trunk/samples/learning-more/weather-webapp/
      - copied from r1003389, tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/
Removed:
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/contribution-calculator-webapp/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-reference/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/contribution-calculator-service/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/contribution-helloworld-ws-sdo/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/contribution-helloworld-bpel/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/contribution-calculator/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jms/
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-webapp/
    tuscany/sca-java-2.x/trunk/samples/learning-more/logging-scribe/
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/contribution-helloworld-scaclient/
Modified:
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,19 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+activemq-data
+maven-eclipse.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-jms:671193

Copied: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml (from r1003389,
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml?p2=tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml&p1=tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml&r1=1003389&r2=1003399&rev=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml Fri Oct  1 06:15:10
2010
@@ -25,9 +25,9 @@
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>tuscany-sample-binding-jsonrpc</artifactId>
+    <artifactId>tuscany-sample-binding-jms</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Sample binding.jsonrpc</name>
+    <name>Apache Tuscany SCA Sample binding.jms</name>
 
     <profiles>
         <profile>
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator</module>
+                <module>helloworld-jms</module>
             </modules>
         </profile>
     </profiles>    

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-jsonrpc/pom.xml:671193

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-jsonrpc/contribution-calculator:671193

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-jsonrpc/contribution-calculator-webapp:671193

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml Fri Oct  1 06:15:10
2010
@@ -36,7 +36,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator</module>
+                <module>calculator-contribution</module>
+                <module>calculator-webapp</module>
             </modules>
         </profile>
     </profiles>    

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,16 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+build.xml
+.externalToolBuilders
+maven-eclipse.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-rmi/contribution-calculator-reference:671193

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-rmi/contribution-calculator-service:671193

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml Fri Oct  1 06:15:10
2010
@@ -36,8 +36,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator-reference</module>
-                <module>contribution-calculator-service</module>
+                <module>calculator-reference-contribution</module>
+                <module>calculator-service-contribution</module>
             </modules>
         </profile>
     </profiles>    

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-sca/contribution-calculator:671193

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml Fri Oct  1 06:15:10
2010
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator</module>
+                <module>calculator-contribution</module>
             </modules>
         </profile>
     </profiles>    

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/binding-ws/contribution-calculator:671193

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml Fri Oct  1 06:15:10
2010
@@ -36,7 +36,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator</module>
+                <module>calculator-contribution</module>
+                <module>helloworld-ws-sdo-contribution</module>
             </modules>
         </profile>
     </profiles>    

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml Fri Oct 
1 06:15:10 2010
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-helloworld-bpel</module>
+                <module>helloworld-bpel-contribution</module>
                 <module>helloworld-bpel-webapp</module>
             </modules>
         </profile>

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/implementation-java/contribution-calculator:671193

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml Fri Oct 
1 06:15:10 2010
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator</module>
+                <module>calculator-contribution</module>
             </modules>
         </profile>
     </profiles>    

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  1 06:15:10 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Propchange: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  1 06:15:10 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/implementation-script/contribution-calculator:671193

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml Fri Oct
 1 06:15:10 2010
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-calculator</module>
+                <module>calculator-contribution</module>
             </modules>
         </profile>
     </profiles>    

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java?rev=1003399&r1=1003389&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
(original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
Fri Oct  1 06:15:10 2010
@@ -1,48 +1,48 @@
-/*
- * 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.    
- */
-package sample;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloworldClientImpl implements Helloworld {
-    private Helloworld helloworld;
-
-    // SCA reference
-    @Reference(required = false)
-    private DateService dateService;
-
-    public HelloworldClientImpl() {
-        System.out.println("HelloworldClientImpl()");
-    }
-
-    public String sayHello(String name) {
-        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
-        if (dateService == null) {
-            return "Hello " + name;
-        }
-        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
-    }
-
-    // Setter for spring injection
-    public void setHelloworld(Helloworld helloworld) {
-        System.out.println("Injected with " + helloworld);
-        this.helloworld = helloworld;
-    }
-
-}
+/*
+ * 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.    
+ */
+package sample;
+
+import org.oasisopen.sca.annotation.Reference;
+
+public class HelloworldClientImpl implements Helloworld {
+    private Helloworld helloworld;
+
+    // SCA reference
+    @Reference(required = false)
+    private DateService dateService;
+
+    public HelloworldClientImpl() {
+        System.out.println("HelloworldClientImpl()");
+    }
+
+    public String sayHello(String name) {
+        System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
+        if (dateService == null) {
+            return "Hello " + name;
+        }
+        return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
+    }
+
+    // Setter for spring injection
+    public void setHelloworld(Helloworld helloworld) {
+        System.out.println("Injected with " + helloworld);
+        this.helloworld = helloworld;
+    }
+
+}

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml?rev=1003399&r1=1003389&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
(original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
Fri Oct  1 06:15:10 2010
@@ -1,37 +1,37 @@
-<?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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
-    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
-        <property name="helloworld">
-            <ref bean="HelloworldBean"/>
-        </property>
-    </bean>
-    
-    <!-- 
-    <sca:reference name="dateService" type="sample.DateService"/>
-    -->
-
+<?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.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+    <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
+        <property name="helloworld">
+            <ref bean="HelloworldBean"/>
+        </property>
+    </bean>
+    
+    <!-- 
+    <sca:reference name="dateService" type="sample.DateService"/>
+    -->
+
 </beans>
\ No newline at end of file

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml Fri Oct
 1 06:15:10 2010
@@ -36,7 +36,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>contribution-helloworld-spring</module>
+                <module>helloworld-spring-contribution</module>
                 <module>helloworld-spring-webapp</module>
             </modules>
         </profile>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml?rev=1003399&r1=1003389&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml Fri Oct  1
06:15:10 2010
@@ -37,7 +37,6 @@
             </activation>
             <modules>
                 <module>helloworld-jaxrs</module>
-                <module>helloworld-jms</module>
                 <module>helloworld-js-client</module>
                 <module>helloworld-jsf</module>
                 <module>helloworld-jsp</module>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml?rev=1003399&r1=1003398&r2=1003399&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml Fri Oct  1 06:15:10
2010
@@ -38,7 +38,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>calculator-scaclient</module>
+                <module>helloworld-scaclient-contribution</module>
+                <module>calculator-scaclient-contribution</module>
             </modules>
         </profile>
     </profiles>    



Mime
View raw message