Author: rfeng
Date: Thu Apr 30 16:41:01 2009
New Revision: 770316
URL: http://svn.apache.org/viewvc?rev=770316&view=rev
Log:
Use maven-assembly-plugin to create zip contribution
Fix the parent pom and junit version
Added:
tuscany/java/sca/archetypes/contribution-zip-discriptor/ (with props)
tuscany/java/sca/archetypes/contribution-zip-discriptor/pom.xml
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
Modified:
tuscany/java/sca/archetypes/contribution-jar/pom.xml
tuscany/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
tuscany/java/sca/archetypes/contribution-zip/pom.xml
tuscany/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
tuscany/java/sca/archetypes/pom.xml
tuscany/java/sca/archetypes/quickstart-jsf/pom.xml
tuscany/java/sca/archetypes/quickstart-stripes/pom.xml
tuscany/java/sca/archetypes/quickstart/pom.xml
Modified: tuscany/java/sca/archetypes/contribution-jar/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/contribution-jar/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/contribution-jar/pom.xml (original)
+++ tuscany/java/sca/archetypes/contribution-jar/pom.xml Thu Apr 30 16:41:01
2009
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified:
tuscany/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
Thu Apr 30 16:41:01 2009
@@ -42,7 +42,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
Propchange: tuscany/java/sca/archetypes/contribution-zip-discriptor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 30 16:41:01 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Added: tuscany/java/sca/archetypes/contribution-zip-discriptor/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/contribution-zip-discriptor/pom.xml?rev=770316&view=auto
==============================================================================
--- tuscany/java/sca/archetypes/contribution-zip-discriptor/pom.xml (added)
+++ tuscany/java/sca/archetypes/contribution-zip-discriptor/pom.xml Thu Apr 30
16:41:01 2009
@@ -0,0 +1,33 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-zip-contribution-descriptor</artifactId>
+ <name>Tuscany SCA ZIP contribution Shared Assembly Descriptor</name>
+
+
+</project>
Added:
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml?rev=770316&view=auto
==============================================================================
---
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
(added)
+++
tuscany/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
Thu Apr 30 16:41:01 2009
@@ -0,0 +1,21 @@
+<assembly>
+ <id>zip-contribution</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: tuscany/java/sca/archetypes/contribution-zip/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/contribution-zip/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/contribution-zip/pom.xml (original)
+++ tuscany/java/sca/archetypes/contribution-zip/pom.xml Thu Apr 30 16:41:01
2009
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified:
tuscany/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
Thu Apr 30 16:41:01 2009
@@ -7,116 +7,147 @@
* 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.
+ * 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";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>zip</packaging>
- <version>${version}</version>
- #literal()<!-- TODO project name -->
- <name>quickstart</name>
- <description></description>
-
- <dependencies>
- <!-- TUSCANY DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>${tuscany.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP
-->
- <dependency>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- <version>1.2</version>
- </dependency>
-
- <!-- JUNIT DEPENDENCY FOR TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
- <finalName>${artifactId}</finalName>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimise>true</optimise>
- <debug>true</debug>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
-
<groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-zip-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
-
<groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <properties>
- <tuscany.version>2.0-SNAPSHOT</tuscany.version>
- </properties>
- #end
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>jar</packaging>
+ <version>${version}</version>
+ #literal() <!-- TODO project name -->
+ <name>quickstart</name>
+ <description></description>
+
+ <dependencies>
+ <!-- TUSCANY DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!--
+ AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP
+ -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <!-- AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP -->
+ <dependency>
+ <groupId>commons-math</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!-- JUNIT DEPENDENCY FOR TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <finalName>${artifactId}</finalName>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimise>true</optimise>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>tuscany-zip-contribution-descriptor</artifactId>
+ <version>${tuscany.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <!-- This is where we use our shared assembly
descriptor -->
+ <descriptors>
+
<descriptor>tuscany-zip-contribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.maven.plugins</groupId>
+ <artifactId>maven-tuscany-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+ </properties>
+ #end
</project>
\ No newline at end of file
Modified: tuscany/java/sca/archetypes/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/pom.xml (original)
+++ tuscany/java/sca/archetypes/pom.xml Thu Apr 30 16:41:01 2009
@@ -39,6 +39,7 @@
<modules>
<module>contribution-jar</module>
<module>contribution-zip</module>
+ <module>contribution-zip-discriptor</module>
<module>quickstart</module>
<module>quickstart-jsf</module>
<module>quickstart-stripes</module>
Modified: tuscany/java/sca/archetypes/quickstart-jsf/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart-jsf/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/quickstart-jsf/pom.xml (original)
+++ tuscany/java/sca/archetypes/quickstart-jsf/pom.xml Thu Apr 30 16:41:01 2009
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: tuscany/java/sca/archetypes/quickstart-stripes/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart-stripes/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/quickstart-stripes/pom.xml (original)
+++ tuscany/java/sca/archetypes/quickstart-stripes/pom.xml Thu Apr 30 16:41:01
2009
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: tuscany/java/sca/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/pom.xml?rev=770316&r1=770315&r2=770316&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/quickstart/pom.xml (original)
+++ tuscany/java/sca/archetypes/quickstart/pom.xml Thu Apr 30 16:41:01 2009
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
