cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r490147 - in /incubator/cayenne/main/trunk/assembly/cayenne-generic: pom.xml src/main/assembly/main.xml
Date Mon, 25 Dec 2006 13:15:45 GMT
Author: aadamchik
Date: Mon Dec 25 05:15:44 2006
New Revision: 490147

URL: http://svn.apache.org/viewvc?view=rev&rev=490147
Log:
assembly pom - work in progress

Modified:
    incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
    incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml

Modified: incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?view=diff&rev=490147&r1=490146&r2=490147
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Mon Dec 25 05:15:44 2006
@@ -139,10 +139,8 @@
 									${pom.basedir}/src/main/assembly/main.xml
 								</descriptor>
 							</descriptors>
-							<finalName>cayenne-generic-${version}</finalName>
-							<outputDirectory>
-								${project.build.directory}/assembly/out
-							</outputDirectory>
+							<finalName>cayenne-${version}</finalName>
+							<outputDirectory>${project.build.directory}</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>

Modified: incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml?view=diff&rev=490147&r1=490146&r2=490147
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml Mon Dec
25 05:15:44 2006
@@ -22,9 +22,17 @@
 	</formats>
 
 	<includeBaseDirectory>true</includeBaseDirectory>
-
+	
 	<dependencySets>
 		<dependencySet>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>org.apache.cayenne:cayenne-server</include>
+				<include>org.apache.cayenne:cayenne-client</include>
+				<include>org.apache.cayenne:cayenne-agent</include>
+			</includes>
+		</dependencySet>
+		<dependencySet>
 			<outputDirectory>lib/modeler</outputDirectory>
 			<includes>
 				<include>org.apache.cayenne.modeler:cayenne-modeler</include>
@@ -35,14 +43,6 @@
 				<include>jgoodies:looks</include>
 				<include>ognl:ognl</include>
 				<include>org.scopemvc:scopemvc</include>
-			</includes>
-		</dependencySet>
-		<dependencySet>
-			<outputDirectory>lib</outputDirectory>
-			<includes>
-				<include>org.apache.cayenne:cayenne-server</include>
-				<include>org.apache.cayenne:cayenne-client</include>
-				<include>org.apache.cayenne:cayenne-agent</include>
 			</includes>
 		</dependencySet>
 	</dependencySets>



Mime
View raw message