You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by fr...@apache.org on 2010/04/25 16:01:49 UTC

svn commit: r937801 - in /incubator/empire-db/trunk/empire-db-dist: pom.xml src/assemble/empire-assembly-all.xml

Author: francisdb
Date: Sun Apr 25 14:01:48 2010
New Revision: 937801

URL: http://svn.apache.org/viewvc?rev=937801&view=rev
Log:
provide javadoc jars in distribution

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

Modified: incubator/empire-db/trunk/empire-db-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/pom.xml?rev=937801&r1=937800&r2=937801&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-dist/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-dist/pom.xml Sun Apr 25 14:01:48 2010
@@ -74,6 +74,18 @@
 			<groupId>org.apache.empire-db</groupId>
 			<artifactId>empire-db-struts2</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.empire-db</groupId>
+			<artifactId>empire-db</artifactId>
+			<version>${project.version}</version>
+			<classifier>javadoc</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.empire-db</groupId>
+			<artifactId>empire-db-struts2</artifactId>
+			<version>${project.version}</version>
+			<classifier>javadoc</classifier>
+		</dependency>
 	</dependencies>
 
 </project>
\ No newline at end of file

Modified: incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml?rev=937801&r1=937800&r2=937801&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml (original)
+++ incubator/empire-db/trunk/empire-db-dist/src/assemble/empire-assembly-all.xml Sun Apr 25 14:01:48 2010
@@ -26,11 +26,6 @@
 	</formats>
 	<includeBaseDirectory>true</includeBaseDirectory>
 	<fileSets>
-		<!-- TODO see how to get this working -->
-		<fileSet>
-			<directory>${basedir}/../target/site/apidocs</directory>
-			<outputDirectory>apidocs</outputDirectory>
-		</fileSet>
 		<fileSet>
 			<directory>${basedir}/..</directory>
 			<outputDirectory>src</outputDirectory>
@@ -89,12 +84,23 @@
 			</binaries>
 		</moduleSet>
 	</moduleSets>
-	--><dependencySets>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+	-->
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>doc</outputDirectory>
+			<!-- <unpack>true</unpack> -->
+			<useStrictFiltering>true</useStrictFiltering>
+			<includes>
+				<include>org.apache.empire-db:empire-db:*:javadoc</include>
+				<include>org.apache.empire-db:empire-db-struts2:*:javadoc</include>
+			</includes>
+		</dependencySet>
+		<dependencySet>
+            <outputDirectory>bin</outputDirectory>
+            <useStrictFiltering>true</useStrictFiltering>
             <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:jar</include>
+                <include>org.apache.empire-db:empire-db-struts2:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>