Author: jboynes
Date: Wed Jul 19 09:34:55 2006
New Revision: 423518
URL: http://svn.apache.org/viewvc?rev=423518&view=rev
Log:
copy spec modules from chianti to trunk
update all versions to 1.0-SNAPSHOT
Added:
incubator/tuscany/java/buildtools/
- copied from r423487, incubator/tuscany/sandbox/chianti/buildtools/
incubator/tuscany/java/spec/commonj/
- copied from r423487, incubator/tuscany/sandbox/chianti/spec/commonj/
incubator/tuscany/java/spec/sca/
- copied from r423487, incubator/tuscany/sandbox/chianti/spec/sca/
Modified:
incubator/tuscany/java/buildtools/pom.xml
incubator/tuscany/java/das/pom.xml
incubator/tuscany/java/das/rdb/pom.xml
incubator/tuscany/java/pom.xml
incubator/tuscany/java/sdo/impl/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?rev=423518&r1=423487&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/buildtools/pom.xml (original)
+++ incubator/tuscany/java/buildtools/pom.xml Wed Jul 19 09:34:55 2006
@@ -20,5 +20,5 @@
<artifactId>buildtools</artifactId>
<packaging>jar</packaging>
<name>Tuscany Build Tools</name>
- <version>1.0-chianti-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</project>
Modified: incubator/tuscany/java/das/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/pom.xml?rev=423518&r1=423517&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Wed Jul 19 09:34:55 2006
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-project</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
<packaging>pom</packaging>
<name>Tuscany DAS</name>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<modules>
<module>rdb</module>
Modified: incubator/tuscany/java/das/rdb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/pom.xml?rev=423518&r1=423517&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/pom.xml (original)
+++ incubator/tuscany/java/das/rdb/pom.xml Wed Jul 19 09:34:55 2006
@@ -18,18 +18,18 @@
<parent>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-das-rdb</artifactId>
<name>Tuscany DAS for Relational Databases</name>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/pom.xml?rev=423518&r1=423517&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Wed Jul 19 09:34:55 2006
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany</groupId>
<artifactId>tuscany-project</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany Project</name>
<url>http://incubator.apache.org/tuscany/</url>
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?rev=423518&r1=423517&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Wed Jul 19 09:34:55 2006
@@ -29,7 +29,7 @@
<dependency>
<groupId>commonj</groupId>
<artifactId>sdo-api</artifactId>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/spec/commonj/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/spec/commonj/pom.xml?rev=423518&r1=423487&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/spec/commonj/pom.xml (original)
+++ incubator/tuscany/java/spec/commonj/pom.xml Wed Jul 19 09:34:55 2006
@@ -15,15 +15,42 @@
* limitations under the License.
-->
<project>
- <parent>
- <groupId>org.osoa</groupId>
- <artifactId>spec</artifactId>
- <version>1.0-chianti-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany</groupId>
<artifactId>commonj-api_1.1</artifactId>
<name>Commonj</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <distributionManagement>
+ <repository>
+ <id>apache-incubator-repository</id>
+ <name>Apache Incubator Repository</name>
+ <url>scp:///www/people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache-snapshot-repository</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>scp:///www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java/spec</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java/spec</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/tuscany/java/spec</url>
+ </scm>
<dependencies>
<dependency>
@@ -33,4 +60,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
</project>
Modified: incubator/tuscany/java/spec/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/spec/pom.xml?rev=423518&r1=423517&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/spec/pom.xml (original)
+++ incubator/tuscany/java/spec/pom.xml Wed Jul 19 09:34:55 2006
@@ -15,256 +15,20 @@
* limitations under the License.
-->
<project>
- <!-- to keep separation between project and spec we do not extend the
Tuscany project POM -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.osoa</groupId>
<artifactId>spec</artifactId>
<packaging>pom</packaging>
<name>OSOA Specification API jars</name>
- <url>http://incubator.apache.org/tuscany/</url>
- <version>incubating-M1</version>
-
- <prerequisites>
- <maven>2.0</maven>
- </prerequisites>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <!--
- <snapshotRepository>
- <id>maven-snapshot-repository</id>
- <name>Apache SNAPSHOT Repository</name>
-
<url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </snapshotRepository>
- -->
- <repository>
- <id>maven-test-repository</id>
- <name>Test Repository</name>
-
<url>scp://people.apache.org/home/jsdelfino/public_html/maven2</url>
- </repository>
- </distributionManagement>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java/spec</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java/spec</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/incubator/tuscany/java/spec</url>
- </scm>
+ <version>1.0-SNAPSHOT</version>
<modules>
<module>sdo</module>
+ <module>sca</module>
+ <module>commonj</module>
</modules>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- <manifestEntries>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<Implementation-URL>http://incubator.apache.org/tuscany/</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
<defaultGoal>install</defaultGoal>
-
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
- </extension>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ftp</artifactId>
- <version>1.0-alpha-6</version>
- </extension>
-
- </extensions>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>distribution</id>
-
- <activation>
- <property>
- <name>tuscany.home</name>
- </property>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <links>
-
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- <offlineLinks>
- <offlineLink>
- <url>../sca-api</url>
-
<location>${tuscany.home}/spec/sca/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../sdo-api</url>
-
<location>${tuscany.home}/spec/sdo/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-common</url>
-
<location>${tuscany.home}/sca/common/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-model</url>
-
<location>${tuscany.home}/sca/model/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
- <url>../tuscany-core</url>
-
<location>${tuscany.home}/sca/core/target/site/apidocs</location>
- </offlineLink>
- <offlineLink>
-
<url>../tuscany-databinding-sdo</url>
-
<location>${tuscany.home}/sca/databinding/sdo/target/site/apidocs</location>
- </offlineLink>
- </offlineLinks>
- <!--
-
<outputDirectory>${tuscany.home}/distribution/build/javadoc/${project.artifactId}</outputDirectory>
- -->
- <attach>true</attach>
- <quiet>true</quiet>
- <bottom>-</bottom>
- <header>${project.name}</header>
- <footer>${project.name}</footer>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-dist</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <ant inheritRefs="true"
-
antfile="${tuscany.home}/distribution/buildDistribution.xml"
dir="${tuscany.home}"
- target="createDistribution">
- <property name="dist.folder"
-
value="${tuscany.home}/distribution/build" />
- <property
- name="project.packaging"
value="${project.packaging}" />
- <property
- name="project.groupId"
value="${project.groupId}" />
- <property
- name="project.artifactId"
value="${project.artifactId}" />
- <property
- name="project.version"
value="${project.version}" />
- <property
- name="project.basedir"
value="${basedir}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>clean-dist</id>
- <phase>clean</phase>
- <configuration>
- <tasks>
- <ant inheritRefs="true"
-
antfile="${tuscany.home}/distribution/buildDistribution.xml"
dir="${tuscany.home}"
- target="cleanDistribution">
- <property name="dist.folder"
-
value="${tuscany.home}/distribution/build" />
- <property
- name="project.packaging"
value="${project.packaging}" />
- <property
- name="project.groupId"
value="${project.groupId}" />
- <property
- name="project.artifactId"
value="${project.artifactId}" />
- <property
- name="project.version"
value="${project.version}" />
- <property
- name="project.basedir"
value="${basedir}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
Modified: incubator/tuscany/java/spec/sca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sca/pom.xml?rev=423518&r1=423487&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/spec/sca/pom.xml (original)
+++ incubator/tuscany/java/spec/sca/pom.xml Wed Jul 19 09:34:55 2006
@@ -15,15 +15,42 @@
* limitations under the License.
-->
<project>
- <parent>
- <groupId>org.osoa</groupId>
- <artifactId>spec</artifactId>
- <version>1.0-chianti-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sca-api-r0.92</artifactId>
+ <groupId>org.osoa</groupId>
+ <artifactId>sca-api-r0.95</artifactId>
<name>SCA API</name>
- <version>1.0-chianti-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <distributionManagement>
+ <repository>
+ <id>apache-incubator-repository</id>
+ <name>Apache Incubator Repository</name>
+ <url>scp:///www/people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache-snapshot-repository</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>scp:///www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java/spec</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java/spec</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/tuscany/java/spec</url>
+ </scm>
<dependencies>
<dependency>
@@ -33,4 +60,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
</project>
Modified: incubator/tuscany/java/spec/sdo/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/spec/sdo/pom.xml?rev=423518&r1=423517&r2=423518&view=diff
==============================================================================
--- incubator/tuscany/java/spec/sdo/pom.xml (original)
+++ incubator/tuscany/java/spec/sdo/pom.xml Wed Jul 19 09:34:55 2006
@@ -15,16 +15,42 @@
* limitations under the License.
-->
<project>
- <parent>
- <groupId>org.osoa</groupId>
- <artifactId>spec</artifactId>
- <version>incubating-M1</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commonj</groupId>
<artifactId>sdo-api</artifactId>
<name>SDO API</name>
- <version>incubating-M1</version>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <distributionManagement>
+ <repository>
+ <id>apache-incubator-repository</id>
+ <name>Apache Incubator Repository</name>
+ <url>scp:///www/people.apache.org/repo/m2-snapshot-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache-snapshot-repository</id>
+ <name>Apache SNAPSHOT Repository</name>
+ <url>scp:///www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java/spec</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java/spec</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/tuscany/java/spec</url>
+ </scm>
<dependencies>
<dependency>
@@ -45,7 +71,17 @@
<target>1.4</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
+ <defaultGoal>install</defaultGoal>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
