summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/sca/distribution/features/all/pom.xml2
-rw-r--r--java/sca/distribution/features/core/pom.xml (renamed from java/sca/distribution/features/base/pom.xml)6
-rw-r--r--java/sca/distribution/features/core/src/main/assembly/bin.xml (renamed from java/sca/distribution/features/base/src/main/assembly/bin.xml)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/CHANGES (renamed from java/sca/distribution/features/base/src/main/release/CHANGES)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/DISCLAIMER (renamed from java/sca/distribution/features/base/src/main/release/DISCLAIMER)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/README (renamed from java/sca/distribution/features/base/src/main/release/README)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/RELEASE_NOTES (renamed from java/sca/distribution/features/base/src/main/release/RELEASE_NOTES)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/bin/INSTALL (renamed from java/sca/distribution/features/base/src/main/release/bin/INSTALL)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/bin/LICENSE (renamed from java/sca/distribution/features/base/src/main/release/bin/LICENSE)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/bin/NOTICE (renamed from java/sca/distribution/features/base/src/main/release/bin/NOTICE)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/src/BUILDING (renamed from java/sca/distribution/features/base/src/main/release/src/BUILDING)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/src/LICENSE (renamed from java/sca/distribution/features/base/src/main/release/src/LICENSE)0
-rw-r--r--java/sca/distribution/features/core/src/main/release/src/NOTICE (renamed from java/sca/distribution/features/base/src/main/release/src/NOTICE)0
-rw-r--r--java/sca/distribution/features/ejava/pom.xml2
-rw-r--r--java/sca/distribution/features/manager/pom.xml2
-rw-r--r--java/sca/distribution/features/pom.xml6
-rw-r--r--java/sca/distribution/features/process/pom.xml2
-rw-r--r--java/sca/distribution/features/web20/pom.xml2
-rw-r--r--java/sca/distribution/features/webservice/pom.xml2
-rw-r--r--java/sca/distribution/pom.xml74
20 files changed, 12 insertions, 86 deletions
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml
index 09982c80b7..a54993b883 100644
--- a/java/sca/distribution/features/all/pom.xml
+++ b/java/sca/distribution/features/all/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/base/pom.xml b/java/sca/distribution/features/core/pom.xml
index 837fc0fa6d..609bf1857a 100644
--- a/java/sca/distribution/features/base/pom.xml
+++ b/java/sca/distribution/features/core/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/base/src/main/assembly/bin.xml b/java/sca/distribution/features/core/src/main/assembly/bin.xml
index bdcaec0632..bdcaec0632 100644
--- a/java/sca/distribution/features/base/src/main/assembly/bin.xml
+++ b/java/sca/distribution/features/core/src/main/assembly/bin.xml
diff --git a/java/sca/distribution/features/base/src/main/release/CHANGES b/java/sca/distribution/features/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca/distribution/features/base/src/main/release/CHANGES
+++ b/java/sca/distribution/features/core/src/main/release/CHANGES
diff --git a/java/sca/distribution/features/base/src/main/release/DISCLAIMER b/java/sca/distribution/features/core/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sca/distribution/features/base/src/main/release/DISCLAIMER
+++ b/java/sca/distribution/features/core/src/main/release/DISCLAIMER
diff --git a/java/sca/distribution/features/base/src/main/release/README b/java/sca/distribution/features/core/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/java/sca/distribution/features/base/src/main/release/README
+++ b/java/sca/distribution/features/core/src/main/release/README
diff --git a/java/sca/distribution/features/base/src/main/release/RELEASE_NOTES b/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/java/sca/distribution/features/base/src/main/release/RELEASE_NOTES
+++ b/java/sca/distribution/features/core/src/main/release/RELEASE_NOTES
diff --git a/java/sca/distribution/features/base/src/main/release/bin/INSTALL b/java/sca/distribution/features/core/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/java/sca/distribution/features/base/src/main/release/bin/INSTALL
+++ b/java/sca/distribution/features/core/src/main/release/bin/INSTALL
diff --git a/java/sca/distribution/features/base/src/main/release/bin/LICENSE b/java/sca/distribution/features/core/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/java/sca/distribution/features/base/src/main/release/bin/LICENSE
+++ b/java/sca/distribution/features/core/src/main/release/bin/LICENSE
diff --git a/java/sca/distribution/features/base/src/main/release/bin/NOTICE b/java/sca/distribution/features/core/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca/distribution/features/base/src/main/release/bin/NOTICE
+++ b/java/sca/distribution/features/core/src/main/release/bin/NOTICE
diff --git a/java/sca/distribution/features/base/src/main/release/src/BUILDING b/java/sca/distribution/features/core/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca/distribution/features/base/src/main/release/src/BUILDING
+++ b/java/sca/distribution/features/core/src/main/release/src/BUILDING
diff --git a/java/sca/distribution/features/base/src/main/release/src/LICENSE b/java/sca/distribution/features/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca/distribution/features/base/src/main/release/src/LICENSE
+++ b/java/sca/distribution/features/core/src/main/release/src/LICENSE
diff --git a/java/sca/distribution/features/base/src/main/release/src/NOTICE b/java/sca/distribution/features/core/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca/distribution/features/base/src/main/release/src/NOTICE
+++ b/java/sca/distribution/features/core/src/main/release/src/NOTICE
diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml
index bda2c93f22..26024cdc45 100644
--- a/java/sca/distribution/features/ejava/pom.xml
+++ b/java/sca/distribution/features/ejava/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index e62be25e22..bbb816cf92 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/pom.xml b/java/sca/distribution/features/pom.xml
index 55bb8b98a6..5d54dc0bdd 100644
--- a/java/sca/distribution/features/pom.xml
+++ b/java/sca/distribution/features/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml
index 8bf17134f3..9f5eba2d4f 100644
--- a/java/sca/distribution/features/process/pom.xml
+++ b/java/sca/distribution/features/process/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml
index 31321114e2..c95cc79cb7 100644
--- a/java/sca/distribution/features/web20/pom.xml
+++ b/java/sca/distribution/features/web20/pom.xml
@@ -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>
diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml
index 224a4fcc06..79cc115477 100644
--- a/java/sca/distribution/features/webservice/pom.xml
+++ b/java/sca/distribution/features/webservice/pom.xml
@@ -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>
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml
index 71b47668c7..f092b2ee3e 100644
--- a/java/sca/distribution/pom.xml
+++ b/java/sca/distribution/pom.xml
@@ -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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 03:10:37 +0000