You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/17 23:50:39 UTC

svn commit: r488073 - in /tapestry/tapestry4/trunk: BUILDING.txt pom.xml src/main/assembly/dep.xml

Author: jkuhnert
Date: Sun Dec 17 14:50:39 2006
New Revision: 488073

URL: http://svn.apache.org/viewvc?view=rev&rev=488073
Log:
Managed to get the maven assemblies stuff to work the way we want finally. See BUILDING.txt for more instructions.

Added:
    tapestry/tapestry4/trunk/BUILDING.txt   (with props)
Modified:
    tapestry/tapestry4/trunk/pom.xml
    tapestry/tapestry4/trunk/src/main/assembly/dep.xml

Added: tapestry/tapestry4/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/BUILDING.txt?view=auto&rev=488073
==============================================================================
--- tapestry/tapestry4/trunk/BUILDING.txt (added)
+++ tapestry/tapestry4/trunk/BUILDING.txt Sun Dec 17 14:50:39 2006
@@ -0,0 +1,5 @@
+There is a small bug currently with maven that prevents assemblies from being properly produced
+if using the defaults. (to be fixed in maven 2.1)
+
+For now, use a command similar to this to produce a distribution:
+mvn -Dmaven.test.skip=true clean package assembly:assembly

Propchange: tapestry/tapestry4/trunk/BUILDING.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=488073&r1=488072&r2=488073
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sun Dec 17 14:50:39 2006
@@ -347,7 +347,9 @@
                     <version>2.2-SNAPSHOT</version>
                     <inherited>true</inherited>
                     <configuration>
-                        <descriptor>src/main/assembly/dep.xml</descriptor>
+                        <descriptors>
+                            <descriptor>src/main/assembly/dep.xml</descriptor>
+                        </descriptors>
                     </configuration>
                 </plugin>
                 <plugin>

Modified: tapestry/tapestry4/trunk/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/main/assembly/dep.xml?view=diff&rev=488073&r1=488072&r2=488073
==============================================================================
--- tapestry/tapestry4/trunk/src/main/assembly/dep.xml (original)
+++ tapestry/tapestry4/trunk/src/main/assembly/dep.xml Sun Dec 17 14:50:39 2006
@@ -1,42 +1,44 @@
 <assembly>
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <moduleSets>
-    <moduleSet>
-        <includes>
-            <include>org.apache.tapestry:tapestry-annotations</include>
-            <include>org.apache.tapestry:tapestry-contrib</include>
-            <include>org.apache.tapestry:tapestry-examples</include>
-            <include>org.apache.tapestry:tapestry-framework</include>
-            <include>org.apache.tapestry:tapestry-portlet</include>
-        </includes>
-        <binaries>
+    <id>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>tar.bz2</format>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
             <includes>
-                <include>target/*.jar</include>
-                <include>target/*.war</include>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
             </includes>
-        </binaries>
-    </moduleSet>
-  </moduleSets>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.apache.tapestry:tapestry-annotations</include>
+                <include>org.apache.tapestry:tapestry-contrib</include>
+                <include>org.apache.tapestry:tapestry-examples</include>
+                <include>org.apache.tapestry:tapestry-framework</include>
+                <include>org.apache.tapestry:tapestry-portlet</include>
+            </includes>
+            <binaries>
+                <outputDirectory>modules/${artifactId}</outputDirectory>
+                <includeDependencies>true</includeDependencies>
+                <unpack>false</unpack>
+            </binaries>
+            <sources>
+                <outputDirectory>sources/${artifactId}</outputDirectory>
+            </sources>
+        </moduleSet>
+    </moduleSets>
 </assembly>