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 10:22:32 UTC
svn commit: r500766 - in /incubator/tuscany/java:
samples/sca/helloworld.rmiReference/ samples/sca/helloworld.rmiService/
sca/extensions/rmi/ sca/extensions/rmi/binding.rmi/
sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/
sca/extensions...
Author: antelder
Date: Sun Jan 28 01:22:31 2007
New Revision: 500766
URL: http://svn.apache.org/viewvc?view=rev&rev=500766
Log:
Move RMI samples to extensioon and fix up so extension works
Added:
incubator/tuscany/java/sca/extensions/rmi/pom.xml (with props)
incubator/tuscany/java/sca/extensions/rmi/samples/
incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiReference/
- copied from r500722, incubator/tuscany/java/samples/sca/helloworld.rmiReference/
incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiService/
- copied from r500722, incubator/tuscany/java/samples/sca/helloworld.rmiService/
incubator/tuscany/java/sca/extensions/rmi/samples/pom.xml (with props)
Removed:
incubator/tuscany/java/samples/sca/helloworld.rmiReference/
incubator/tuscany/java/samples/sca/helloworld.rmiService/
Modified:
incubator/tuscany/java/sca/extensions/rmi/ (props changed)
incubator/tuscany/java/sca/extensions/rmi/binding.rmi/pom.xml
incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl
incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml
incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml
Propchange: incubator/tuscany/java/sca/extensions/rmi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jan 28 01:22:31 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/rmi/binding.rmi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/binding.rmi/pom.xml?view=diff&rev=500766&r1=500765&r2=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/binding.rmi/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/rmi/binding.rmi/pom.xml Sun Jan 28 01:22:31 2007
@@ -22,13 +22,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.extensions.rmi</groupId>
<artifactId>parent</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>rmi</artifactId>
+ <artifactId>tuscany-rmi</artifactId>
<name>Apache Tuscany Binding for Java RMI</name>
<description>Implementation of the SCA RMI Binding</description>
@@ -42,14 +42,10 @@
<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.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>0.1-pre-spec-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=500766&r1=500765&r2=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/default.scdl Sun Jan 28 01:22:31 2007
@@ -28,9 +28,9 @@
name="org.apache.tuscany.binding.rmi">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
- <group>org.apache.tuscany.sca.services.bindings</group>
- <name>rmi</name>
- <version>1.0-incubator-M2-SNAPSHOT</version>
+ <group>org.apache.tuscany.sca.extensions.rmi</group>
+ <name>tuscany-rmi</name>
+ <version>1.0-incubator-SNAPSHOT</version>
</dependency>
<component name="binding.rmi.bindingLoader">
Modified: incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl?view=diff&rev=500766&r1=500765&r2=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl (original)
+++ incubator/tuscany/java/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl Sun Jan 28 01:22:31 2007
@@ -28,9 +28,9 @@
name="org.apache.tuscany.binding.rmi">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
- <group>org.apache.tuscany.sca.services.bindings</group>
- <name>rmi</name>
- <version>1.0-incubator-M2-SNAPSHOT</version>
+ <group>org.apache.tuscany.sca.extensions.rmi</group>
+ <name>tuscany-rmi</name>
+ <version>1.0-incubator-SNAPSHOT</version>
</dependency>
<component name="binding.rmi.bindingLoader">
Added: incubator/tuscany/java/sca/extensions/rmi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/pom.xml?view=auto&rev=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/rmi/pom.xml Sun Jan 28 01:22:31 2007
@@ -0,0 +1,45 @@
+<?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.rmi</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Tuscany RMI Extension</name>
+
+ <modules>
+ <module>binding.rmi</module>
+ <module>samples</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Propchange: incubator/tuscany/java/sca/extensions/rmi/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/extensions/rmi/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/extensions/rmi/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml?view=diff&rev=500766&r1=500722&r2=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiReference/pom.xml Sun Jan 28 01:22:31 2007
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
+ <groupId>org.apache.tuscany.sca.extensions.rmi.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.bindings</groupId>
- <artifactId>rmi</artifactId>
- <version>${tuscanyVersion}</version>
+ <groupId>org.apache.tuscany.sca.extensions.rmi</groupId>
+ <artifactId>tuscany-rmi</artifactId>
+ <version>${extensionVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml?view=diff&rev=500766&r1=500722&r2=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/rmi/samples/helloworld.rmiService/pom.xml Sun Jan 28 01:22:31 2007
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
+ <groupId>org.apache.tuscany.sca.extensions.rmi.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.bindings</groupId>
- <artifactId>rmi</artifactId>
- <version>${tuscanyVersion}</version>
+ <groupId>org.apache.tuscany.sca.extensions.rmi</groupId>
+ <artifactId>tuscany-rmi</artifactId>
+ <version>${extensionVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
Added: incubator/tuscany/java/sca/extensions/rmi/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/rmi/samples/pom.xml?view=auto&rev=500766
==============================================================================
--- incubator/tuscany/java/sca/extensions/rmi/samples/pom.xml (added)
+++ incubator/tuscany/java/sca/extensions/rmi/samples/pom.xml Sun Jan 28 01:22:31 2007
@@ -0,0 +1,103 @@
+<?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.rmi</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.extensions.rmi.samples</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Tuscany Samples for the RMI 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.rmiService</module>
+ <module>helloworld.rmiReference</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/rmi/samples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/extensions/rmi/samples/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/tuscany/java/sca/extensions/rmi/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