You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/01/02 19:14:09 UTC

svn commit: r491877 - in /incubator/cayenne/main/trunk: assembly/pom.xml doc/pom.xml

Author: aadamchik
Date: Tue Jan  2 10:14:08 2007
New Revision: 491877

URL: http://svn.apache.org/viewvc?view=rev&rev=491877
Log:
CAY-719 - Finalize Maven assembly scripts for the upcoming 3.0 milestone releases (fixing javadocs location)

Modified:
    incubator/cayenne/main/trunk/assembly/pom.xml
    incubator/cayenne/main/trunk/doc/pom.xml

Modified: incubator/cayenne/main/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/pom.xml?view=diff&rev=491877&r1=491876&r2=491877
==============================================================================
--- incubator/cayenne/main/trunk/assembly/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/pom.xml Tue Jan  2 10:14:08 2007
@@ -141,13 +141,14 @@
 							</descriptors>
 							<finalName>cayenne-${version}</finalName>
 							<outputDirectory>${project.build.directory}</outputDirectory>
+							<appendAssemblyId>false</appendAssemblyId>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>mac</id>
@@ -195,6 +196,17 @@
 											<version>${version}</version>
 										</artifactItem>
 									</artifactItems>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assembly</id>
+								<configuration>
+									<finalName>cayenne-${version}-win</finalName>
 								</configuration>
 							</execution>
 						</executions>

Modified: incubator/cayenne/main/trunk/doc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/doc/pom.xml?view=diff&rev=491877&r1=491876&r2=491877
==============================================================================
--- incubator/cayenne/main/trunk/doc/pom.xml (original)
+++ incubator/cayenne/main/trunk/doc/pom.xml Tue Jan  2 10:14:08 2007
@@ -154,7 +154,7 @@
 	<build>
 		<resources>
 			<resource>
-				<directory>target/site</directory>
+				<directory>target/site/apidocs</directory>
 			</resource>
 			<resource>
 				<directory>src/main/resources</directory>
@@ -204,6 +204,10 @@
 				<configuration>
 					<!-- must use ${project.build.directory}, as using relative path "target/sources" confuses the plugin -->
 					<sourcepath>${project.build.directory}/sources</sourcepath>
+
+					<!-- this is relative to target/site/apidocs  -->
+					<destDir>doc/api</destDir>
+					<stylesheet>java</stylesheet>
 				</configuration>
 				<executions>
 					<execution>