You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/09/02 05:22:08 UTC
svn commit: r691098 - in /myfaces/tomahawk/trunk/assembly: pom.xml
src/main/assembly/bin12.xml src/main/assembly/src12.xml
Author: lu4242
Date: Mon Sep 1 20:22:07 2008
New Revision: 691098
URL: http://svn.apache.org/viewvc?rev=691098&view=rev
Log:
update assembly project include core12 package (tomahawk12-1.1.x-bin.zip .....)
Added:
myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml (with props)
myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml (with props)
Modified:
myfaces/tomahawk/trunk/assembly/pom.xml
Modified: myfaces/tomahawk/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/pom.xml?rev=691098&r1=691097&r2=691098&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/assembly/pom.xml Mon Sep 1 20:22:07 2008
@@ -17,11 +17,9 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/assembly</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk/assembly</url>
</scm>
-
+
<build>
-
<plugins>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
@@ -37,7 +35,7 @@
<artifactItem>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>javadoc</classifier>
</artifactItem>
</artifactItems>
@@ -55,13 +53,13 @@
<artifactItem>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/assembly-lib</outputDirectory>
</configuration>
</execution>
-
+
<execution>
<id>copy-tlddoc</id>
<phase>package</phase>
@@ -73,7 +71,7 @@
<artifactItem>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<classifier>tlddoc</classifier>
</artifactItem>
</artifactItems>
@@ -88,42 +86,145 @@
</goals>
<configuration>
<artifactItems>
-
+
<artifactItem>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-tomahawk</artifactId>
+ <version>${myfaces-shared11-version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-javadoc12</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/javadoc12</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-lib12</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/assembly-lib12</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-tlddoc12</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>${project.version}</version>
+ <classifier>tlddoc</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/tlddoc12</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-source12</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+
+ <artifactItem>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
- <version>${myfaces-shared.version}</version>
+ <version>${myfaces-shared12-version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/src</outputDirectory>
+ <outputDirectory>${project.build.directory}/src12</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
-
<plugin>
+ <!-- EXECUTE mvn package to generate assembly files -->
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <finalName>tomahawk-${version}</finalName>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
+ <executions>
+ <execution>
+ <id>makeassembly11</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <finalName>tomahawk-${project.version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makeassembly12</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin12.xml</descriptor>
+ <descriptor>src/main/assembly/src12.xml</descriptor>
+ </descriptors>
+ <finalName>tomahawk12-${project.version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work12</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
-
<plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
@@ -134,17 +235,99 @@
<inputDirectory>target/assembly/out</inputDirectory>
</configuration>
</plugin>
-
- </plugins>
-
+ </plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
-
+
+ <!-- This profile attemped to add dependency libraries to tomahawk
+ binaries and source packages. But it needs to uncomment
+ on src/main/assembly/bin.xml dependencySets tag.
+
+ But the dependency libraries can be found on the examples
+ assembly, so it is better do not include it here.
+ -->
+ <!--
+ <profiles>
+ <profile>
+ <id>tomahawk11</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>makeassembly11</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <finalName>tomahawk-${project.version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tomahawk12</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>12</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>makeassembly12</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin12.xml</descriptor>
+ <descriptor>src/main/assembly/src12.xml</descriptor>
+ </descriptors>
+ <finalName>tomahawk12-${project.version}</finalName>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work12</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk12</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+ -->
</project>
Added: myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml?rev=691098&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml (added)
+++ myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml Mon Sep 1 20:22:07 2008
@@ -0,0 +1,45 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <!--<dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>-->
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/javadoc12</directory>
+ <outputDirectory>javadoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/assembly-lib12</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/tlddoc12</directory>
+ <outputDirectory>tlddoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/trunk/assembly/src/main/assembly/bin12.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml?rev=691098&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml (added)
+++ myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml Mon Sep 1 20:22:07 2008
@@ -0,0 +1,13 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/src12</directory>
+ <outputDirectory>src</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/trunk/assembly/src/main/assembly/src12.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL