Author: ptahchiev
Date: Mon Feb 4 04:49:44 2008
New Revision: 618260
URL: http://svn.apache.org/viewvc?rev=618260&view=rev
Log:
changes on the assembly files.
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml?rev=618260&r1=618259&r2=618260&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml Mon
Feb 4 04:49:44 2008
@@ -7,38 +7,45 @@
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${project.artifactId}-${project.version}-bin</baseDirectory>
- <!--fileSets>
+ <fileSets>
<fileSet>
<useDefaultExcludes>false</useDefaultExcludes>
<excludes>
<exclude>build-tools/**</exclude>
+ <exclude>bin/**</exclude>
<exclude>cactus-maven-skin/**</exclude>
<exclude>framework/**</exclude>
<exclude>integration/**</exclude>
<exclude>scratchpad/**</exclude>
- <exclude>**/target/**</exclude-->
+ <exclude>**/target/**</exclude>
<!--Kate makes such temp files. -->
- <!--exclude>**/*.*~</exclude>
+ <exclude>**/*.*~</exclude>
+ <!-- svn directories -->
+ <exclude>**/.*svn*/**</exclude>
</excludes>
</fileSet>
- </fileSets-->
+ </fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <outputFileNameMapping/>
<includes>
-
<include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14:1.8.0-SNAPSHOT</include>
-
<include>org.apache.cactus:cactus.integration.ant:1.8.0-SNAPSHOT:jar</include>
- <include>aspectj:aspectjrt:1.2.1:jar</include>
-
<include>org.codehaus.cargo:cargo-core-uberjar:jar</include>
-
<include>commons-httpclient:commons-httpclient:2.0.2:jar</include>
-
<include>commons-logging:commons-logging:1.0.4:jar</include>
- <include>httpunit:httpunit:1.6:jar</include>
- <include>junit:junit:3.8.2:jar</include>
- <include>nekohtml:nekohtml:jar</include>
+ <include>*:jar:*</include>
</includes>
<unpack>false</unpack>
<scope>test</scope>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+ <moduleSets>
+ <moduleSet>
+ <binaries>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includeDependencies>true</includeDependencies>
+ <includes>
+
<include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14:jar</include>
+ <include>org.apache.cactus:cactus.integration.ant:jar</include>
+ </includes>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml?rev=618260&r1=618259&r2=618260&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml Mon
Feb 4 04:49:44 2008
@@ -17,7 +17,11 @@
<exclude>**/target/**</exclude>
<!--Kate makes such temp files. -->
<exclude>**/*.*~</exclude>
+ <!--Eclipse's work directory -->
+ <exclude>bin/**</exclude>
+ <!-- svn directories -->
+ <exclude>.svn/**</exclude>
</excludes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=618260&r1=618259&r2=618260&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Mon Feb 4 04:49:44
2008
@@ -34,6 +34,46 @@
we require Maven 2.0.4 -->
<maven>2.0.4</maven>
</prerequisites>
+ <!-- THESE DEPENDENCIES ARE LISTED HERE SO THAT THE ASSEMBLY PLUGIN CAN
PRODUCE THE LIB FOLDER IN THE ASSEMBLIES-->
+ <dependencies>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency> <!-- used by httpunit -->
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ </dependencies>
+
+
<dependencyManagement>
<dependencies>
<!-- build time only - might want to use plugins for
this? -->
@@ -266,7 +306,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
-
<descriptor>cactus-src-assembly.xml</descriptor>
+
<!--descriptor>cactus-src-assembly.xml</descriptor-->
<descriptor>cactus-bin-assembly.xml</descriptor>
</descriptors>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
