You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2006/10/03 17:53:03 UTC

svn commit: r452548 - in /cocoon/trunk: assembly.xml pom.xml

Author: vgritsenko
Date: Tue Oct  3 08:53:02 2006
New Revision: 452548

URL: http://svn.apache.org/viewvc?view=rev&rev=452548
Log:
latest assembly plugin snapshot works (not in repository yet)

Modified:
    cocoon/trunk/assembly.xml
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/assembly.xml?view=diff&rev=452548&r1=452547&r2=452548
==============================================================================
--- cocoon/trunk/assembly.xml (original)
+++ cocoon/trunk/assembly.xml Tue Oct  3 08:53:02 2006
@@ -25,15 +25,20 @@
     <!--
     <format>tar.gz</format>
     <format>tar.bz2</format>
-    <format>dir</format>
-    -->
     <format>zip</format>
+    -->
+    <format>dir</format>
   </formats>
 
   <includeBaseDirectory>false</includeBaseDirectory>
 
   <moduleSets>
     <moduleSet>
+      <excludes>
+        <exclude>org.apache.cocoon:cocoon-webapp</exclude>
+        <exclude>org.apache.cocoon:cocoon-deployer-minimal-webapp</exclude>
+        <exclude>org.apache.cocoon:cocoon-dists-modules</exclude>
+      </excludes>
       <!--
       <sources>
         <outputDirectory></outputDirectory>
@@ -43,6 +48,19 @@
         <includeDependencies>true</includeDependencies>
         <unpack>false</unpack>
         <outputDirectory>lib</outputDirectory>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+
+  <moduleSets>
+    <moduleSet>
+      <includes>
+        <include>org.apache.cocoon:cocoon-webapp</include>
+      </includes>
+      <binaries>
+        <includeDependencies>true</includeDependencies>
+        <unpack>false</unpack>
+        <outputDirectory>www</outputDirectory>
       </binaries>
     </moduleSet>
   </moduleSets>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=452548&r1=452547&r2=452548
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Tue Oct  3 08:53:02 2006
@@ -496,17 +496,15 @@
           <tagBase>https://svn.apache.org/repos/asf/cocoon/tags</tagBase>
         </configuration>
       </plugin>
-      <!--
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-SNAPSHOT</version>
         <configuration>
           <descriptor>assembly.xml</descriptor>
           <outputDirectory>target</outputDirectory>
-          <workDirectory>target/assembly/work</workDirectory>
+          <workDirectory>target/assembly</workDirectory>
         </configuration>
       </plugin>
-      -->
     </plugins>
   </build>