Author: slaws
Date: Tue Nov 24 12:40:17 2009
New Revision: 883670
URL: http://svn.apache.org/viewvc?rev=883670&view=rev
Log:
Set the default maven build to not generate distribution archives but generate
a directory instead. To run a build that generates the archives use mvn
-Pdistribution instead.
Added:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
(with props)
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
(with props)
Removed:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin.xml
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
Modified: tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/pom.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/pom.xml Tue Nov 24 12:40:17 2009
@@ -59,6 +59,72 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/bin-default.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+
<finalName>apache-tuscany-sca-all-${version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>distribution</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/bin-distribution.xml</descriptor>
+
<descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+
<finalName>apache-tuscany-sca-all-${version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -106,7 +172,7 @@
</dependency>
</dependencies>
</plugin>
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -128,7 +194,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
</plugins>
</build>
Added:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml?rev=883670&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
(added)
+++
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
Tue Nov 24 12:40:17 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
+ <id></id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-sca-${version}</baseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <componentDescriptors>
+
<componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
+
<componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>
+
<componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+
<componentDescriptor>src/main/components/bin-launcher.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Propchange:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-default.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml?rev=883670&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
(added)
+++
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
Tue Nov 24 12:40:17 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
+ <id></id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>tuscany-sca-${version}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <componentDescriptors>
+
<componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
+
<componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>
+
<componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+
<componentDescriptor>src/main/components/bin-launcher.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Propchange:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/assembly/bin-distribution.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml
Tue Nov 24 12:40:17 2009
@@ -17,8 +17,11 @@
* under the License.
-->
<project name="itest-unzip" default="unzip">
+
<target name="unzip">
+ <delete
dir="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/>
<unzip
src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.zip"
-
dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir"/>
+
dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/>
</target>
+
</project>
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/binding-ws-calculator/build.xml
Tue Nov 24 12:40:17 2009
@@ -28,7 +28,7 @@
service sides of the sample.
-->
- <property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}"
/>
+ <property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}"
/>
<target name="run">
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml
(original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/calculator-rmi/build.xml Tue
Nov 24 12:40:17 2009
@@ -27,7 +27,7 @@
service sides of the sample.
-->
- <property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}"
/>
+ <property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}"
/>
<target name="run">
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/implementation-java-calculator/build.xml
Tue Nov 24 12:40:17 2009
@@ -28,7 +28,7 @@
service sides of the sample.
-->
- <property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-dir/tuscany-sca-${tuscany.version}"
/>
+ <property name="distro.root"
value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}"
/>
<target name="run">
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
Tue Nov 24 12:40:17 2009
@@ -130,7 +130,7 @@
File distroTarget = new File("../../../distribution/all/target");
File root = null;
for (String f : distroTarget.list()) {
- if (f.endsWith("-dir")) {
+ if (f.endsWith(".dir")) {
root = new File(distroTarget, f);
break;
}
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/pom.xml Tue Nov 24 12:40:17
2009
@@ -28,23 +28,56 @@
<packaging>pom</packaging>
<artifactId>itest-distribution</artifactId>
<name>Apache Tuscany SCA iTest Distribution</name>
-
- <build>
- <defaultGoal>install</defaultGoal>
- </build>
- <modules>
- <module>bin-distro-unzip</module>
- <module>binding-ws-calculator</module>
- <module>calculator-rmi</module>
- <module>implementation-java-calculator</module>
- <module>legal-checks</module>
- <module>webapp-helloworld</module>
- <module>webapp-helloworld-bpel</module>
- <module>webapp-helloworld-js-client</module>
- <module>webapp-helloworld-jsp</module>
- <module>webapp-helloworld-servlet</module>
- <module>webapp-helloworld-stripes</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-distribution-all</artifactId>
+ <type>pom</type>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>binding-ws-calculator</module>
+ <module>calculator-rmi</module>
+ <module>implementation-java-calculator</module>
+ <module>legal-checks</module>
+ <module>webapp-helloworld</module>
+ <module>webapp-helloworld-bpel</module>
+ <module>webapp-helloworld-js-client</module>
+ <module>webapp-helloworld-jsp</module>
+ <module>webapp-helloworld-servlet</module>
+ <module>webapp-helloworld-stripes</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>distribution</id>
+ <modules>
+ <module>bin-distro-unzip</module>
+ <module>binding-ws-calculator</module>
+ <module>calculator-rmi</module>
+ <module>implementation-java-calculator</module>
+ <module>legal-checks</module>
+ <module>webapp-helloworld</module>
+ <module>webapp-helloworld-bpel</module>
+ <module>webapp-helloworld-js-client</module>
+ <module>webapp-helloworld-jsp</module>
+ <module>webapp-helloworld-servlet</module>
+ <module>webapp-helloworld-stripes</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
</project>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=883670&r1=883669&r2=883670&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Tue Nov 24 12:40:17 2009
@@ -261,10 +261,6 @@
<module>shades</module>
<module>distribution</module>
<module>archetypes</module>
-<!--
- <module>stest</module>
- <module>vtest</module>
--->
</modules>
</profile>
@@ -275,14 +271,14 @@
<module>samples</module>
<module>itest</module>
<module>features</module>
+ <module>shades</module>
<module>distribution</module>
<module>archetypes</module>
-<!--
- <module>vtest</module>
--->
</modules>
</profile>
+<!-- START - WHAT ARE THE FOLLOWING PROFILES FOR? -->
+
<profile>
<id>sources</id>
<modules>
@@ -423,9 +419,7 @@
<profile>
<id>security</id>
<modules>
- <!-- <module>demos</module> -->
<module>itest</module>
- <module>vtest</module>
</modules>
<activation>
<property>
@@ -571,6 +565,8 @@
</modules>
</profile>
+<!-- END - WHAT ARE THE FOLLOWING PROFILES FOR? -->
+
</profiles>
