juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcunn...@apache.org
Subject svn commit: r810209 - in /webservices/juddi/trunk: docs/assembly.xml juddi-core/pom.xml juddi-dist/assembly.xml juddi-dist/build.xml juddi-dist/pom.xml
Date Tue, 01 Sep 2009 20:12:35 GMT
Author: tcunning
Date: Tue Sep  1 20:12:35 2009
New Revision: 810209

URL: http://svn.apache.org/viewvc?rev=810209&view=rev
Log:
JUDDI-188
Add the juddi-core sources, the javadocs, and the docs into the 
dist bundle.

Modified:
    webservices/juddi/trunk/docs/assembly.xml
    webservices/juddi/trunk/juddi-core/pom.xml
    webservices/juddi/trunk/juddi-dist/assembly.xml
    webservices/juddi/trunk/juddi-dist/build.xml
    webservices/juddi/trunk/juddi-dist/pom.xml

Modified: webservices/juddi/trunk/docs/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/assembly.xml?rev=810209&r1=810208&r2=810209&view=diff
==============================================================================
--- webservices/juddi/trunk/docs/assembly.xml (original)
+++ webservices/juddi/trunk/docs/assembly.xml Tue Sep  1 20:12:35 2009
@@ -1,5 +1,5 @@
 <assembly>
-	<id>docs</id>
+	<id></id>
 	<formats>
 		<format>tar.gz</format>
 		<format>zip</format>

Modified: webservices/juddi/trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/pom.xml?rev=810209&r1=810208&r2=810209&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/trunk/juddi-core/pom.xml Tue Sep  1 20:12:35 2009
@@ -60,6 +60,18 @@
     <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+               </goals>
+             </execution>
+           </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
             <executions>
                <execution>

Modified: webservices/juddi/trunk/juddi-dist/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-dist/assembly.xml?rev=810209&r1=810208&r2=810209&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-dist/assembly.xml (original)
+++ webservices/juddi/trunk/juddi-dist/assembly.xml Tue Sep  1 20:12:35 2009
@@ -10,4 +10,15 @@
 	  <outputDirectory></outputDirectory>
     </fileSet>
   </fileSets>
+  <moduleSets>
+     <moduleSet>
+	<includes>
+	<include>org.apache.juddi:juddi-docs</include>
+	</includes>
+	<binaries>
+	<outputDirectory>docs</outputDirectory>
+	<unpack>true</unpack>
+	</binaries>
+     </moduleSet>
+  </moduleSets>
 </assembly>

Modified: webservices/juddi/trunk/juddi-dist/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-dist/build.xml?rev=810209&r1=810208&r2=810209&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-dist/build.xml (original)
+++ webservices/juddi/trunk/juddi-dist/build.xml Tue Sep  1 20:12:35 2009
@@ -5,17 +5,13 @@
 	<target name="package-dist">
 		<mkdir dir="${dist.dir}"/>
 		<mkdir dir="${dist.dir}/docs"/>
+		<copy file="${dependency.juddi.docs}"
+			todir="${dist.dir}"/>
+		<copy file="${dependency.juddi.sources}"
+			todir="${dist.dir}"/>
+		<copy file="${dependency.juddi.javadoc}"
+			todir="${dist.dir}"/>
 		<copy file="${dependency.juddi.war}"
 			tofile="${dist.dir}/juddi.war"/>
-		<copy todir="${dist.dir}">
-			<fileset dir="${basedir}/../juddi-core/target/">
-				<include name="*-sources.jar"/>
-			</fileset>	
-		</copy>
-		<copy todir="${dist.dir}/docs">
-			<fileset dir="${basedir}/../docs">
-				<exclude name="**/*.odt"/>
-			</fileset>
-		</copy>
 	</target>
 </project>

Modified: webservices/juddi/trunk/juddi-dist/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-dist/pom.xml?rev=810209&r1=810208&r2=810209&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-dist/pom.xml (original)
+++ webservices/juddi/trunk/juddi-dist/pom.xml Tue Sep  1 20:12:35 2009
@@ -36,6 +36,24 @@
       <version>3.0.0.SNAPSHOT</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.juddi</groupId>
+      <artifactId>juddi-core</artifactId>
+      <version>3.0.0.SNAPSHOT</version>
+      <classifier>sources</classifier> 
+    </dependency>
+    <dependency>
+      <groupId>org.apache.juddi</groupId>      
+      <artifactId>juddi-core</artifactId>
+      <version>3.0.0.SNAPSHOT</version>      
+      <classifier>javadoc</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.juddi</groupId>
+      <artifactId>juddi-docs</artifactId>
+      <version>3.0.0.SNAPSHOT</version>
+      <type>tar.gz</type>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -60,6 +78,9 @@
                <property name="plugin_classpath" refid="maven.plugin.classpath"/>
                <property name="project.version" value="${project.version}"/>
 	       <property name="dependency.juddi.war" value="${maven.dependency.org.apache.juddi.juddi-war.war.path}"/>
+	       <property name="dependency.juddi.javadoc" value="${maven.dependency.org.apache.juddi.juddi-core.javadoc.jar.path}"/>
+	       <property name="dependency.juddi.sources" value="${maven.dependency.org.apache.juddi.juddi-core.sources.jar.path}"/>
+	       <property name="dependency.juddi.docs" value="${maven.dependency.org.apache.juddi.juddi-docs.tar.gz.path}"/>
 	       <ant antfile="${basedir}/build.xml">
                   <target name="package-dist"/>
                </ant>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org


Mime
View raw message