[jboss-svn-commits] JBL Code SVN: r35191 - in labs/jbosstm/trunk/rhq-plugin: src/main/java/org/jboss/as/integration/jbossts/jopr and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mmusgrov
Date: 2010-09-20 07:23:10 -0400 (Mon, 20 Sep 2010)
New Revision: 35191

Modified:
   labs/jbosstm/trunk/rhq-plugin/build.xml
   labs/jbosstm/trunk/rhq-plugin/pom.xml
   labs/jbosstm/trunk/rhq-plugin/src/main/java/org/jboss/as/integration/jbossts/jopr/JMXClient.java
Log:
[JBTM-719] Include source and javadoc in the install/dist build target

Modified: labs/jbosstm/trunk/rhq-plugin/build.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/build.xml	2010-09-20 10:25:32 UTC (rev 35190)
+++ labs/jbosstm/trunk/rhq-plugin/build.xml	2010-09-20 11:23:10 UTC (rev 35191)
@@ -4,11 +4,15 @@
 
 	<property name="modulename" value="jbossts-jopr-plugin"/>
 	<property name="component-module-list" value="${modulename}"/>
+	<property name="install.jar.dir" value="../install/bin"/>
+	<property name="install.doc.dir" value="../install/docs/rhq"/>
 	<import file="../sharedbuild.xml"/>
 
 	<property name="version" value="1.0.0.SNAPSHOT"/>
-	<property name="maven.project.build.directory" value="target"/>
-	<property name="pluginjar" value="${basedir}/${maven.project.build.directory}/${modulename}.jar"/>
+	<property name="maven.project.build.directory" value="${basedir}/target"/>
+	<property name="pluginjar" value="${modulename}.jar"/>
+	<property name="pluginsrcjar" value="${modulename}-sources.jar"/>
+	<property name="plugindocjar" value="${modulename}-javadoc.jar"/>
 
 	<target name="maven:package" depends="clean">
 		<exec executable="mvn" dir="${basedir}">
@@ -19,7 +23,9 @@
 	</target>
 
 	<target name="dist" depends="maven:package">
-		<copy file="${pluginjar}" todir="../install/bin"/>
+		<copy file="${maven.project.build.directory}/${pluginjar}" todir="${install.jar.dir}"/>
+		<copy file="${maven.project.build.directory}/${pluginsrcjar}" todir="${install.jar.dir}"/>
+		<copy file="${maven.project.build.directory}/${plugindocjar}" todir="${install.doc.dir}"/>
 	</target>
 
 	<target name="clean">
@@ -27,5 +33,9 @@
 			<arg value="clean"/>
 		</exec>
 		<delete dir="build"/>
+		<delete dir="${install.doc.dir}"/>
+		<echo message="deleting ${install.jar.dir}/${pluginjar} and ${install.jar.dir}/${pluginsrcjar}"/>
+		<delete file="${install.jar.dir}/${pluginjar}"/>
+		<delete file="${install.jar.dir}/${pluginsrcjar}"/>
 	</target>
 </project> 

Modified: labs/jbosstm/trunk/rhq-plugin/pom.xml
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/pom.xml	2010-09-20 10:25:32 UTC (rev 35190)
+++ labs/jbosstm/trunk/rhq-plugin/pom.xml	2010-09-20 11:23:10 UTC (rev 35191)
@@ -62,7 +62,54 @@
 				<configuration>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create_sources_jar</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<forceCreation>true</forceCreation>
+					<includePom>true</includePom>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>create_javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create_sources_jar</id>
+						<goals> <goal>jar</goal> </goals>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<forceCreation>true</forceCreation>
+					<includePom>true</includePom>
+				</configuration>
+			</plugin>
 		</plugins>
+
 	</build>
 
 	<dependencyManagement>

Modified: labs/jbosstm/trunk/rhq-plugin/src/main/java/org/jboss/as/integration/jbossts/jopr/JMXClient.java
===================================================================
--- labs/jbosstm/trunk/rhq-plugin/src/main/java/org/jboss/as/integration/jbossts/jopr/JMXClient.java	2010-09-20 10:25:32 UTC (rev 35190)
+++ labs/jbosstm/trunk/rhq-plugin/src/main/java/org/jboss/as/integration/jbossts/jopr/JMXClient.java	2010-09-20 11:23:10 UTC (rev 35191)
@@ -70,7 +70,7 @@
 	 * the returned Configuration object with the managed resource's
 	 * configuration property values.
 	 *
-	 * @see //ConfigurationFacet#loadResourceConfiguration()
+	 * @see org.rhq.core.pluginapi.configuration.ConfigurationFacet#loadResourceConfiguration()
 	 */
 	@Override
 	public Configuration loadResourceConfiguration()
@@ -114,7 +114,7 @@
 	 * the managed resource in your own custom way, setting its configuration
 	 * based on the new values of the given configuration.
 	 *
-	 * @see //ConfigurationFacet#updateResourceConfiguration(ConfigurationUpdateReport)
+	 * @see org.rhq.core.pluginapi.configuration.ConfigurationFacet#updateResourceConfiguration(ConfigurationUpdateReport)
 	 */
 	@Override
 	public void updateResourceConfiguration(ConfigurationUpdateReport report)