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/13 05:25:39 UTC
svn commit: r442812 [1/2] - in /incubator/tuscany/java: ./ buildtools/ das/
das/rdb/ distribution/sca/standalone/ distribution/sdo/ pom/parent/
samples/das/ samples/das/companyweb/ sca/ sca/bindings/
sca/bindings/binding.axis2/ sca/bindings/binding.cel...
Author: jboynes
Date: Tue Sep 12 20:25:36 2006
New Revision: 442812
URL: http://svn.apache.org/viewvc?view=rev&rev=442812
Log:
change version to 1.0-incubator-M2-SNAPSHOT
Modified:
incubator/tuscany/java/buildtools/pom.xml
incubator/tuscany/java/das/pom.xml
incubator/tuscany/java/das/rdb/pom.xml
incubator/tuscany/java/distribution/sca/standalone/pom.xml
incubator/tuscany/java/distribution/sdo/pom.xml
incubator/tuscany/java/pom.xml
incubator/tuscany/java/pom/parent/pom.xml
incubator/tuscany/java/samples/das/companyweb/pom.xml
incubator/tuscany/java/samples/das/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.ruby/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/api/pom.xml
incubator/tuscany/java/sca/kernel/core/pom.xml
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/artifact/LocalMavenRepositoryTestCase.java
incubator/tuscany/java/sca/kernel/host-api/pom.xml
incubator/tuscany/java/sca/kernel/pom.xml
incubator/tuscany/java/sca/kernel/spi/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.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/services/transports/http.jetty/pom.xml
incubator/tuscany/java/sca/test/pom.xml
incubator/tuscany/java/sca/tools/pom.xml
incubator/tuscany/java/sdo/impl/pom.xml
incubator/tuscany/java/sdo/plugin/pom.xml
incubator/tuscany/java/sdo/pom.xml
incubator/tuscany/java/sdo/tools/pom.xml
incubator/tuscany/java/spec/commonj/pom.xml
incubator/tuscany/java/spec/pom.xml
incubator/tuscany/java/spec/sca/pom.xml
incubator/tuscany/java/spec/sdo/pom.xml
Modified: incubator/tuscany/java/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/buildtools/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/buildtools/pom.xml (original)
+++ incubator/tuscany/java/buildtools/pom.xml Tue Sep 12 20:25:36 2006
@@ -20,44 +20,38 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>3</version>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>parent</artifactId>
+ <version>1-incubator-SNAPSHOT</version>
</parent>
- <groupId>org.apache.tuscany</groupId>
<artifactId>buildtools</artifactId>
<packaging>jar</packaging>
<name>Apache Tuscany Build Tools</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
- <distributionManagement>
+ <!-- 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>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url>
+ <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</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>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <targetPath>META-INF</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
- </build>
+ </repositories>
</project>
Modified: incubator/tuscany/java/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,31 +1,84 @@
<?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>
+ <parent>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>parent</artifactId>
+ <version>1-incubator-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
<packaging>pom</packaging>
<name>Tuscany DAS</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<modules>
<module>rdb</module>
+ <module>../samples/das</module>
</modules>
+ <!-- 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>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<defaultGoal>install</defaultGoal>
@@ -60,15 +113,4 @@
</plugin>
</plugins>
</build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
Modified: incubator/tuscany/java/das/rdb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/das/rdb/pom.xml (original)
+++ incubator/tuscany/java/das/rdb/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,45 +1,37 @@
<?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>
<parent>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-das-rdb</artifactId>
<name>Tuscany DAS for Relational Databases</name>
- <version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api-r2.0.1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/pom.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany</groupId>
<artifactId>standalone</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany Standalone Distribution</name>
<description>Tuscany Distribution for a standalone runtime environment.</description>
<properties>
- <sca.version>1.0-SNAPSHOT</sca.version>
+ <sca.version>1.0-incubator-M2-SNAPSHOT</sca.version>
</properties>
<dependencies>
Modified: incubator/tuscany/java/distribution/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sdo/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/distribution/sdo/pom.xml (original)
+++ incubator/tuscany/java/distribution/sdo/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,37 +1,67 @@
<?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>
+ <parent>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>parent</artifactId>
+ <version>1-incubator-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.tuscany.distribution</groupId>
<artifactId>sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany SDO Distribution</name>
<description>Tuscany Distribution for SDO.</description>
- <properties>
- <sdo.version>1.0-SNAPSHOT</sdo.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</groupId>
+ <groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>${sdo.version}</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,19 +1,22 @@
<?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">
@@ -21,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-project</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany Project</name>
<url>http://incubator.apache.org/tuscany/</url>
@@ -46,11 +49,13 @@
<module>spec</module>
<module>sdo</module>
<module>das</module>
- <module>samples/das</module>
+ <module>sca/kernel</module>
<module>sca</module>
+<!--
<module>samples/sca</module>
<module>distribution/sca/standalone</module>
<module>distribution/sca/web</module>
+-->
</modules>
</profile>
@@ -67,7 +72,6 @@
<id>das</id>
<modules>
<module>das</module>
- <module>samples/das</module>
</modules>
</profile>
@@ -76,9 +80,11 @@
<id>sca</id>
<modules>
<module>sca</module>
+<!--
<module>samples/sca</module>
<module>distribution/sca/standalone</module>
<module>distribution/sca/web</module>
+-->
</modules>
</profile>
</profiles>
Modified: incubator/tuscany/java/pom/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/pom/parent/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/pom/parent/pom.xml (original)
+++ incubator/tuscany/java/pom/parent/pom.xml Tue Sep 12 20:25:36 2006
@@ -29,7 +29,7 @@
<packaging>pom</packaging>
<name>Apache Tuscany Project Parent</name>
<description>Parent POM defining settings that can be used across Tuscany</description>
- <version>1-SNAPSHOT</version>
+ <version>1-incubator-SNAPSHOT</version>
<prerequisites>
<maven>2.0.4</maven>
@@ -66,6 +66,9 @@
<id>apache.snapshots</id>
<name>Apache SNAPSHOT Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</pluginRepository>
<!-- used for Plexus plugins -->
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/samples/das/companyweb/pom.xml (original)
+++ incubator/tuscany/java/samples/das/companyweb/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,27 +1,30 @@
<?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>
-
+
<parent>
- <groupId>org.apache.tuscany.samples.das</groupId>
+ <groupId>org.apache.tuscany.das.samples</groupId>
<artifactId>tuscany-samples-das</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-companyweb</artifactId>
<packaging>war</packaging>
@@ -29,24 +32,23 @@
<description>Sample use of RDB DAS in a Web application</description>
<dependencies>
-
+
<dependency>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das-rdb</artifactId>
<version>${pom.version}</version>
- <!-- lresende - remove scope to have dependencies into the war file -->
- <!-- <scope>provided</scope> -->
+ <scope>compile</scope>
</dependency>
</dependencies>
-
+
<!-- this will place the java source files inside the war -->
<build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- </resources>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ </resources>
</build>
</project>
Modified: incubator/tuscany/java/samples/das/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/das/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/samples/das/pom.xml (original)
+++ incubator/tuscany/java/samples/das/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,26 +1,59 @@
<?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.samples.das</groupId>
+ <parent>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.tuscany.das.samples</groupId>
<artifactId>tuscany-samples-das</artifactId>
<packaging>pom</packaging>
<name>Tuscany DAS Samples</name>
- <version>1.0-SNAPSHOT</version>
+
+ <!-- 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>companyweb</module>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.bindings</groupId>
<artifactId>bindings</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -46,20 +46,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.tuscany.idl</groupId>
<artifactId>wsdl</artifactId>
<version>${sca.version}</version>
@@ -73,51 +66,36 @@
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
<!-- axis 2.0 SNAPSHOT -->
<dependency>
<groupId>axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>axiom-api</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>axiom-impl</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>incubator-woden</groupId>
<artifactId>woden</artifactId>
- <version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.5.2</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <version>2.3</version>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <!-- runtime -->
-
- <dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>2.9.3</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -137,8 +115,6 @@
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>SNAPSHOT</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -161,8 +137,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -172,32 +146,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <!-- The assembly plugin cannot understand maven1 pom -->
- <!--
- <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/axis2.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- -->
-
</project>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/pom.xml Tue Sep 12 20:25:36 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tuscany.bindings</groupId>
<artifactId>bindings</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -53,19 +53,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.idl</groupId>
<artifactId>wsdl</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
@@ -73,13 +73,6 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
- </dependency>
-
<!-- Celtix -->
<dependency>
<groupId>org.objectweb.celtix</groupId>
@@ -94,37 +87,35 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>woodstox</groupId>
<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>
+
+ <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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.jsonrpc/pom.xml Tue Sep 12 20:25:36 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tuscany.bindings</groupId>
<artifactId>bindings</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.bindings</groupId>
<artifactId>bindings</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/binding.servicemix/pom.xml Tue Sep 12 20:25:36 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tuscany.bindings</groupId>
<artifactId>bindings</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/bindings/sunjars/pom.xml (original)
+++ incubator/tuscany/java/sca/bindings/sunjars/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.bindings</groupId>
<artifactId>bindings</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sunjars</artifactId>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/pom.xml (original)
+++ incubator/tuscany/java/sca/commands/launcher/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>launcher</artifactId>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/containers/container.groovy/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.groovy/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.containers</groupId>
<artifactId>containers</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.containers</groupId>
<artifactId>containers</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,10 +33,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
@@ -53,13 +51,6 @@
<scope>compile</scope>
</dependency>
- <!-- dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency -->
-
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId> <!-- Reqd for E4X -->
@@ -83,21 +74,17 @@
<artifactId>easymockclassextension</artifactId>
</dependency>
<dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/containers/container.ruby/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.ruby/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/containers/container.ruby/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.ruby/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.containers</groupId>
<artifactId>containers</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/containers/container.spring/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/container.spring/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.containers</groupId>
<artifactId>containers</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/containers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/containers/pom.xml (original)
+++ incubator/tuscany/java/sca/containers/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.containers</groupId>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-axiom/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-castor/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-jaxb/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-sdo/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<executions>
<execution>
<id>generate-sdo</id>
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=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-test/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-test/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.databinding</groupId>
<artifactId>databinding</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/databinding/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/idl/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/idl/wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/idl/wsdl/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.idl</groupId>
Modified: incubator/tuscany/java/sca/kernel/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/api/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-api</artifactId>
@@ -37,8 +37,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/kernel/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/core/pom.xml Tue Sep 12 20:25:36 2006
@@ -19,9 +19,9 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId>
@@ -33,14 +33,12 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-spi</artifactId>
- <version>${sca.version}</version>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>commonj-api_1.1</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
+ <artifactId>commonj-api_r1.1</artifactId>
</dependency>
<dependency>
@@ -65,8 +63,6 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/artifact/LocalMavenRepositoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/artifact/LocalMavenRepositoryTestCase.java?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/artifact/LocalMavenRepositoryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/artifact/LocalMavenRepositoryTestCase.java Tue Sep 12 20:25:36 2006
@@ -33,23 +33,23 @@
* @version $Rev$ $Date$
*/
public class LocalMavenRepositoryTestCase extends TestCase {
+ private static final String VERSION = "3.8.1";
private LocalMavenRepository repo;
private Artifact artifact;
+ private String path;
public void testPathWithNoClassifier() {
- String path = "org/apache/tuscany/sca/kernel/tuscany-spi/1.0-SNAPSHOT/tuscany-spi-1.0-SNAPSHOT.jar";
assertEquals(path, repo.getPath(artifact));
}
public void testPathWithClassifier() {
artifact.setClassifier("x86");
- String path = "org/apache/tuscany/sca/kernel/tuscany-spi/1.0-SNAPSHOT/tuscany-spi-1.0-SNAPSHOT-x86.jar";
+ path = "junit/junit/" + VERSION + "/junit-" + VERSION + "-x86.jar";
assertEquals(path, repo.getPath(artifact));
}
public void testArtifactFoundInRepo() throws MalformedURLException, UnsupportedEncodingException {
String home = System.getProperty("user.home");
- String path = "org/apache/tuscany/sca/kernel/tuscany-spi/1.0-SNAPSHOT/tuscany-spi-1.0-SNAPSHOT.jar";
File file = new File(home + "/.m2/repository", path);
repo.resolve(artifact);
assertEquals(file.toURI().toURL(), artifact.getUrl());
@@ -73,9 +73,10 @@
repo = new LocalMavenRepository(".m2/repository");
artifact = new Artifact();
- artifact.setGroup("org.apache.tuscany.sca.kernel");
- artifact.setName("tuscany-spi");
- artifact.setVersion("1.0-SNAPSHOT");
+ artifact.setGroup("junit");
+ artifact.setName("junit");
+ artifact.setVersion(VERSION);
artifact.setType("jar");
+ path = "junit/junit/" + VERSION + "/junit-" + VERSION + ".jar";
}
}
Modified: incubator/tuscany/java/sca/kernel/host-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/kernel/host-api/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/host-api/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-host-api</artifactId>
@@ -33,20 +33,17 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <version>${sca.version}</version>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/kernel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/kernel/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/pom.xml Tue Sep 12 20:25:36 2006
@@ -22,16 +22,13 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1-incubator-SNAPSHOT</version>
</parent>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Kernel Sub-Project</name>
- <version>1.0-SNAPSHOT</version>
- <properties>
- <sca.version>1.0-SNAPSHOT</sca.version>
- </properties>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<modules>
<module>api</module>
@@ -46,7 +43,7 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- javax.servlet API -->
@@ -70,6 +67,20 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
+ <!-- CommonJ Timer/Work API -->
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>commonj-api_r1.1</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- java.xml.stream API -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
<!-- StAX implementation -->
<dependency>
<groupId>woodstox</groupId>
@@ -111,7 +122,7 @@
<dependency>
<groupId>org.apache.tuscany</groupId>
<artifactId>buildtools</artifactId>
- <version>${pom.version}</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
Modified: incubator/tuscany/java/sca/kernel/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/pom.xml (original)
+++ incubator/tuscany/java/sca/kernel/spi/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-spi</artifactId>
@@ -33,25 +33,22 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-host-api</artifactId>
- <version>${sca.version}</version>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
+
+ <dependency>
+ <groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml Tue Sep 12 20:25:36 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sca-plugins</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/plugins/plugin.war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.war/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.war/pom.xml (original)
+++ incubator/tuscany/java/sca/plugins/plugin.war/pom.xml Tue Sep 12 20:25:36 2006
@@ -4,7 +4,7 @@
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-war-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<name>Tuscany War Plugin</name>
<dependencies>
Modified: incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml (original)
+++ incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml Tue Sep 12 20:25:36 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-sca-plugins</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/plugins/pom.xml (original)
+++ incubator/tuscany/java/sca/plugins/pom.xml Tue Sep 12 20:25:36 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Tue Sep 12 20:25:36 2006
@@ -23,14 +23,16 @@
<artifactId>sca</artifactId>
<packaging>pom</packaging>
<name>Tuscany SCA Implementation Project</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<properties>
- <sca.version>1.0-SNAPSHOT</sca.version>
+ <sca.version>1.0-incubator-M2-SNAPSHOT</sca.version>
+ <scaKernelVersion>1.0-incubator-M2-SNAPSHOT</scaKernelVersion>
<notice.dir>.</notice.dir>
+ <axis2Version>SNAPSHOT</axis2Version>
+ <axiomVersion>SNAPSHOT</axiomVersion>
</properties>
<modules>
- <module>kernel</module>
<module>test</module>
<module>containers</module>
<module>idl/wsdl</module>
@@ -45,11 +47,19 @@
<dependencyManagement>
<dependencies>
+ <!-- Tuscany Kernel Modules -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>core</artifactId>
+ <version>${scaKernelVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
<!-- org.osoa.sca API -->
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!-- javax.servlet API -->
@@ -89,6 +99,51 @@
<scope>runtime</scope>
</dependency>
+ <!-- Axis2 Implementation -->
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2Version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- AXIOM Implementation -->
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiomVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiomVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Woden implementation -->
+ <dependency>
+ <groupId>incubator-woden</groupId>
+ <artifactId>woden</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- wsdl4j implementation -->
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+
+ <!-- XmlSchema implementation -->
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -136,12 +191,6 @@
</licenses>
<repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
-
<!-- needed for Apache webServices artifacts -->
<repository>
<id>apache.m1</id>
Modified: incubator/tuscany/java/sca/runtime/equinox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/equinox/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/runtime/equinox/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/equinox/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.runtime</groupId>
Modified: incubator/tuscany/java/sca/runtime/osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/runtime/osgi/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/osgi/pom.xml Tue Sep 12 20:25:36 2006
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.runtime</groupId>
Modified: incubator/tuscany/java/sca/runtime/webapp-host/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.runtime</groupId>
@@ -37,10 +37,8 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
@@ -50,19 +48,10 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>test</artifactId>
- <version>${sca.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/runtime/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/webapp/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.runtime</groupId>
Modified: incubator/tuscany/java/sca/services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/services/pom.xml (original)
+++ incubator/tuscany/java/sca/services/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.services</groupId>
Modified: incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml (original)
+++ incubator/tuscany/java/sca/services/transports/http.jetty/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.services</groupId>
<artifactId>services</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>http-jetty</artifactId>
Modified: incubator/tuscany/java/sca/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/test/pom.xml (original)
+++ incubator/tuscany/java/sca/test/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>test</artifactId>
@@ -30,22 +30,17 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
- <version>${sca.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Tue Sep 12 20:25:36 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sca-tools</artifactId>
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,24 +1,27 @@
<?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>
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-impl</artifactId>
@@ -29,8 +32,6 @@
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r${specVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sdo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/plugin/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sdo/plugin/pom.xml (original)
+++ incubator/tuscany/java/sdo/plugin/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,24 +1,27 @@
<?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>
<parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sdo-plugin</artifactId>
Modified: incubator/tuscany/java/sdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?view=diff&rev=442812&r1=442811&r2=442812
==============================================================================
--- incubator/tuscany/java/sdo/pom.xml (original)
+++ incubator/tuscany/java/sdo/pom.xml Tue Sep 12 20:25:36 2006
@@ -1,34 +1,59 @@
<?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>
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1-incubator-SNAPSHOT</version>
</parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo</artifactId>
<packaging>pom</packaging>
<name>Tuscany SDO Implementation Project</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<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>
+ <repository>
<id>eclipse.emf</id>
<url>http://download.eclipse.org/tools/emf/maven2</url>
<snapshots>
@@ -77,7 +102,7 @@
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api-r${specVersion}</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org
Update version, was: svn commit: r442812 [1/2]
Posted by Jeremy Boynes <jb...@apache.org>.
I have modified most of the POMs to make the version 1.0-incubator-M2-
SNAPSHOT but I have not yet done the sca samples and distribution -
they are commented out of the build for now. I plan to get to them
later tonight or tomorrow.
One thing that made this quite painful is the number that needed to
be changed. I did do some clean-up on the poms to reduce the number
of duplicates, trying to make use of values from the parent POMs but
there is still quite a bit of duplication.
I have uploaded the following modules to the snapshot repo at http://
people.apache.org/repo/m2-snapshot-repository/
* pom/parent
* buildtools
* spec
* sdo
* sca/kernel
The build is based on r442855.
--
Jeremy
On Sep 12, 2006, at 8:25 PM, jboynes@apache.org wrote:
> Author: jboynes
> Date: Tue Sep 12 20:25:36 2006
> New Revision: 442812
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=442812
> Log:
> change version to 1.0-incubator-M2-SNAPSHOT
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org