Author: jsdelfino
Date: Thu Aug 7 18:41:56 2008
New Revision: 683793
URL: http://svn.apache.org/viewvc?rev=683793&view=rev
Log:
Renamed base to core to be consistent with the terminology used elsewhere in
the project.
Added:
tuscany/java/sca/distribution/features/core/
tuscany/java/sca/distribution/features/core/pom.xml
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/pom.xml
tuscany/java/sca/distribution/features/core/src/
tuscany/java/sca/distribution/features/core/src/main/
tuscany/java/sca/distribution/features/core/src/main/assembly/
tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/core/src/main/release/
tuscany/java/sca/distribution/features/core/src/main/release/CHANGES
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/CHANGES
tuscany/java/sca/distribution/features/core/src/main/release/DISCLAIMER
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/DISCLAIMER
tuscany/java/sca/distribution/features/core/src/main/release/README
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/README
tuscany/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/RELEASE_NOTES
tuscany/java/sca/distribution/features/core/src/main/release/bin/
tuscany/java/sca/distribution/features/core/src/main/release/bin/INSTALL
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/bin/INSTALL
tuscany/java/sca/distribution/features/core/src/main/release/bin/LICENSE
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/bin/LICENSE
tuscany/java/sca/distribution/features/core/src/main/release/bin/NOTICE
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/bin/NOTICE
tuscany/java/sca/distribution/features/core/src/main/release/src/
tuscany/java/sca/distribution/features/core/src/main/release/src/BUILDING
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/src/BUILDING
tuscany/java/sca/distribution/features/core/src/main/release/src/LICENSE
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/src/LICENSE
tuscany/java/sca/distribution/features/core/src/main/release/src/NOTICE
- copied, changed from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/src/NOTICE
Removed:
tuscany/java/sca/distribution/features/base/pom.xml
tuscany/java/sca/distribution/features/base/src/main/assembly/bin.xml
tuscany/java/sca/distribution/features/base/src/main/release/CHANGES
tuscany/java/sca/distribution/features/base/src/main/release/DISCLAIMER
tuscany/java/sca/distribution/features/base/src/main/release/README
tuscany/java/sca/distribution/features/base/src/main/release/RELEASE_NOTES
tuscany/java/sca/distribution/features/base/src/main/release/bin/INSTALL
tuscany/java/sca/distribution/features/base/src/main/release/bin/LICENSE
tuscany/java/sca/distribution/features/base/src/main/release/bin/NOTICE
tuscany/java/sca/distribution/features/base/src/main/release/src/BUILDING
tuscany/java/sca/distribution/features/base/src/main/release/src/LICENSE
tuscany/java/sca/distribution/features/base/src/main/release/src/NOTICE
Modified:
tuscany/java/sca/distribution/features/all/pom.xml
tuscany/java/sca/distribution/features/ejava/pom.xml
tuscany/java/sca/distribution/features/manager/pom.xml
tuscany/java/sca/distribution/features/pom.xml
tuscany/java/sca/distribution/features/process/pom.xml
tuscany/java/sca/distribution/features/web20/pom.xml
tuscany/java/sca/distribution/features/webservice/pom.xml
tuscany/java/sca/distribution/pom.xml
Modified: tuscany/java/sca/distribution/features/all/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/all/pom.xml (original)
+++ tuscany/java/sca/distribution/features/all/pom.xml Thu Aug 7 18:41:56 2008
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-base</artifactId>
+ <artifactId>tuscany-distribution-core</artifactId>
<type>jar</type>
<version>1.4-SNAPSHOT</version>
</dependency>
Copied: tuscany/java/sca/distribution/features/core/pom.xml (from r683778,
tuscany/java/sca/distribution/features/base/pom.xml)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/pom.xml?p2=tuscany/java/sca/distribution/features/core/pom.xml&p1=tuscany/java/sca/distribution/features/base/pom.xml&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/base/pom.xml (original)
+++ tuscany/java/sca/distribution/features/core/pom.xml Thu Aug 7 18:41:56 2008
@@ -26,8 +26,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-distribution-base</artifactId>
- <name>Apache Tuscany SCA Base Distribution</name>
+ <artifactId>tuscany-distribution-core</artifactId>
+ <name>Apache Tuscany SCA Core Distribution</name>
<packaging>jar</packaging>
<dependencies>
@@ -218,7 +218,7 @@
<descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
-
<finalName>apache-tuscany-sca-base-1.4-SNAPSHOT</finalName>
+
<finalName>apache-tuscany-sca-core-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
Copied: tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/assembly/bin.xml)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml?p2=tuscany/java/sca/distribution/features/core/src/main/assembly/bin.xml&p1=tuscany/java/sca/distribution/features/base/src/main/assembly/bin.xml&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied: tuscany/java/sca/distribution/features/core/src/main/release/CHANGES
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/CHANGES)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/CHANGES?p2=tuscany/java/sca/distribution/features/core/src/main/release/CHANGES&p1=tuscany/java/sca/distribution/features/base/src/main/release/CHANGES&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied: tuscany/java/sca/distribution/features/core/src/main/release/DISCLAIMER
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/DISCLAIMER)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/DISCLAIMER?p2=tuscany/java/sca/distribution/features/core/src/main/release/DISCLAIMER&p1=tuscany/java/sca/distribution/features/base/src/main/release/DISCLAIMER&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied: tuscany/java/sca/distribution/features/core/src/main/release/README
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/README)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/README?p2=tuscany/java/sca/distribution/features/core/src/main/release/README&p1=tuscany/java/sca/distribution/features/base/src/main/release/README&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied:
tuscany/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/RELEASE_NOTES)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES?p2=tuscany/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES&p1=tuscany/java/sca/distribution/features/base/src/main/release/RELEASE_NOTES&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied:
tuscany/java/sca/distribution/features/core/src/main/release/bin/INSTALL (from
r683778,
tuscany/java/sca/distribution/features/base/src/main/release/bin/INSTALL)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/bin/INSTALL?p2=tuscany/java/sca/distribution/features/core/src/main/release/bin/INSTALL&p1=tuscany/java/sca/distribution/features/base/src/main/release/bin/INSTALL&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied:
tuscany/java/sca/distribution/features/core/src/main/release/bin/LICENSE (from
r683778,
tuscany/java/sca/distribution/features/base/src/main/release/bin/LICENSE)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/bin/LICENSE?p2=tuscany/java/sca/distribution/features/core/src/main/release/bin/LICENSE&p1=tuscany/java/sca/distribution/features/base/src/main/release/bin/LICENSE&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied: tuscany/java/sca/distribution/features/core/src/main/release/bin/NOTICE
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/bin/NOTICE)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/bin/NOTICE?p2=tuscany/java/sca/distribution/features/core/src/main/release/bin/NOTICE&p1=tuscany/java/sca/distribution/features/base/src/main/release/bin/NOTICE&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied:
tuscany/java/sca/distribution/features/core/src/main/release/src/BUILDING (from
r683778,
tuscany/java/sca/distribution/features/base/src/main/release/src/BUILDING)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/src/BUILDING?p2=tuscany/java/sca/distribution/features/core/src/main/release/src/BUILDING&p1=tuscany/java/sca/distribution/features/base/src/main/release/src/BUILDING&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied:
tuscany/java/sca/distribution/features/core/src/main/release/src/LICENSE (from
r683778,
tuscany/java/sca/distribution/features/base/src/main/release/src/LICENSE)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/src/LICENSE?p2=tuscany/java/sca/distribution/features/core/src/main/release/src/LICENSE&p1=tuscany/java/sca/distribution/features/base/src/main/release/src/LICENSE&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Copied: tuscany/java/sca/distribution/features/core/src/main/release/src/NOTICE
(from r683778,
tuscany/java/sca/distribution/features/base/src/main/release/src/NOTICE)
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/release/src/NOTICE?p2=tuscany/java/sca/distribution/features/core/src/main/release/src/NOTICE&p1=tuscany/java/sca/distribution/features/base/src/main/release/src/NOTICE&r1=683778&r2=683793&rev=683793&view=diff
==============================================================================
(empty)
Modified: tuscany/java/sca/distribution/features/ejava/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/pom.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/pom.xml Thu Aug 7 18:41:56
2008
@@ -35,7 +35,7 @@
<!-- Base distribution -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-base</artifactId>
+ <artifactId>tuscany-distribution-core</artifactId>
<type>jar</type>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/distribution/features/manager/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/pom.xml (original)
+++ tuscany/java/sca/distribution/features/manager/pom.xml Thu Aug 7 18:41:56
2008
@@ -35,7 +35,7 @@
<!-- Base distribution -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-base</artifactId>
+ <artifactId>tuscany-distribution-core</artifactId>
<type>jar</type>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/distribution/features/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/pom.xml (original)
+++ tuscany/java/sca/distribution/features/pom.xml Thu Aug 7 18:41:56 2008
@@ -43,7 +43,7 @@
</activation>
<modules>
<module>all</module>
- <module>base</module>
+ <module>core</module>
<module>ejava</module>
<module>manager</module>
<module>process</module>
@@ -56,7 +56,7 @@
<id>eclipse</id>
<modules>
<module>all</module>
- <module>base</module>
+ <module>core</module>
<module>ejava</module>
<module>manager</module>
<module>process</module>
@@ -69,7 +69,7 @@
<id>distribution</id>
<modules>
<module>all</module>
- <module>base</module>
+ <module>core</module>
<module>ejava</module>
<module>manager</module>
<module>process</module>
Modified: tuscany/java/sca/distribution/features/process/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/pom.xml (original)
+++ tuscany/java/sca/distribution/features/process/pom.xml Thu Aug 7 18:41:56
2008
@@ -35,7 +35,7 @@
<!-- Base distribution -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-base</artifactId>
+ <artifactId>tuscany-distribution-core</artifactId>
<type>jar</type>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/distribution/features/web20/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/web20/pom.xml (original)
+++ tuscany/java/sca/distribution/features/web20/pom.xml Thu Aug 7 18:41:56
2008
@@ -35,7 +35,7 @@
<!-- Base distribution -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-base</artifactId>
+ <artifactId>tuscany-distribution-core</artifactId>
<type>jar</type>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/distribution/features/webservice/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/pom.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/pom.xml Thu Aug 7
18:41:56 2008
@@ -35,7 +35,7 @@
<!-- Base distribution -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-base</artifactId>
+ <artifactId>tuscany-distribution-core</artifactId>
<type>jar</type>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/java/sca/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pom.xml?rev=683793&r1=683792&r2=683793&view=diff
==============================================================================
--- tuscany/java/sca/distribution/pom.xml (original)
+++ tuscany/java/sca/distribution/pom.xml Thu Aug 7 18:41:56 2008
@@ -302,25 +302,6 @@
</plugin>
-->
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ant-plugin</artifactId>
- ####
- <version>1.1</version>
- ####
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>ant</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -342,61 +323,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Temporarily remove to avoid out of memory
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>process-sources-xsl</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <xslt
style="${basedir}/src/main/xsl/srcbuild_paths.xsl" in="build.xml"
out="${basedir}/target/srcbuild_paths.xml">
- </xslt>
-
- <pathconvert property="cp"
refid="maven.runtime.classpath" />
- <condition property="output.cp" value="set
TUSCANY_CLASSPATH=${cp}">
- <os family="windows" />
- </condition>
- <condition property="output.ext" value=".bat">
- <os family="windows" />
- </condition>
- <property name="output.cp" value="export
TUSCANY_CLASSPATH=${cp}" />
- <property name="output.ext" value="" />
-
- <echo
file="${basedir}/target/srcbuild_env${output.ext}" message="${output.cp}" />
- <echo
file="${basedir}/target/version.properties"
message="tuscany.version=${pom.version}" />
- #########
- ### THIS WAS ALREADY COMMENTED
- <copy
file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml"
overwrite="yes">
- <filterset>
- <filter token="TUSCANY_VERSION"
value="${pom.version}" />
- </filterset>
- </copy>
- ###
- <delete file="build.xml" />
- </tasks>
-
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
-
</plugins>
</build>
