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/09/16 22:47:43 UTC
svn commit: r446951 [1/2] - in /incubator/tuscany/java: ./ das/
distribution/ distribution/das-samples/ distribution/das/ distribution/sca/
distribution/sca/standalone/ distribution/sca/standalone/src/main/assembly/
distribution/sdo/ distribution/sdo/s...
Author: jboynes
Date: Sat Sep 16 13:47:41 2006
New Revision: 446951
URL: http://svn.apache.org/viewvc?view=rev&rev=446951
Log:
make pom inheritance hierarchy match directory hierarchy
assumes that sca extensions will move under services
Added:
incubator/tuscany/java/distribution/pom.xml (with props)
incubator/tuscany/java/distribution/sca/pom.xml (with props)
incubator/tuscany/java/samples/pom.xml (with props)
incubator/tuscany/java/sca/commands/pom.xml (with props)
incubator/tuscany/java/sca/idl/pom.xml (with props)
incubator/tuscany/java/sca/runtime/pom.xml (with props)
Removed:
incubator/tuscany/java/sca/bindings/binding.celtix/src/main/assembly/
Modified:
incubator/tuscany/java/das/pom.xml
incubator/tuscany/java/distribution/das/ (props changed)
incubator/tuscany/java/distribution/das-samples/ (props changed)
incubator/tuscany/java/distribution/das-samples/pom.xml
incubator/tuscany/java/distribution/das/pom.xml
incubator/tuscany/java/distribution/sca/standalone/pom.xml
incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
incubator/tuscany/java/distribution/sdo/pom.xml
incubator/tuscany/java/distribution/sdo/src/main/assembly/sdo.xml
incubator/tuscany/java/pom.xml
incubator/tuscany/java/samples/das/companyweb/pom.xml
incubator/tuscany/java/samples/das/pom.xml
incubator/tuscany/java/samples/sca/calculator/pom.xml
incubator/tuscany/java/samples/sca/echo.databinding/pom.xml
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
incubator/tuscany/java/samples/sca/pom.xml
incubator/tuscany/java/samples/sca/webapp/pom.xml
incubator/tuscany/java/samples/sdo/ (props changed)
incubator/tuscany/java/samples/sdo/pom.xml
incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml
incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml
incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml
incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml
incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml
incubator/tuscany/java/sca/bindings/pom.xml
incubator/tuscany/java/sca/bindings/sunjars/pom.xml
incubator/tuscany/java/sca/commands/launcher/pom.xml
incubator/tuscany/java/sca/containers/container.groovy/pom.xml
incubator/tuscany/java/sca/containers/container.javascript/pom.xml
incubator/tuscany/java/sca/containers/container.spring/pom.xml
incubator/tuscany/java/sca/containers/pom.xml
incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml
incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml
incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml
incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml
incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml
incubator/tuscany/java/sca/databinding/databinding-test/pom.xml
incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml
incubator/tuscany/java/sca/databinding/pom.xml
incubator/tuscany/java/sca/idl/wsdl/pom.xml
incubator/tuscany/java/sca/kernel/pom.xml
incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml
incubator/tuscany/java/sca/plugins/plugin.war/pom.xml
incubator/tuscany/java/sca/plugins/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java
incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml
incubator/tuscany/java/sca/plugins/pom.xml
incubator/tuscany/java/sca/pom.xml
incubator/tuscany/java/sca/runtime/equinox/pom.xml
incubator/tuscany/java/sca/runtime/osgi/pom.xml
incubator/tuscany/java/sca/runtime/webapp-host/pom.xml
incubator/tuscany/java/sca/runtime/webapp/pom.xml
incubator/tuscany/java/sca/services/pom.xml
incubator/tuscany/java/sca/test/pom.xml
incubator/tuscany/java/sca/tools/pom.xml
Modified: incubator/tuscany/java/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Sat Sep 16 13:47:41 2006
@@ -32,7 +32,6 @@
<modules>
<module>rdb</module>
- <module>../samples/das</module>
</modules>
<!-- definition of repositories where the parent pom can be found -->
Propchange: incubator/tuscany/java/distribution/das/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 16 13:47:41 2006
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Propchange: incubator/tuscany/java/distribution/das-samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 16 13:47:41 2006
@@ -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/distribution/das-samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/das-samples/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/distribution/das-samples/pom.xml (original)
+++ incubator/tuscany/java/distribution/das-samples/pom.xml Sat Sep 16 13:47:41 2006
@@ -1,59 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ * 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
*
- * Licensed 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
*
- * 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.
- -->
+ * 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>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.distribution</groupId>
+ <parent>
+ <groupId>org.apache.tuscany.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
<artifactId>das-samples</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany DAS Distribution</name>
<description>Tuscany Distribution for DAS.</description>
- <properties>
- <das.version>1.0-SNAPSHOT</das.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.samples.das</groupId>
<artifactId>sample-companyweb</artifactId>
- <version>${das.version}</version>
+ <version>${pom.version}</version>
<type>war</type>
</dependency>
</dependencies>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus-snapshot</id>
- <name>Codehaus Snapshot Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
<build>
<defaultGoal>install</defaultGoal>
Modified: incubator/tuscany/java/distribution/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/das/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/distribution/das/pom.xml (original)
+++ incubator/tuscany/java/distribution/das/pom.xml Sat Sep 16 13:47:41 2006
@@ -1,58 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ * 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
*
- * Licensed 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
*
- * 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.
- -->
+ * 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>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.distribution</groupId>
+ <parent>
+ <groupId>org.apache.tuscany.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
<artifactId>das</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany DAS Distribution</name>
<description>Tuscany Distribution for DAS.</description>
<properties>
- <sdo.version>1.0-SNAPSHOT</sdo.version>
+ <sdo.version>1.0-incubator-M2-SNAPSHOT</sdo.version>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshot</id>
+ <!-- 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/maven-snapshot-repository</url>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus-snapshot</id>
- <name>Codehaus Snapshot Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <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>
- </pluginRepository>
- </pluginRepositories>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das-rdb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<build>
<defaultGoal>install</defaultGoal>
Added: incubator/tuscany/java/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/pom.xml?view=auto&rev=446951
==============================================================================
--- incubator/tuscany/java/distribution/pom.xml (added)
+++ incubator/tuscany/java/distribution/pom.xml Sat Sep 16 13:47:41 2006
@@ -0,0 +1,84 @@
+<?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</groupId>
+ <artifactId>parent</artifactId>
+ <version>1-incubator-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Tuscany Distributions</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>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>codehaus-snapshot</id>
+ <name>Codehaus Snapshot Repository</name>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <modules>
+ <module>sdo</module>
+ <module>das</module>
+ <module>das-samples</module>
+ <module>sca</module>
+ </modules>
+</project>
Propchange: incubator/tuscany/java/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/distribution/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/distribution/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/pom.xml?view=auto&rev=446951
==============================================================================
--- incubator/tuscany/java/distribution/sca/pom.xml (added)
+++ incubator/tuscany/java/distribution/sca/pom.xml Sat Sep 16 13:47:41 2006
@@ -0,0 +1,63 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.tuscany.distribution.sca</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Tuscany SCA Distributions</name>
+ <description>Tuscany Distribution for SCA.</description>
+
+ <!-- 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>standalone</module>
+ </modules>
+</project>
Propchange: incubator/tuscany/java/distribution/sca/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/distribution/sca/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/pom.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/pom.xml Sat Sep 16 13:47:41 2006
@@ -19,7 +19,11 @@
-->
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany</groupId>
+ <parent>
+ <groupId>org.apache.tuscany.distribution.sca</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
<artifactId>standalone</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -30,6 +34,32 @@
<sca.version>1.0-incubator-M2-SNAPSHOT</sca.version>
</properties>
+ <!-- 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>
+
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
@@ -37,31 +67,12 @@
<version>${sca.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.commands</groupId>
<artifactId>launcher</artifactId>
<version>${sca.version}</version>
</dependency>
</dependencies>
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus-snapshot</id>
- <name>Codehaus Snapshot Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<defaultGoal>install</defaultGoal>
<plugins>
@@ -85,17 +96,4 @@
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <id>apache.incubator</id>
- <name>Apache Incubator Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
</project>
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=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml Sat Sep 16 13:47:41 2006
@@ -41,7 +41,7 @@
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
<includes>
- <include>org.apache.tuscany:launcher</include>
+ <include>org.apache.tuscany.sca.commands:launcher</include>
</includes>
<excludes>
<exclude>org.osoa:sca-api</exclude>
Modified: incubator/tuscany/java/distribution/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sdo/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/distribution/sdo/pom.xml (original)
+++ incubator/tuscany/java/distribution/sdo/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,11 +20,10 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.distribution</groupId>
<artifactId>parent</artifactId>
- <version>1-incubator-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
- <groupId>org.apache.tuscany.distribution</groupId>
<artifactId>sdo</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -64,25 +63,6 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus-snapshot</id>
- <name>Codehaus Snapshot Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
<build>
<defaultGoal>install</defaultGoal>
Modified: incubator/tuscany/java/distribution/sdo/src/main/assembly/sdo.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sdo/src/main/assembly/sdo.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/distribution/sdo/src/main/assembly/sdo.xml (original)
+++ incubator/tuscany/java/distribution/sdo/src/main/assembly/sdo.xml Sat Sep 16 13:47:41 2006
@@ -36,7 +36,7 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.tuscany:tuscany-sdo-impl</include>
+ <include>org.apache.tuscany.sdo:tuscany-sdo-impl</include>
</includes>
<fileMode>644</fileMode>
</dependencySet>
Modified: incubator/tuscany/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Sat Sep 16 13:47:41 2006
@@ -49,13 +49,9 @@
<module>spec</module>
<module>sdo</module>
<module>das</module>
- <module>sca/kernel</module>
<module>sca</module>
-<!--
- <module>samples/sca</module>
- <module>distribution/sca/standalone</module>
- <module>distribution/sca/web</module>
--->
+ <module>samples</module>
+ <module>distribution</module>
</modules>
</profile>
Modified: incubator/tuscany/java/samples/das/companyweb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/das/companyweb/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/das/companyweb/pom.xml (original)
+++ incubator/tuscany/java/samples/das/companyweb/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,8 +20,8 @@
<project>
<parent>
- <groupId>org.apache.tuscany.das.samples</groupId>
- <artifactId>tuscany-samples-das</artifactId>
+ <groupId>org.apache.tuscany.samples.das</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
Modified: incubator/tuscany/java/samples/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/das/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/das/pom.xml (original)
+++ incubator/tuscany/java/samples/das/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,12 +20,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das</artifactId>
+ <groupId>org.apache.tuscany.samples</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
- <groupId>org.apache.tuscany.das.samples</groupId>
- <artifactId>tuscany-samples-das</artifactId>
+ <groupId>org.apache.tuscany.samples.das</groupId>
+ <artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>Tuscany DAS Samples</name>
Added: incubator/tuscany/java/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/pom.xml?view=auto&rev=446951
==============================================================================
--- incubator/tuscany/java/samples/pom.xml (added)
+++ incubator/tuscany/java/samples/pom.xml Sat Sep 16 13:47:41 2006
@@ -0,0 +1,64 @@
+<?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</groupId>
+ <artifactId>parent</artifactId>
+ <version>1-incubator-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.samples</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Tuscany Samples</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>sdo</module>
+ <module>das</module>
+ <module>sca</module>
+ </modules>
+</project>
Propchange: incubator/tuscany/java/samples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/samples/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/samples/sca/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/calculator/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sca/calculator/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/calculator/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,7 +20,7 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,10 +35,8 @@
<artifactId>sca-api-r0.95</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>${sca.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/samples/sca/echo.databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.databinding/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/echo.databinding/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,13 +18,11 @@
* under the License.
-->
<project>
-
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-echo-databinding</artifactId>
<name>Echo DataBinding</name>
@@ -34,44 +32,44 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-spi</artifactId>
- <version>${sca.version}</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>${sca.version}</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-framework</artifactId>
- <version>${sca.version}</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-axiom</artifactId>
- <version>${sca.version}</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.idl</groupId>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
<artifactId>wsdl</artifactId>
- <version>${sca.version}</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>axiom-api</artifactId>
<version>SNAPSHOT</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.ws.commons</groupId>
@@ -82,19 +80,14 @@
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
+ <version>2.9.3</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,7 +20,7 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,28 +49,29 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-axiom</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
@@ -100,9 +101,8 @@
<finalName>sample-helloworldws-1.0-SNAPSHOT</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
<artifactId>tuscany-war-plugin</artifactId>
- <extensions>true</extensions>
<executions>
<execution>
<id>tuscany-war</id>
Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,7 +20,7 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,30 +40,23 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
- <version>${pom.version}</version>
+ <version>${tuscanyVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>${sca.version}</version>
+ <version>${tuscanyVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
+ <version>${tuscanyVersion}</version>
<scope>test</scope>
</dependency>
Modified: incubator/tuscany/java/samples/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sca/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/pom.xml Sat Sep 16 13:47:41 2006
@@ -19,33 +19,96 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>sca</artifactId>
+ <groupId>org.apache.tuscany.samples</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
+ <artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>Tuscany SCA Samples</name>
+ <properties>
+ <tuscanyVersion>1.0-incubator-M2-SNAPSHOT</tuscanyVersion>
+ <specVersion>0.95</specVersion>
+ </properties>
+
+ <!-- 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>calculator</module>
<module>webapp</module>
-<!--
- <module>helloworldJavaScript</module>
- <module>eagerinit</module>
- <module>local.wire</module>
- <module>local.wire.cdi</module>
- <module>supplychain</module>
- <module>bigbank</module>
- <module>echo.binding</module>
- <module>spring.simple</module>
- <module>helloworldws-celtix</module>
--->
<module>echo.databinding</module>
<module>helloworldwsclient</module>
<module>helloworldws</module>
+ <!--
+ <module>helloworldJavaScript</module>
+ <module>eagerinit</module>
+ <module>local.wire</module>
+ <module>local.wire.cdi</module>
+ <module>supplychain</module>
+ <module>bigbank</module>
+ <module>echo.binding</module>
+ <module>spring.simple</module>
+ <module>helloworldws-celtix</module>
+ -->
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api-r${specVersion}</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>test</artifactId>
+ <version>${tuscanyVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: incubator/tuscany/java/samples/sca/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/webapp/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sca/webapp/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/webapp/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,7 +20,7 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,15 +29,10 @@
<name>Apache Tuscany Simple WebApp Sample</name>
<description>A sample WebApplication showing how to include a Tuscany runtime.</description>
- <properties>
- <tuscanyVersion>1.0-incubator-M2-SNAPSHOT</tuscanyVersion>
- <specVersion>0.95</specVersion>
- </properties>
-
<dependencies>
<!-- including the Tuscany runtime will also include the SCA Spec API -->
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
@@ -46,9 +41,8 @@
<finalName>webapp</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.plugins</groupId>
<artifactId>tuscany-war-plugin</artifactId>
- <extensions>true</extensions>
<executions>
<execution>
<id>tuscany-war</id>
Propchange: incubator/tuscany/java/samples/sdo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 16 13:47:41 2006
@@ -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/samples/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sdo/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/samples/sdo/pom.xml (original)
+++ incubator/tuscany/java/samples/sdo/pom.xml Sat Sep 16 13:47:41 2006
@@ -1,48 +1,51 @@
-<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">
-
- <parent>
+<?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">
+
+ <parent>
<groupId>org.apache.tuscany.samples</groupId>
- <artifactId>tuscany-samples</artifactId>
- <version>incubating-M1</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.samples.sdo</groupId>
- <artifactId>sample-sdo</artifactId>
- <packaging>jar</packaging>
- <version>incubating-M1</version>
- <name>Tuscany SDO Samples</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api</artifactId>
- <version>incubating-M1</version>
- <scope>compile</scope>
- </dependency>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.samples.sdo</groupId>
+ <artifactId>sample-sdo</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <name>Tuscany SDO Sample</name>
+ <dependencies>
+ <dependency>
+ <groupId>commonj</groupId>
+ <artifactId>sdo-api-r2.0.1</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
- <dependency>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>incubating-M1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,32 +18,28 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>axis2</artifactId>
<name>Apache Tuscany Binding for Axis2</name>
<description>Implementation of the SCA Web Services binding using Axis2.</description>
-
<repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-nightly-repository</id>
- <name>Apache Nightly Repository</name>
- <url>http://people.apache.org/repository/</url>
- <layout>legacy</layout>
- </repository>
+ <repository>
+ <id>apache.m1.snapshots</id>
+ <name>Apache M1 Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
@@ -53,14 +49,14 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.idl</groupId>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
<artifactId>wsdl</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
@@ -140,7 +136,7 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
Modified: incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml Sat Sep 16 13:47:41 2006
@@ -22,8 +22,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -60,14 +60,14 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.idl</groupId>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
<artifactId>wsdl</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
@@ -93,29 +93,4 @@
<artifactId>wstx-asl</artifactId>
</dependency>
</dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/standalone.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml Sat Sep 16 13:47:41 2006
@@ -22,8 +22,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -41,18 +41,11 @@
</snapshots>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>ibiblio</id>
- <name>ibiblio</name>
- <url>http://www.ibiblio.org/maven2</url>
- </pluginRepository>
- </pluginRepositories>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml Sat Sep 16 13:47:41 2006
@@ -1,26 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ * 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
*
- * Licensed 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
*
- * 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.
- -->
+ * 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">
<parent>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -43,7 +46,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
Modified: incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml Sat Sep 16 13:47:41 2006
@@ -22,8 +22,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -31,18 +31,6 @@
<artifactId>binding-servicemix</artifactId>
<name>Apache Tuscany Binding for ServiceMix</name>
<description>Implementation of the SCA JBI Binding</description>
-
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-nightly-repository</id>
- <name>Apache Nightly Repository</name>
- <url>http://people.apache.org/repository/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<dependencies>
Modified: incubator/tuscany/java/sca/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,14 +20,14 @@
<project>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>sca</artifactId>
+ <groupId>org.apache.tuscany.sca.services</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>Tuscany SCA Bindings</name>
@@ -39,9 +39,6 @@
<module>binding.celtix</module>
<module>binding.axis2</module>
<module>binding.rmi</module>
- <!--
- <module>binding.jaxws</module>
- -->
</modules>
</project>
Modified: incubator/tuscany/java/sca/bindings/sunjars/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/sunjars/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/bindings/sunjars/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/sunjars/pom.xml Sat Sep 16 13:47:41 2006
@@ -19,8 +19,8 @@
-->
<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">
<parent>
- <groupId>org.apache.tuscany.bindings</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/pom.xml (original)
+++ incubator/tuscany/java/sca/commands/launcher/pom.xml Sat Sep 16 13:47:41 2006
@@ -19,8 +19,8 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>sca</artifactId>
+ <groupId>org.apache.tuscany.sca.commands</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Added: incubator/tuscany/java/sca/commands/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/pom.xml?view=auto&rev=446951
==============================================================================
--- incubator/tuscany/java/sca/commands/pom.xml (added)
+++ incubator/tuscany/java/sca/commands/pom.xml Sat Sep 16 13:47:41 2006
@@ -0,0 +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.
+-->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.commands</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Tuscany SCA Commands</name>
+
+ <modules>
+ <module>launcher</module>
+ </modules>
+
+</project>
Propchange: incubator/tuscany/java/sca/commands/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/commands/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/containers/container.groovy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/containers/container.groovy/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.groovy/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,8 +20,8 @@
<project>
<parent>
- <groupId>org.apache.tuscany.containers</groupId>
- <artifactId>containers</artifactId>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -58,7 +58,7 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
Modified: incubator/tuscany/java/sca/containers/container.javascript/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,8 +20,8 @@
<project>
<parent>
- <groupId>org.apache.tuscany.containers</groupId>
- <artifactId>containers</artifactId>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -38,7 +38,7 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.idl</groupId>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
<artifactId>wsdl</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
@@ -59,7 +59,7 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
Modified: incubator/tuscany/java/sca/containers/container.spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.spring/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.spring/pom.xml Sat Sep 16 13:47:41 2006
@@ -20,8 +20,8 @@
<project>
<parent>
- <groupId>org.apache.tuscany.containers</groupId>
- <artifactId>containers</artifactId>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -53,7 +53,7 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
@@ -61,8 +61,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/containers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/containers/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/pom.xml Sat Sep 16 13:47:41 2006
@@ -19,15 +19,41 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>sca</artifactId>
+ <groupId>org.apache.tuscany.sca.services</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.containers</groupId>
- <artifactId>containers</artifactId>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
+ <artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>Tuscany SCA Containers</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>container.groovy</module>
Modified: incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,13 +18,11 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-axiom</artifactId>
<name>Apache Tuscany Data Binding for Axiom</name>
@@ -32,23 +30,23 @@
<repositories>
<repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-nightly-repository</id>
- <name>Apache Nightly Repository</name>
- <url>http://people.apache.org/repository/</url>
+ <id>apache.m1.snapshots</id>
+ <name>Apache M1 Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
<layout>legacy</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</repository>
</repositories>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding-framework</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>databinding-framework</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>axiom-api</artifactId>
Modified: incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,13 +18,11 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-castor</artifactId>
<name>Apache Tuscany Data Binding for Castor</name>
@@ -32,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-framework</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,13 +18,11 @@
* under the License.
-->
<project>
-
- <parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
- </parent>
-
+ <parent>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-framework</artifactId>
<name>Apache Tuscany Data Binding Framework</name>
@@ -38,6 +36,19 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.tuscany.sca.services.idl</groupId>
+ <artifactId>wsdl</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>test</scope>
@@ -50,18 +61,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,21 +18,42 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-jaxb</artifactId>
<name>Apache Tuscany Data Binding for JAXB</name>
<description>Tuscany JAXB Data Binding</description>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>https://maven-repository.dev.java.net/repository</url>
+ <layout>legacy</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-framework</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
@@ -59,30 +80,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>https://maven-repository.dev.java.net/repository</url>
- <layout>legacy</layout>
- </pluginRepository>
- </pluginRepositories>
<build>
<testResources>
Modified: incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,13 +18,11 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>databinding-sdo</artifactId>
<name>Apache Tuscany Data Binding for SDO</name>
@@ -32,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-framework</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
Modified: incubator/tuscany/java/sca/databinding/databinding-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-test/pom.xml?view=diff&rev=446951&r1=446950&r2=446951
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-test/pom.xml Sat Sep 16 13:47:41 2006
@@ -18,10 +18,9 @@
* under the License.
-->
<project>
-
<parent>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>databinding</artifactId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
+ <artifactId>parent</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
@@ -31,33 +30,45 @@
<name>Apache Tuscany Data Binding Integration Test</name>
<description>Apache Tuscany Data Binding Integration Test</description>
+ <repositories>
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>java.net</id>
+ <name>java.net Maven 1.x Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-framework</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-jaxb</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-xmlbeans</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-axiom</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
@@ -80,25 +91,13 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
<build>
<testResources>
<testResource>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org