jakarta-cactus-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptahch...@apache.org
Subject svn commit: r620106 - in /jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH: cactus-bin-assembly.xml cactus-src-assembly.xml descriptors/ descriptors/pom.xml framework/framework-uberjars/javaEE-14-uberjar/pom.xml pom.xml samples/pom.xml
Date Sat, 09 Feb 2008 13:26:45 GMT
Author: ptahchiev
Date: Sat Feb  9 05:26:44 2008
New Revision: 620106

URL: http://svn.apache.org/viewvc?rev=620106&view=rev
Log:
Changes on the assemblies

Added:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/descriptors/
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/descriptors/pom.xml
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/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/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=620106&r1=620105&r2=620106&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml Sat Feb  9 05:26:44
2008
@@ -5,26 +5,9 @@
 		<format>tar.gz</format>
 		<format>tar.bz2</format>
 	</formats>
-	<includeBaseDirectory>true</includeBaseDirectory>
+	<includeBaseDirectory>false</includeBaseDirectory>
 	<baseDirectory>${project.artifactId}-${project.version}-bin</baseDirectory>
-	<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>
-				<!--Kate makes such temp files. -->
-				<exclude>**/*.*~</exclude>
-				<!-- svn directories -->
-				<exclude>**/.*svn*/**</exclude>
-			</excludes>
-		</fileSet>
-	</fileSets>
+	<scope>runtime</scope>
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>/lib</outputDirectory>
@@ -32,20 +15,62 @@
 				<include>*:jar:*</include>
 			</includes>
 			<unpack>false</unpack>
-			<scope>test</scope>
 		</dependencySet>
 	</dependencySets>
-	<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>
+	<fileSets>
+		<useDefaultExcludes>false</useDefaultExcludes>
+		<fileSet>
+			<includes>
+				<include>README</include>
+				<include>LICENSE</include>
+				<include>NOTICE</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>framework/framework-uberjars/javaEE-14-uberjar/target</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>integration/ant/target</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>cactus-site/target/site</directory>
+			<outputDirectory>cactus-site</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>samples</directory>
+			<outputDirectory>samples</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+			<excludes>
+				<exclude>pom.xml</exclude>
+				<exclude>**/target/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>framework/web</directory>
+			<outputDirectory>web</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>descriptors</directory>
+			<outputDirectory>samples</outputDirectory>
+			<includes>
+				<include>pom.xml</include>
+			</includes>
+		</fileSet>
+</fileSets>
+</assembly>
\ No newline at end of file

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=620106&r1=620105&r2=620106&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml Sat Feb  9 05:26:44
2008
@@ -20,8 +20,15 @@
 				<!--Eclipse's work directory -->
 				<exclude>bin/**</exclude>
 				<!-- svn directories -->
-				<exclude>.svn/**</exclude>
+				<exclude>**/.svn/**</exclude>
       </excludes>
+		</fileSet>
+		<fileSet>
+			<directory>cactus-site/target</directory>
+			<outputDirectory>cactus-site</outputDirectory>
+			<includes>
+				<include>site</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 </assembly>

Added: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/descriptors/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/descriptors/pom.xml?rev=620106&view=auto
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/descriptors/pom.xml (added)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/descriptors/pom.xml Sat Feb  9 05:26:44 2008
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one
+	or more contributor license agreements.  See the NOTICE file
+	distributed with this work for additional information
+	regarding copyright ownership.  The ASF licenses this file
+	to you under the Apache License, Version 2.0 (the
+	"License"); you may not use this file except in compliance
+	with the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing,
+	software distributed under the License is distributed on an
+	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	KIND, either express or implied.  See the License for the
+	specific language governing permissions and limitations
+	under the License.   
+-->
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.cactus</groupId>
+	<artifactId>cactus.samples</artifactId>
+	<version>1.8.0-SNAPSHOT</version>
+	<name>Cactus Samples - Parent Project</name>
+	<description>Cactus Sample Projects</description>
+	<packaging>pom</packaging>
+	<dependencies>
+  	<dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-ejb</artifactId>
+      <version>2.1-rc4</version>
+    </dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>org.mortbay.jetty</artifactId>
+			<version>4.2.25</version>
+		</dependency>
+  </dependencies>  
+  <profiles>
+    <profile>
+      <id>with-samples</id>
+      <modules>
+    	  <module>servlet</module>
+    	  <module>ejb</module>
+    	  <module>jetty</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>
+
+
+
+ 

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml?rev=620106&r1=620105&r2=620106&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
Sat Feb  9 05:26:44 2008
@@ -46,7 +46,7 @@
 				<version>2.2-beta-1</version>
 				<configuration>
 				  <descriptors>
-					 <descriptor>src/assemble/main.xml</descriptor>
+						<descriptor>src/assemble/main.xml</descriptor>
 					</descriptors>
 				</configuration>
 				<executions>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=620106&r1=620105&r2=620106&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Sat Feb  9 05:26:44 2008
@@ -217,6 +217,10 @@
 			<plugin>
 				<artifactId>maven-clover-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
 			<!--plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
@@ -306,7 +310,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>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml?rev=620106&r1=620105&r2=620106&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/pom.xml Sat Feb  9 05:26:44 2008
@@ -34,6 +34,11 @@
       <artifactId>geronimo-spec-ejb</artifactId>
       <version>2.1-rc4</version>
     </dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>org.mortbay.jetty</artifactId>
+			<version>4.2.25</version>
+		</dependency>
   </dependencies>  
   <profiles>
     <profile>



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org


Mime
View raw message