You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/01/28 01:24:23 UTC

svn commit: r500709 - in /incubator/tuscany/java: samples/sca/helloworldRuby/ sca/extensions/ruby/ sca/extensions/ruby/container/ sca/extensions/ruby/container/src/main/resources/META-INF/sca/ sca/extensions/ruby/samples/ sca/extensions/ruby/samples/he...

Author: antelder
Date: Sat Jan 27 16:24:22 2007
New Revision: 500709

URL: http://svn.apache.org/viewvc?view=rev&rev=500709
Log:
Move Ruby helloworld sample to extensions and fix up

Added:
    incubator/tuscany/java/sca/extensions/ruby/pom.xml   (with props)
    incubator/tuscany/java/sca/extensions/ruby/samples/
    incubator/tuscany/java/sca/extensions/ruby/samples/helloworld/
      - copied from r500671, incubator/tuscany/java/samples/sca/helloworldRuby/
    incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml   (with props)
Removed:
    incubator/tuscany/java/samples/sca/helloworldRuby/
Modified:
    incubator/tuscany/java/sca/extensions/ruby/   (props changed)
    incubator/tuscany/java/sca/extensions/ruby/container/pom.xml
    incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl
    incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl
    incubator/tuscany/java/sca/extensions/ruby/samples/helloworld/pom.xml

Propchange: incubator/tuscany/java/sca/extensions/ruby/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan 27 16:24:22 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+

Modified: incubator/tuscany/java/sca/extensions/ruby/container/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/container/pom.xml?view=diff&rev=500709&r1=500708&r2=500709
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/container/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/ruby/container/pom.xml Sat Jan 27 16:24:22 2007
@@ -20,13 +20,13 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.sca.services.containers</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.ruby</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>ruby</artifactId>
+    <artifactId>tuscany-ruby</artifactId>
     <name>Apache Tuscany Ruby Container</name>
     <description>Apache Tuscany Ruby Container</description>
 
@@ -34,26 +34,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-spi</artifactId>
-				<version>0.1-pre-spec-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
            <groupId>org.jruby</groupId>
            <artifactId>jruby</artifactId>
            <version>0.9.1</version>
-            <scope>compile</scope>
+           <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.services.idl</groupId>
             <artifactId>wsdl</artifactId>
-            <version>${sca.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>test</artifactId>
-				<version>0.1-pre-spec-SNAPSHOT</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
@@ -66,8 +60,6 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>

Modified: incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=500709&r1=500708&r2=500709
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl Sat Jan 27 16:24:22 2007
@@ -26,8 +26,8 @@
            name="org.apache.tuscany.launcher.RubyImplementation">
 
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.containers</group>
-        <name>ruby</name>
+        <group>org.apache.tuscany.sca.extensions.ruby</group>
+        <name>tuscany-ruby</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>
 

Modified: incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl?view=diff&rev=500709&r1=500708&r2=500709
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl (original)
+++ incubator/tuscany/java/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl Sat Jan 27 16:24:22 2007
@@ -26,8 +26,8 @@
            name="org.apache.tuscany.launcher.RubyImplementation">
 
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
-        <group>org.apache.tuscany.sca.services.containers</group>
-        <name>ruby</name>
+        <group>org.apache.tuscany.sca.extensions.ruby</group>
+        <name>tuscany-ruby</name>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>
 

Added: incubator/tuscany/java/sca/extensions/ruby/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/pom.xml?view=auto&rev=500709
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/ruby/pom.xml Sat Jan 27 16:24:22 2007
@@ -0,0 +1,71 @@
+<?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.    
+-->
+<project>
+
+    <parent>
+        <groupId>org.apache.tuscany.sca.extensions</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0-incubator-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.sca.extensions.ruby</groupId>
+    <artifactId>parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Ruby Extension</name>
+
+    <modules>
+        <module>container</module>
+        <module>samples</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+
+           <dependency>
+              <groupId>org.apache.tuscany.sca.services.idl</groupId>
+              <artifactId>wsdl</artifactId>
+               <version>${tuscanyKernelVersion}</version>
+              <scope>compile</scope>
+           </dependency>
+
+           <dependency>
+              <groupId>cglib</groupId>
+              <artifactId>cglib-nodep</artifactId>
+              <version>2.1_3</version>
+              <scope>compile</scope>
+           </dependency>
+
+           <dependency>
+              <groupId>org.apache.ws.commons.axiom</groupId>
+              <artifactId>axiom-api</artifactId>
+              <version>1.2.2</version>
+          </dependency>
+
+          <dependency>
+             <groupId>org.apache.ws.commons.axiom</groupId>
+             <artifactId>axiom-impl</artifactId>
+              <version>1.2.2</version>
+          </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>

Propchange: incubator/tuscany/java/sca/extensions/ruby/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/extensions/ruby/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/extensions/ruby/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/tuscany/java/sca/extensions/ruby/samples/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/samples/helloworld/pom.xml?view=diff&rev=500709&r1=500671&r2=500709
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/samples/helloworld/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/ruby/samples/helloworld/pom.xml Sat Jan 27 16:24:22 2007
@@ -19,7 +19,7 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <groupId>org.apache.tuscany.sca.extensions.ruby.samples</groupId>
         <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
@@ -37,13 +37,11 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>test</artifactId>
-            <version>${tuscanyVersion}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sca.services.containers</groupId>
-            <artifactId>ruby</artifactId>
-            <version>${tuscanyVersion}</version>
+            <groupId>org.apache.tuscany.sca.extensions.ruby</groupId>
+            <artifactId>tuscany-ruby</artifactId>
+            <version>${extensionVersion}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Added: incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml?view=auto&rev=500709
==============================================================================
--- incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml Sat Jan 27 16:24:22 2007
@@ -0,0 +1,102 @@
+<?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.    
+-->
+<project>
+
+    <parent>
+        <groupId>org.apache.tuscany.sca.extensions.ruby</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0-incubator-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany.sca.extensions.ruby.samples</groupId>
+    <artifactId>parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Tuscany Samples for the Ruby extension</name>
+
+    <!-- definition of repositories where the parent pom can be found -->
+    <repositories>
+        <repository>
+            <id>apache.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>apache.incubator</id>
+            <name>Apache Incubator Repository</name>
+            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <modules>
+        <module>helloworld</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.apache.tuscany.distribution.sca</groupId>
+                            <artifactId>standalone</artifactId>
+                            <version>${scaImplVersion}</version>
+                            <classifier>bin</classifier>
+                            <type>zip</type>
+                        </artifactItem>
+                    </artifactItems>
+                    <outputDirectory>${project.build.directory}/distribution</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.osoa</groupId>
+                <artifactId>sca-api-r${specVersion}</artifactId>
+                <version>${scaVersion}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>test</artifactId>
+                <version>${scaImplVersion}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+</project>

Propchange: incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/tuscany/java/sca/extensions/ruby/samples/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org