You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2006/06/02 19:27:30 UTC
svn commit: r411216 - in /myfaces: core/trunk/assembly/
core/trunk/assembly/src/main/assembly/ core/trunk/impl/
tomahawk/trunk/assembly/ tomahawk/trunk/assembly/src/main/assembly/
Author: schof
Date: Fri Jun 2 10:27:29 2006
New Revision: 411216
URL: http://svn.apache.org/viewvc?rev=411216&view=rev
Log:
more assembly changes by Catalin
Added:
myfaces/tomahawk/trunk/assembly/src/main/assembly/bin.xml (with props)
myfaces/tomahawk/trunk/assembly/src/main/assembly/src.xml (with props)
Removed:
myfaces/core/trunk/assembly/src/main/assembly/dep.xml
myfaces/tomahawk/trunk/assembly/src/main/assembly/dep.xml
Modified:
myfaces/core/trunk/assembly/pom.xml
myfaces/core/trunk/impl/pom.xml
myfaces/tomahawk/trunk/assembly/pom.xml
Modified: myfaces/core/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/assembly/pom.xml?rev=411216&r1=411215&r2=411216&view=diff
==============================================================================
--- myfaces/core/trunk/assembly/pom.xml (original)
+++ myfaces/core/trunk/assembly/pom.xml Fri Jun 2 10:27:29 2006
@@ -51,15 +51,6 @@
<classifier>javadoc</classifier>
</artifactItem>
- <!--
- TODO/CHECK: o.a.m.shared_impl.* javadoc automatically included?
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- -->
</artifactItems>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
</configuration>
@@ -92,20 +83,28 @@
</goals>
<configuration>
<artifactItems>
- <artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${version}</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${version}</version>
- <classifier>sources</classifier>
+ <classifier>sources</classifier>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
+
</artifactItems>
<outputDirectory>${project.build.directory}/src</outputDirectory>
</configuration>
@@ -117,10 +116,10 @@
<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>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
<finalName>myfaces-core-${version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=411216&r1=411215&r2=411216&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Fri Jun 2 10:27:29 2006
@@ -59,7 +59,7 @@
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -249,7 +249,7 @@
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: myfaces/tomahawk/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/pom.xml?rev=411216&r1=411215&r2=411216&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/assembly/pom.xml (original)
+++ myfaces/tomahawk/trunk/assembly/pom.xml Fri Jun 2 10:27:29 2006
@@ -46,7 +46,7 @@
</artifactItems>
<outputDirectory>${project.build.directory}/javadoc</outputDirectory>
</configuration>
- </execution>
+ </execution>
<execution>
<id>copy-lib</id>
<phase>package</phase>
@@ -59,12 +59,12 @@
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<version>${version}</version>
- </artifactItem>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/assembly-lib</outputDirectory>
</configuration>
</execution>
-
+
<execution>
<id>copy-tlddoc</id>
<phase>package</phase>
@@ -73,14 +73,12 @@
</goals>
<configuration>
<artifactItems>
-
<artifactItem>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<version>${version}</version>
<classifier>tlddoc</classifier>
</artifactItem>
-
</artifactItems>
<outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
</configuration>
@@ -89,7 +87,7 @@
<id>copy-source</id>
<phase>package</phase>
<goals>
- <goal>copy</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
@@ -101,6 +99,13 @@
<classifier>sources</classifier>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-tomahawk</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+
</artifactItems>
<outputDirectory>${project.build.directory}/src</outputDirectory>
</configuration>
@@ -110,9 +115,12 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0.1</version>
<configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
+ <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>
Added: myfaces/tomahawk/trunk/assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/src/main/assembly/bin.xml?rev=411216&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/assembly/src/main/assembly/bin.xml (added)
+++ myfaces/tomahawk/trunk/assembly/src/main/assembly/bin.xml Fri Jun 2 10:27:29 2006
@@ -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/javadoc</directory>
+ <outputDirectory>javadoc</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/assembly-lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/tlddoc</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/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/tomahawk/trunk/assembly/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/src/main/assembly/src.xml?rev=411216&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/assembly/src/main/assembly/src.xml (added)
+++ myfaces/tomahawk/trunk/assembly/src/main/assembly/src.xml Fri Jun 2 10:27:29 2006
@@ -0,0 +1,13 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>target/src</directory>
+ <outputDirectory>source</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: myfaces/tomahawk/trunk/assembly/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native