[jboss-cvs] JBossAS SVN: r79000 - in projects/aop/trunk: aop and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 1 15:16:13 EDT 2008
Author: pgier
Date: 2008-10-01 15:16:13 -0400 (Wed, 01 Oct 2008)
New Revision: 79000
Modified:
projects/aop/trunk/aop/docs/index.html
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration-core/pom.xml
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/build/build-release.xml
projects/aop/trunk/build/build.xml
projects/aop/trunk/pom.xml
Log:
Generate javadocs during release. Copy jar files for asintegration modules directly from target directory.
Modified: projects/aop/trunk/aop/docs/index.html
===================================================================
--- projects/aop/trunk/aop/docs/index.html 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/aop/docs/index.html 2008-10-01 19:16:13 UTC (rev 79000)
@@ -16,7 +16,7 @@
<h3>Java Docs</h3>
<ul>
-<li> <a href="api/index.html">Javadocs</a></li>
+<li> <a href="apidocs/index.html">Javadocs</a></li>
</ul>
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/aop/pom.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -14,6 +14,7 @@
<description>JBoss AOP Framework</description>
<url>http://www.jboss.org/jbossaop</url>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main/</sourceDirectory>
<!--<testSourceDirectory>src/test/</testSourceDirectory>-->
<resources>
@@ -87,6 +88,7 @@
<descriptors>
<descriptor>src/assembly/client.xml</descriptor>
</descriptors>
+ <finalName>${artifactId}</finalName>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -110,6 +112,7 @@
<descriptors>
<descriptor>src/assembly/client-sources.xml</descriptor>
</descriptors>
+ <finalName>${artifactId}</finalName>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -131,6 +134,7 @@
<descriptors>
<descriptor>src/assembly/single.xml</descriptor>
</descriptors>
+ <finalName>${artifactId}</finalName>
<archive>
<manifest>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -164,15 +168,15 @@
<copy todir="${basedir}/output/etc">
<fileset dir="${basedir}/src/etc"/>
</copy>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+ <copy file="${project.build.directory}/${project.artifactId}.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-sources.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50-sources.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}-client.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-client.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50-client.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}-client-sources.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-client-sources.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50-client-sources.jar"/>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}-single.jar"
+ <copy file="${project.build.directory}/${project.artifactId}-single.jar"
tofile="${basedir}/output/lib/jboss-aop-jdk50-single.jar"/>
</tasks>
</configuration>
Modified: projects/aop/trunk/asintegration-core/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-core/pom.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/asintegration-core/pom.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -13,6 +13,7 @@
<description>JBoss AOP AS Integrationi Core</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main/</sourceDirectory>
<testSourceDirectory>src/tests/</testSourceDirectory>
<resources>
@@ -55,44 +56,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>copy-output-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/output"/>
- <mkdir dir="${basedir}/output/lib"/>
- <copy todir="${basedir}/output/etc">
- <fileset dir="${basedir}/src/etc"/>
- </copy>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/${project.artifactId}.jar"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Clean the output directory created by the antrun plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/output</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -13,6 +13,7 @@
<description>JBoss AOP AS Integration JMX</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main/</sourceDirectory>
<testSourceDirectory>src/tests/</testSourceDirectory>
<resources>
@@ -55,44 +56,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>copy-output-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/output"/>
- <mkdir dir="${basedir}/output/lib"/>
- <copy todir="${basedir}/output/etc">
- <fileset dir="${basedir}/src/etc"/>
- </copy>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/${project.artifactId}.jar"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Clean the output directory created by the antrun plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/output</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -13,6 +13,7 @@
<description>JBoss AOP AS Integration MC</description>
<build>
+ <finalName>${artifactId}</finalName>
<sourceDirectory>src/main/</sourceDirectory>
<testSourceDirectory>src/tests/</testSourceDirectory>
<resources>
@@ -60,44 +61,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>copy-output-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/output"/>
- <mkdir dir="${basedir}/output/lib"/>
- <copy todir="${basedir}/output/etc">
- <fileset dir="${basedir}/src/etc"/>
- </copy>
- <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
- tofile="${basedir}/output/lib/${project.artifactId}.jar"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Clean the output directory created by the antrun plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/output</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/build/build-release.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -63,7 +63,13 @@
</fileset>
</copy>
+ <copy todir="${project.release}/docs/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/target/site">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+
<copy todir="${project.release}/src/aspect-framework" filtering="no">
<fileset dir="${project.root}/aop/src">
<include name="main/**/*.java"/>
@@ -81,18 +87,18 @@
<!-- ================================================== -->
<copy todir="${project.release}/docs/asintegration-core" filtering="no">
- <fileset dir="${project.root}/asintegration-core/output">
- <include name="api/**"/>
+ <fileset dir="${project.root}/asintegration-core/target/site">
+ <include name="apidocs/**"/>
</fileset>
</copy>
<copy todir="${project.release}/docs/asintegration-jmx" filtering="no">
- <fileset dir="${project.root}/asintegration-jmx/output">
- <include name="api/**"/>
+ <fileset dir="${project.root}/asintegration-jmx/target/site">
+ <include name="apidocs/**"/>
</fileset>
</copy>
<copy todir="${project.release}/docs/asintegration-mc" filtering="no">
- <fileset dir="${project.root}/asintegration-mc/output">
- <include name="api/**"/>
+ <fileset dir="${project.root}/asintegration-mc/target/site">
+ <include name="apidocs/**"/>
</fileset>
</copy>
@@ -129,8 +135,8 @@
<!-- ================================================== -->
<copy todir="${project.release}/docs/aspects" filtering="no">
- <fileset dir="${project.root}/aspects/output">
- <include name="api/**"/>
+ <fileset dir="${project.root}/aspects/target/site">
+ <include name="apidocs/**"/>
</fileset>
</copy>
@@ -155,9 +161,9 @@
<property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
<property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50-single.jar"/>
<property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
- <property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/output/lib/jboss-asintegration-core.jar"/>
- <property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/output/lib/jboss-asintegration-jmx.jar"/>
- <property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/output/lib/jboss-asintegration-mc.jar"/>
+ <property name="aop.asintegration-core.location" value="${project.root}/asintegration-core/target/jboss-aop-asintegration-core.jar"/>
+ <property name="aop.asintegration-jmx.location" value="${project.root}/asintegration-jmx/target/jboss-aop-asintegration-jmx.jar"/>
+ <property name="aop.asintegration-mc.location" value="${project.root}/asintegration-mc/target/jboss-aop-asintegration-mc.jar"/>
<property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/jrockit-pluggable-instrumentor/target/jrockit-pluggable-instrumentor.jar"/>
<property name="aop.pluggable-instrumentor.location" value="${project.root}/pluggable-instrumentor/target/pluggable-instrumentor.jar"/>
<property name="aop.readme-as4.location" value="${project.root}/asintegration-core/src/etc/ReadMe-AS4.txt"/>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/build/build.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -174,7 +174,7 @@
<target name="release"
description="Builds the default release structure."
- depends="init, clean, most, aop.reference.docs"
+ depends="init, clean, most, maven-site, aop.reference.docs"
>
<ant antfile="build-release.xml" target="release-no-reference-docs"/>
<ant antfile="build-release.xml" target="release-reference-docs"/>
@@ -259,11 +259,9 @@
</sequential>
</macrodef>
- <!-- create the thirdparty folder from items in the repository -->
- <!-- then generate a new libraries.ent file and include it in -->
- <!-- the build -->
<target name="createthirdparty" unless="inhibit.downloads"
- depends="check.inhibit.downloads, set.proxy">
+ depends="check.inhibit.downloads, set.proxy"
+ description="Call maven to generate the thirdparty directory">
<property name="maven.dir" value="${basedir}/../tools/maven"/>
<property name="thirdparty.maven.opts" value=""/>
@@ -277,11 +275,9 @@
</not>
</condition>
</fail>
-
</target>
- <!-- Run the maven part of the build -->
- <target name="maven-build-install" depends="set-jrockit">
+ <target name="maven-build-install" depends="set-jrockit" description="Call maven install">
<property name="maven.dir" value="${basedir}/../tools/maven"/>
<property name="build.maven.opts" value=""/>
@@ -296,13 +292,25 @@
</not>
</condition>
</fail>
-
</target>
-
- <target name="set-jrockit" depends="init" if="jrockit.home">
- <property name="jrockit.build.param" value="-Djrockit.home=${jrockit.home}"/>
- </target>
-
+
+ <target name="maven-site" depends="set-jrockit" description="Generate the maven site">
+
+ <property name="maven.dir" value="${basedir}/../tools/maven"/>
+ <property name="build.maven.opts" value=""/>
+ <property name="jrockit.build.param" value=""/>
+ <echo message="jrockit: ${jrockit.build.param}"/>
+ <maven basedir="${basedir}/../" options="${jrockit.build.param} ${build.maven.opts}" goal="site"/>
+
+ <fail message="Unable to complete maven build. See maven output for details.">
+ <condition>
+ <not>
+ <equals arg1="${maven.result}" arg2="0"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
+
<!-- Clean the maven part of the build -->
<target name="maven-build-clean" depends="set-jrockit">
@@ -319,9 +327,12 @@
</not>
</condition>
</fail>
-
</target>
+ <target name="set-jrockit" depends="init" if="jrockit.home">
+ <property name="jrockit.build.param" value="-Djrockit.home=${jrockit.home}"/>
+ </target>
+
<!-- check if thirdparty libraries are to be downloaded -->
<target name="check.inhibit.downloads">
<condition property="inhibit.downloads">
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2008-10-01 18:33:01 UTC (rev 78999)
+++ projects/aop/trunk/pom.xml 2008-10-01 19:16:13 UTC (rev 79000)
@@ -560,6 +560,22 @@
</dependencies>
</dependencyManagement>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <quiet>true</quiet>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
<id>jrockit-module</id>
More information about the jboss-cvs-commits
mailing list