You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/12/20 18:48:03 UTC
svn commit: r489158 - in /incubator/tuscany/java:
distribution/sca/standalone/ distribution/sca/standalone/src/main/assembly/
sca/commands/launcher/
sca/plugins/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/
sca/runtime/ sca/runt...
Author: jboynes
Date: Wed Dec 20 09:48:02 2006
New Revision: 489158
URL: http://svn.apache.org/viewvc?view=rev&rev=489158
Log:
group standalone modules together
Added:
incubator/tuscany/java/sca/runtime/standalone/
incubator/tuscany/java/sca/runtime/standalone/pom.xml (with props)
incubator/tuscany/java/sca/runtime/standalone/standalone-api/
- copied from r489142, incubator/tuscany/java/sca/runtime/standalone-api/
incubator/tuscany/java/sca/runtime/standalone/standalone-api/LICENSE.txt
- copied unchanged from r489157, incubator/tuscany/java/sca/runtime/standalone-api/LICENSE.txt
incubator/tuscany/java/sca/runtime/standalone/standalone-api/NOTICE.txt
- copied unchanged from r489157, incubator/tuscany/java/sca/runtime/standalone-api/NOTICE.txt
incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml
- copied, changed from r489157, incubator/tuscany/java/sca/runtime/standalone-api/pom.xml
incubator/tuscany/java/sca/runtime/standalone/standalone-api/src/
- copied from r489157, incubator/tuscany/java/sca/runtime/standalone-api/src/
incubator/tuscany/java/sca/runtime/standalone/standalone-host/
- copied from r489120, incubator/tuscany/java/sca/runtime/standalone-host/
incubator/tuscany/java/sca/runtime/standalone/standalone-host/LICENSE.txt
- copied unchanged from r489157, incubator/tuscany/java/sca/runtime/standalone-host/LICENSE.txt
incubator/tuscany/java/sca/runtime/standalone/standalone-host/NOTICE.txt
- copied unchanged from r489157, incubator/tuscany/java/sca/runtime/standalone-host/NOTICE.txt
incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml
- copied, changed from r489157, incubator/tuscany/java/sca/runtime/standalone-host/pom.xml
incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/
- copied from r489157, incubator/tuscany/java/sca/runtime/standalone-host/src/
Removed:
incubator/tuscany/java/sca/runtime/standalone-api/
incubator/tuscany/java/sca/runtime/standalone-host/
Modified:
incubator/tuscany/java/distribution/sca/standalone/pom.xml
incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
incubator/tuscany/java/sca/commands/launcher/pom.xml
incubator/tuscany/java/sca/plugins/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java
incubator/tuscany/java/sca/runtime/pom.xml
Modified: incubator/tuscany/java/distribution/sca/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/standalone/pom.xml?view=diff&rev=489158&r1=489157&r2=489158
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/pom.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/pom.xml Wed Dec 20 09:48:02 2006
@@ -63,12 +63,12 @@
<dependencies>
<!-- dependencies for base distribution -->
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-host</artifactId>
<version>${sca.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
<version>${sca.version}</version>
</dependency>
Modified: incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml?view=diff&rev=489158&r1=489157&r2=489158
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml Wed Dec 20 09:48:02 2006
@@ -65,10 +65,10 @@
<include>org.osoa:sca-api</include>
<include>org.apache.tuscany.sca.kernel:tuscany-api</include>
<include>org.apache.tuscany.sca.kernel:tuscany-host-api</include>
- <include>org.apache.tuscany.sca.runtime:standalone-api</include>
+ <include>org.apache.tuscany.sca.runtime.standalone:standalone-api</include>
</includes>
<excludes>
- <exclude>org.apache.tuscany.sca.runtime:standalone-host</exclude>
+ <exclude>org.apache.tuscany.sca.runtime.standalone:standalone-host</exclude>
</excludes>
<fileMode>644</fileMode>
</dependencySet>
@@ -78,7 +78,7 @@
<outputDirectory>boot</outputDirectory>
<scope>runtime</scope>
<includes>
- <include>org.apache.tuscany.sca.runtime:standalone-host</include>
+ <include>org.apache.tuscany.sca.runtime.standalone:standalone-host</include>
<include>org.apache.tuscany.sca.kernel:core</include>
<include>org.apache.tuscany.sca.kernel:tuscany-spi</include>
<include>org.apache.tuscany.sca.services:maven</include>
Modified: incubator/tuscany/java/sca/commands/launcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/pom.xml?view=diff&rev=489158&r1=489157&r2=489158
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/pom.xml (original)
+++ incubator/tuscany/java/sca/commands/launcher/pom.xml Wed Dec 20 09:48:02 2006
@@ -38,7 +38,7 @@
<artifactId>sca-api-r0.95</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sca/plugins/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java?view=diff&rev=489158&r1=489157&r2=489158
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java (original)
+++ incubator/tuscany/java/sca/plugins/plugin.standalone/src/main/java/org/apache/tuscany/plugin/standalone/Dependency.java Wed Dec 20 09:48:02 2006
@@ -39,7 +39,8 @@
*/
private static final Dependency[] DEFAULT_BOOT_LIBS =
new Dependency[] {
- new Dependency("org.apache.tuscany.sca.runtime", "standalone-host",
+ new Dependency("org.apache.tuscany.sca.runtime.standalone",
+ "standalone-host",
"1.0-incubator-SNAPSHOT"),
// HACK to force servlet-api
new Dependency("javax.servlet", "servlet-api", "2.4")};
Modified: incubator/tuscany/java/sca/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/pom.xml?view=diff&rev=489158&r1=489157&r2=489158
==============================================================================
--- incubator/tuscany/java/sca/runtime/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/pom.xml Wed Dec 20 09:48:02 2006
@@ -34,8 +34,7 @@
<modules>
<module>webapp</module>
<module>webapp-host</module>
- <module>standalone-api</module>
- <module>standalone-host</module>
+ <module>standalone</module>
</modules>
</project>
Added: incubator/tuscany/java/sca/runtime/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/pom.xml?view=auto&rev=489158
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/pom.xml (added)
+++ incubator/tuscany/java/sca/runtime/standalone/pom.xml Wed Dec 20 09:48:02 2006
@@ -0,0 +1,39 @@
+<?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.runtime</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <artifactId>standalone</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany Standalone SCA Runtime</name>
+
+ <modules>
+ <module>standalone-api</module>
+ <module>standalone-host</module>
+ </modules>
+
+</project>
Propchange: incubator/tuscany/java/sca/runtime/standalone/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/runtime/standalone/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml (from r489157, incubator/tuscany/java/sca/runtime/standalone-api/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml?view=diff&rev=489158&p1=incubator/tuscany/java/sca/runtime/standalone-api/pom.xml&r1=489157&p2=incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml&r2=489158
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone-api/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-api/pom.xml Wed Dec 20 09:48:02 2006
@@ -19,8 +19,8 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <artifactId>standalone</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Copied: incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml (from r489157, incubator/tuscany/java/sca/runtime/standalone-host/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml?view=diff&rev=489158&p1=incubator/tuscany/java/sca/runtime/standalone-host/pom.xml&r1=489157&p2=incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml&r2=489158
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone-host/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/pom.xml Wed Dec 20 09:48:02 2006
@@ -19,8 +19,8 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
+ <artifactId>standalone</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org