You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2009/06/13 21:01:05 UTC
svn commit: r784451 - in /myfaces/tobago/branches/tobago-1.0.x:
build-nightly.sh example/tobago-example-assembly/pom.xml pom.xml
tobago-assembly/pom.xml
Author: bommel
Date: Sat Jun 13 19:01:05 2009
New Revision: 784451
URL: http://svn.apache.org/viewvc?rev=784451&view=rev
Log:
generate source assembly
Modified:
myfaces/tobago/branches/tobago-1.0.x/build-nightly.sh
myfaces/tobago/branches/tobago-1.0.x/example/tobago-example-assembly/pom.xml
myfaces/tobago/branches/tobago-1.0.x/pom.xml
myfaces/tobago/branches/tobago-1.0.x/tobago-assembly/pom.xml
Modified: myfaces/tobago/branches/tobago-1.0.x/build-nightly.sh
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/build-nightly.sh?rev=784451&r1=784450&r2=784451&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/build-nightly.sh (original)
+++ myfaces/tobago/branches/tobago-1.0.x/build-nightly.sh Sat Jun 13 19:01:05 2009
@@ -85,8 +85,8 @@
cd tobago
mvn -Djava14.home=$JAVA14_HOME -Daggregate=false -Pgenerate-assembly,attach-sources,jdk14retro -U clean install deploy
cd tobago-assembly
-mvn -Pgenerate-assembly clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
+mvn -Pgenerate-assembly clean org.apache.myfaces.maven:wagon-maven-plugin:deploy
cd ../example/tobago-example-assembly
-mvn -Pgenerate-assembly clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
+mvn -Pgenerate-assembly clean org.apache.myfaces.maven:wagon-maven-plugin:deploy
cd ../../..
Modified: myfaces/tobago/branches/tobago-1.0.x/example/tobago-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/tobago-example-assembly/pom.xml?rev=784451&r1=784450&r2=784451&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/tobago-example-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/tobago-example-assembly/pom.xml Sat Jun 13 19:01:05 2009
@@ -31,17 +31,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- <finalName>myfaces-tobago-${project.version}</finalName>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0.1</version>
@@ -51,10 +40,9 @@
<inputDirectory>target/assembly/out</inputDirectory>
</configuration>
</plugin>
-
</plugins>
-
</build>
+
<profiles>
<profile>
<id>generate-assembly</id>
@@ -67,7 +55,7 @@
<execution>
<id>copy-example</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -91,6 +79,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>generate-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ <finalName>myfaces-tobago-${project.version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: myfaces/tobago/branches/tobago-1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/pom.xml?rev=784451&r1=784450&r2=784451&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/pom.xml Sat Jun 13 19:01:05 2009
@@ -716,7 +716,7 @@
<descriptorRef>project</descriptorRef>
</descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
- <outputDirectory>target/assembly</outputDirectory>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
</configuration>
</execution>
</executions>
@@ -844,6 +844,7 @@
<descriptorRef>project</descriptorRef>
</descriptorRefs>
<tarLongFileMode>gnu</tarLongFileMode>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
</configuration>
</execution>
</executions>
Modified: myfaces/tobago/branches/tobago-1.0.x/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/tobago-assembly/pom.xml?rev=784451&r1=784450&r2=784451&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/tobago-assembly/pom.xml Sat Jun 13 19:01:05 2009
@@ -30,16 +30,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- <finalName>myfaces-tobago-${project.version}</finalName>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.myfaces.maven</groupId>
@@ -53,7 +43,6 @@
</plugin>
</plugins>
-
</build>
<dependencies>
@@ -100,7 +89,7 @@
<executions>
<execution>
<id>copy-javadoc</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -121,8 +110,38 @@
</execution>
<execution>
+ <id>copy-project</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tobago</artifactId>
+ <version>${project.version}</version>
+ <classifier>project</classifier>
+ <type>tar.gz</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tobago</artifactId>
+ <version>${project.version}</version>
+ <classifier>project</classifier>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/assembly/out
+ </outputDirectory>
+ <unpackMarkersDirectory>${project.build.directory}/project
+ </unpackMarkersDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
<id>copy-sandbox</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -143,7 +162,7 @@
<execution>
<id>copy-tlddoc</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -167,7 +186,7 @@
<execution>
<id>copy-tld</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -190,7 +209,7 @@
<execution>
<id>copy-extension</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -233,7 +252,7 @@
<execution>
<id>copy-source</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -302,7 +321,7 @@
<execution>
<id>copy-jdk14retro</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -340,7 +359,55 @@
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <id>generate-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ <finalName>myfaces-tobago-${project.version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <id>rename-files</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <move failonerror="false"
+ file="${project.build.directory}/assembly/out/tobago-${project.version}-project.tar.gz"
+ toFile="${project.build.directory}/assembly/out/myfaces-tobago-${project.version}-project.tar.gz"/>
+ <move failonerror="false"
+ file="${project.build.directory}/assembly/out/tobago-${project.version}-project.tar.gz"
+ toFile="${project.build.directory}/assembly/out/myfaces-tobago-${project.version}-project.zip"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
</plugins>
</build>
</profile>