empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From franci...@apache.org
Subject svn commit: r759381 - in /incubator/empire-db/trunk: empire-assembly-all.xml pom.xml
Date Fri, 27 Mar 2009 22:54:01 GMT
Author: francisdb
Date: Fri Mar 27 22:54:01 2009
New Revision: 759381

URL: http://svn.apache.org/viewvc?rev=759381&view=rev
Log:
corrected various assembly issues

Modified:
    incubator/empire-db/trunk/empire-assembly-all.xml
    incubator/empire-db/trunk/pom.xml

Modified: incubator/empire-db/trunk/empire-assembly-all.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-assembly-all.xml?rev=759381&r1=759380&r2=759381&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-assembly-all.xml (original)
+++ incubator/empire-db/trunk/empire-assembly-all.xml Fri Mar 27 22:54:01 2009
@@ -16,56 +16,27 @@
    limitations under the License.
 -->
 <assembly>
-	<id>kitchensink</id>
+	<id></id>
 	<formats>
 		<format>tar.gz</format>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>true</includeBaseDirectory>
 	<fileSets>
-		<fileSet>
-			<directory>archetypes</directory>
-			<outputDirectory>src/archetypes</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<excludes>
-				<exclude>**/quickstart/target/**</exclude>
-				<exclude>**/.classpath/**</exclude>
-				<exclude>**/.project/**</exclude>
-				<exclude>**/.settings/**</exclude>
-				<exclude>**/.amateras/**</exclude>
-				<exclude>**/.tomcatplugin/**</exclude>
-			</excludes>
-		</fileSet>
+		<!-- TODO see how to get this working -->
 		<fileSet>
 			<directory>target/site/apidocs</directory>
 			<outputDirectory>apidocs</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>testing</directory>
-			<outputDirectory>src/testing</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<excludes>
-				<exclude>target/**</exclude>
-				<exclude>**/.classpath/**</exclude>
-				<exclude>**/.project/**</exclude>
-				<exclude>**/.settings/**</exclude>
-				<exclude>**/.amateras/**</exclude>
-				<exclude>**/.tomcatplugin/**</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
 			<directory>${basedir}</directory>
 			<outputDirectory>src</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
 				<include>*.xml</include>
 				<include>empire-db/**</include>
-				<include>empire-db-examples/empire-db-example/**</include>
-				<include>empire-db-examples/empire-db-example-advanced/**</include>
 				<include>empire-db-struts2/**</include>
-				<include>empire-db-examples/empire-db-example-struts2/**</include>
-				<include>empire-db-examples/empire-db-example-cxf/**</include>
-				<include>empire-db-examples/empire-db-example-struts2-cxf/**</include>
+				<include>empire-db-examples/**</include>
 			</includes>
 			<excludes>
 				<exclude>**/empire-db/target/**</exclude>
@@ -75,6 +46,8 @@
 				<exclude>**/.settings/**</exclude>
 				<exclude>**/.amateras/**</exclude>
 				<exclude>**/.tomcatplugin/**</exclude>
+				<exclude>**/.tomcatplugin/**</exclude>
+				<exclude>empire-db-examples/tutorial.pdf</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>
@@ -89,17 +62,19 @@
 				<!-- <include>licenses/**</include> -->
 			</includes>
 		</fileSet>
+		<fileSet>
+			<directory>empire-db-examples</directory>
+			<outputDirectory/>
+			<includes>
+				<include>tutorial.pdf</include>
+			</includes>
+		</fileSet>
 	</fileSets>
 	<moduleSets>
 		<moduleSet>
 			<includes>
 				<include>org.apache.empire-db:empire-db</include>
 				<include>org.apache.empire-db:empire-db-struts2</include>
-				<include>org.apache.empire-db:empire-db-example</include>
-				<include>org.apache.empire-db:empire-db-example-advanced</include>
-    			<include>org.apache.empire-db:empire-db-example-struts2</include>
-    			<include>org.apache.empire-db:empire-db-example-cxf</include>
-    			<include>org.apache.empire-db:empire-db-example-struts2-cxf</include>
 			</includes>
 			<binaries>
 				<outputDirectory>lib</outputDirectory>

Modified: incubator/empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/pom.xml?rev=759381&r1=759380&r2=759381&view=diff
==============================================================================
--- incubator/empire-db/trunk/pom.xml (original)
+++ incubator/empire-db/trunk/pom.xml Fri Mar 27 22:54:01 2009
@@ -226,13 +226,13 @@
 					<artifactId>maven-assembly-plugin</artifactId>
 					<version>2.2-beta-2</version>
 					<configuration>
-						<appendAssemblyId>false</appendAssemblyId>
+						<appendAssemblyId>true</appendAssemblyId>
 						<tarLongFileMode>gnu</tarLongFileMode>
 						<outputDirectory>target/dist</outputDirectory>
 						<descriptors>
 							<descriptor>empire-assembly-all.xml</descriptor>
 						</descriptors>
-						<finalName>empire-db-${project.version}</finalName>
+						<finalName>apache-empire-db-${project.version}</finalName>
 					</configuration>
 				</plugin>
 				<plugin>



Mime
View raw message