myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r411171 - in /myfaces/core/trunk/assembly: pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml
Date Fri, 02 Jun 2006 14:32:43 GMT
Author: schof
Date: Fri Jun  2 07:32:43 2006
New Revision: 411171

URL: http://svn.apache.org/viewvc?rev=411171&view=rev
Log:
Now building source bundles in assembly step (Fix by Catalin Kormos)

Added:
    myfaces/core/trunk/assembly/src/main/assembly/bin.xml
    myfaces/core/trunk/assembly/src/main/assembly/src.xml
Modified:
    myfaces/core/trunk/assembly/pom.xml

Modified: myfaces/core/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/assembly/pom.xml?rev=411171&r1=411170&r2=411171&view=diff
==============================================================================
--- myfaces/core/trunk/assembly/pom.xml (original)
+++ myfaces/core/trunk/assembly/pom.xml Fri Jun  2 07:32:43 2006
@@ -36,18 +36,21 @@
             </goals>
             <configuration>
               <artifactItems>
+
                 <artifactItem>
                   <groupId>org.apache.myfaces.core</groupId>
                   <artifactId>myfaces-api</artifactId>
                   <version>${version}</version>
                   <classifier>javadoc</classifier>
                 </artifactItem>
+
                 <artifactItem>
                   <groupId>org.apache.myfaces.core</groupId>
                   <artifactId>myfaces-impl</artifactId>
                   <version>${version}</version>
                   <classifier>javadoc</classifier>
                 </artifactItem>
+
                 <!--
                 TODO/CHECK: o.a.m.shared_impl.* javadoc automatically included?
                 <artifactItem>
@@ -85,16 +88,22 @@
             <id>copy-source</id>
             <phase>package</phase>
             <goals>
-              <goal>copy</goal>
+              <goal>unpack</goal>
             </goals>
             <configuration>
               <artifactItems>
+  							<artifactItem>
+                  <groupId>org.apache.myfaces.core</groupId>
+                  <artifactId>myfaces-api</artifactId>
+                  <version>${version}</version>
+								  <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>
 
                </artifactItems>
@@ -106,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>myfaces-core-${version}</finalName>
           <outputDirectory>target/assembly/out</outputDirectory>
           <workDirectory>target/assembly/work</workDirectory>
@@ -118,7 +130,7 @@
       <plugin>
         <groupId>org.apache.myfaces.maven</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.4-SNAPSHOT</version>
         <configuration>
           <id>myfaces-nightly-builds</id>
           <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>

Added: myfaces/core/trunk/assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/assembly/src/main/assembly/bin.xml?rev=411171&view=auto
==============================================================================
--- myfaces/core/trunk/assembly/src/main/assembly/bin.xml (added)
+++ myfaces/core/trunk/assembly/src/main/assembly/bin.xml Fri Jun  2 07:32:43 2006
@@ -0,0 +1,40 @@
+<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>
+        <include>RELEASE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/javadoc</directory>
+      <outputDirectory>javadoc</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/tlddoc</directory>
+      <outputDirectory>tlddoc</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+
+  </fileSets>
+</assembly>

Added: myfaces/core/trunk/assembly/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/assembly/src/main/assembly/src.xml?rev=411171&view=auto
==============================================================================
--- myfaces/core/trunk/assembly/src/main/assembly/src.xml (added)
+++ myfaces/core/trunk/assembly/src/main/assembly/src.xml Fri Jun  2 07:32:43 2006
@@ -0,0 +1,23 @@
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>  
+  <fileSets>
+    <fileSet>
+    	<directory>src/main/resources</directory>
+    	<outputDirectory></outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>RELEASE*</include>
+      </includes>
+    </fileSet>   
+    <fileSet>
+      <directory>target/src</directory>
+      <outputDirectory>source</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>



Mime
View raw message