Author: antelder
Date: Thu Oct 14 09:34:47 2010
New Revision: 1022443
URL: http://svn.apache.org/viewvc?rev=1022443&view=rev
Log:
Start to get rid of shades and replace with the aggregate jars. This moves the
shades/base and base-nodep out of shades and into distribution/aggregates and
updates to use those. The remaining ones in shades i think can probably just be
deleted but i'll do that in separate steps.
Added:
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/
- copied from r1022235, tuscany/sca-java-2.x/trunk/shades/base/
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/
- copied from r1022235, tuscany/sca-java-2.x/trunk/shades/base-nodep/
Removed:
tuscany/sca-java-2.x/trunk/shades/base/
tuscany/sca-java-2.x/trunk/shades/base-nodep/
Modified:
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml
tuscany/sca-java-2.x/trunk/distribution/pom.xml
tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml
tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml
tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml
tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/jms/pom.xml
tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/json/pom.xml
tuscany/sca-java-2.x/trunk/shades/pom.xml
tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/spring/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
tuscany/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/T3558/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml
tuscany/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml?rev=1022443&r1=1022235&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
Thu Oct 14 09:34:47 2010
@@ -26,9 +26,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
- <name>Apache Tuscany SCA Base Jar including dependencies</name>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
+ <name>Apache Tuscany SCA Base Runtime Jar including dependencies</name>
<dependencies>
<dependency>
Modified:
tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml?rev=1022443&r1=1022235&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml
Thu Oct 14 09:34:47 2010
@@ -26,9 +26,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
- <name>Apache Tuscany SCA Base Jar</name>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
+ <name>Apache Tuscany SCA Base Runtime Jar</name>
<dependencies>
Modified: tuscany/sca-java-2.x/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/pom.xml Thu Oct 14 09:34:47 2010
@@ -31,6 +31,8 @@
<name>Apache Tuscany SCA Distributions</name>
<modules>
+ <module>aggregations/base-runtime</module>
+ <module>aggregations/base-runtime-nodep</module>
<module>aggregations/base-runtime-aggregation</module>
<module>aggregations/binding-rmi-runtime-aggregation</module>
<module>aggregations/binding-ws-runtime-axis2-aggregation</module>
Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml Thu Oct
14 09:34:47 2010
@@ -47,8 +47,8 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<!--
Modified: tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/pom.xml Thu Oct 14
09:34:47 2010
@@ -50,8 +50,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
Thu Oct 14 09:34:47 2010
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
Thu Oct 14 09:34:47 2010
@@ -1,56 +1,56 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-binding-comet</artifactId>
- <packaging>war</packaging>
- <version>1.0</version>
- <name>Apache Tuscany SCA Sample binding.comet</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-comet-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-web-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
-
+<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-samples</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-binding-comet</artifactId>
+ <packaging>war</packaging>
+ <version>1.0</version>
+ <name>Apache Tuscany SCA Sample binding.comet</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-comet-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
Thu Oct 14 09:34:47 2010
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
Thu Oct 14 09:34:47 2010
@@ -34,8 +34,8 @@
<!-- Tuscany dependency -->
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml
Thu Oct 14 09:34:47 2010
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml
Thu Oct 14 09:34:47 2010
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml
Thu Oct 14 09:34:47 2010
@@ -33,8 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml
Thu Oct 14 09:34:47 2010
@@ -34,8 +34,8 @@
<!-- Tuscany dependencies -->
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient-contribution/pom.xml
Thu Oct 14 09:34:47 2010
@@ -32,8 +32,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient-contribution/pom.xml
Thu Oct 14 09:34:47 2010
@@ -32,8 +32,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml
(original)
+++
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml
Thu Oct 14 09:34:47 2010
@@ -30,8 +30,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/bpel-nodep/pom.xml Thu Oct 14 09:34:47
2010
@@ -43,8 +43,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/bpel/pom.xml Thu Oct 14 09:34:47 2010
@@ -93,8 +93,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/jms-nodep/pom.xml Thu Oct 14 09:34:47 2010
@@ -74,8 +74,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/jms/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/jms/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/jms/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/jms/pom.xml Thu Oct 14 09:34:47 2010
@@ -85,8 +85,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/json-nodep/pom.xml Thu Oct 14 09:34:47
2010
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/json/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/json/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/json/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/json/pom.xml Thu Oct 14 09:34:47 2010
@@ -128,8 +128,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/pom.xml Thu Oct 14 09:34:47 2010
@@ -31,8 +31,6 @@
<name>Apache Tuscany SCA Shaded Jars</name>
<modules>
- <module>base</module>
- <module>base-nodep</module>
<module>jms</module>
<module>json</module>
<module>json-nodep</module>
Modified: tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml Thu Oct 14 09:34:47
2010
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/spring/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/spring/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/spring/pom.xml Thu Oct 14 09:34:47 2010
@@ -72,8 +72,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml Thu Oct 14
09:34:47 2010
@@ -37,8 +37,8 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml Thu Oct 14 09:34:47
2010
@@ -169,8 +169,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/testing/compliance-tests/binding-jms/pom.xml Thu
Oct 14 09:34:47 2010
@@ -39,8 +39,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/T3558/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/T3558/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/T3558/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/T3558/pom.xml Thu Oct 14 09:34:47
2010
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml Thu Oct
14 09:34:47 2010
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/domains/distributed/pom.xml Thu
Oct 14 09:34:47 2010
@@ -30,8 +30,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml Thu
Oct 14 09:34:47 2010
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/launcher-base/pom.xml Thu Oct
14 09:34:47 2010
@@ -31,8 +31,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml?rev=1022443&r1=1022442&r2=1022443&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml Thu Oct
14 09:34:47 2010
@@ -1,53 +1,53 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-jsonp-webapp</artifactId>
- <packaging>war</packaging>
- <version>1.0</version>
- <name>jsonp-webapp</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonp-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>jsonp-webapp</finalName>
- </build>
-</project>
-
+<?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 xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sample-jsonp-webapp</artifactId>
+ <packaging>war</packaging>
+ <version>1.0</version>
+ <name>jsonp-webapp</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-base-runtime-nodep</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonp-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>jsonp-webapp</finalName>
+ </build>
+</project>
+
