modules/core/domain/pom.xml | 41 ++++++++
modules/core/pom.xml | 159 ++++++++++++++++++----------------
modules/enterprise/pom.xml | 5 -
modules/enterprise/server/jar/pom.xml | 72 +++++++++++++++
modules/pom.xml | 149 ++++++++++++++++---------------
pom.xml | 2
6 files changed, 281 insertions(+), 147 deletions(-)
New commits:
commit 57c23cc25251d08afaeb5dea767f4fd4a71ae314
Merge: 3a73579... 2c5095d...
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jan 4 11:14:41 2010 -0500
Merge branch 'master' into linux-config
commit 2c5095d2b2ddc4d4ab377589faee091f6f01e066
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 15:12:16 2009 -0500
Added javadoc profiles in various places for public API's. To generate
a full set of jdoc execute:
mvn compile -Djavadoc.outputDirectory=<jdocParentDir>
from (and in this order):
core/domain
core
enterprise/server/jar
enterprise/remoting/client-api (this last one is pending linux-config merge into
master)
The maven javadoc plugin rev has been upped from 2.4 to 2.5.
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 1f6aafb..b828840 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -326,28 +326,37 @@
</property>
</activation>
- <reporting>
+ <build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} - Domain</doctitle>
-
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
- <destDir>domain</destDir>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
-
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
+ <executions>
+ <execution>
+ <id>javadoc-domain-api</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <doctitle>RHQ ${project.version} -
Domain</doctitle>
+
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>domain</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
- </reporting>
+ </build>
</profile>
</profiles>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 3489844..4ed8447 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -56,35 +56,45 @@
<name>javadoc.outputDirectory</name>
</property>
</activation>
+
<modules>
- <module>domain</module>
<module>native-system</module>
<module>plugin-api</module>
</modules>
- <reporting>
+ <build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} - Plugin
API</doctitle>
-
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
- <destDir>plugin-api</destDir>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
-
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>../domain</link>
- </links>
- </configuration>
+ <executions>
+ <execution>
+ <id>javadoc-domain-api</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+
+ <configuration>
+ <doctitle>RHQ ${project.version} - Plugin
API</doctitle>
+
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>plugin-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>../domain</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
- </reporting>
+ </build>
</profile>
</profiles>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index d3ff184..0ba712c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -73,92 +73,6 @@
</modules>
</profile>
- <profile>
- <id>javadoc</id>
- <activation>
- <property>
- <name>javadoc.outputDirectory</name>
- </property>
- </activation>
- <modules>
- <module>server/jar</module>
- <module>remoting/cli</module>
- </modules>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} - Client
API</doctitle>
-
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
- <destDir>client-api</destDir>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
-
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
-
- <execution>
- <id>javadoc-remote-api</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <property
- name="javadoc.outputDirectory"
- value="${javadoc.outputDirectory}" />
- <property
- name="project.dir"
-
value="./server/jar/src/main/java/org/rhq/enterprise/server" />
- <property
- name="classpath"
- value="${maven.compile.classpath}" />
-
- <javadoc
-
destdir="${javadoc.outputDirectory}/remote-api"
- author="true"
- version="true"
- windowtitle="Remote API"
- noindex="false"
- classpath="${classpath}">
-
- <fileset
- dir="${project.dir}"
- defaultexcludes="yes">
- <include
- name="**/*Remote.java" />
- </fileset>
- </javadoc>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
-
</profiles>
</project>
diff --git a/modules/pom.xml b/modules/pom.xml
index 9512735..4ce0286 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -83,19 +83,6 @@
</activation>
</profile>
- <profile>
- <id>javadoc</id>
- <activation>
- <property>
- <name>javadoc.outputDirectory</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- <module>enterprise</module>
- </modules>
- </profile>
-
</profiles>
<modules>
commit c0f987fd0c283e30536986588268bf0846e7e981
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 11:15:20 2009 -0500
Jdoc generation using -Djavadoc.outputDirectory
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 5e0a9e0..1f6aafb 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -318,6 +318,38 @@
</build>
</profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Domain</doctitle>
+
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>domain</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 52b4963..3489844 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -1,85 +1,92 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-parent</artifactId>
- <packaging>pom</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-parent</artifactId>
+ <packaging>pom</packaging>
- <name>RHQ Core Modules</name>
- <description>parent POM for modules comprising the RHQ core (i.e. modules
required by both the enterprise and embedded editions of RHQ)</description>
+ <name>RHQ Core Modules</name>
+ <description>parent POM for modules comprising the RHQ core (i.e. modules
required by both the enterprise and embedded editions of RHQ)</description>
- <scm>
-
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core...
-
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
- </scm>
+ <scm>
+
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core...
+
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
+ </scm>
<properties>
<scm.module.path>modules/core/</scm.module.path>
</properties>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>RHQ ${project.version} Plugin API</doctitle>
- <aggregate>true</aggregate>
- <encoding>UTF-8</encoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <author>false</author>
- <breakiterator>true</breakiterator>
- <links>
- <
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
+ <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>util</module>
- <module>native-system</module>
- <module>comm-api</module>
- <module>dbutils</module>
- <module>domain</module>
- <module>plugin-api</module>
- <module>client-api</module>
- <module>plugin-container</module>
- <module>gui</module>
- <module>plugindoc</module>
- <module>plugin-validator</module>
- </modules>
- </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>util</module>
+ <module>native-system</module>
+ <module>comm-api</module>
+ <module>dbutils</module>
+ <module>domain</module>
+ <module>plugin-api</module>
+ <module>client-api</module>
+ <module>plugin-container</module>
+ <module>gui</module>
+ <module>plugindoc</module>
+ <module>plugin-validator</module>
+ </modules>
+ </profile>
- <profile>
- <id>plugin-api-javadoc</id>
- <activation>
- <property>
- <name>plugin-api-javadoc</name>
- </property>
- </activation>
- <modules>
- <module>native-system</module>
- <module>domain</module>
- <module>plugin-api</module>
- </modules>
- </profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+ <modules>
+ <module>domain</module>
+ <module>native-system</module>
+ <module>plugin-api</module>
+ </modules>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Plugin
API</doctitle>
+
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>plugin-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>../domain</link>
+ </links>
+ </configuration>
+
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ </profiles>
- </profiles>
-
</project>
\ No newline at end of file
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 0cf6c85..d3ff184 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -1,4 +1,7 @@
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -70,6 +73,92 @@
</modules>
</profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+ <modules>
+ <module>server/jar</module>
+ <module>remoting/cli</module>
+ </modules>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doctitle>RHQ ${project.version} - Client
API</doctitle>
+
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
+ <destDir>client-api</destDir>
+ <aggregate>true</aggregate>
+ <encoding>UTF-8</encoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <author>false</author>
+ <breakiterator>true</breakiterator>
+ <links>
+
<
link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+
+ <execution>
+ <id>javadoc-remote-api</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
+ name="javadoc.outputDirectory"
+ value="${javadoc.outputDirectory}" />
+ <property
+ name="project.dir"
+
value="./server/jar/src/main/java/org/rhq/enterprise/server" />
+ <property
+ name="classpath"
+ value="${maven.compile.classpath}" />
+
+ <javadoc
+
destdir="${javadoc.outputDirectory}/remote-api"
+ author="true"
+ version="true"
+ windowtitle="Remote API"
+ noindex="false"
+ classpath="${classpath}">
+
+ <fileset
+ dir="${project.dir}"
+ defaultexcludes="yes">
+ <include
+ name="**/*Remote.java" />
+ </fileset>
+ </javadoc>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
</profiles>
</project>
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index e960104..eafa5ae 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -571,6 +571,76 @@
</dependency>
</dependencies>
</profile>
- </profiles>
+
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>javadoc-remote-api</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <property
+ name="javadoc.outputDirectory"
+ value="${javadoc.outputDirectory}" />
+ <property
+ name="project.dir"
+
value="./src/main/java/org/rhq/enterprise/server" />
+ <property
+ name="maven.compile.classpath"
+ refid="maven.compile.classpath" />
+
+ <javadoc
+
destdir="${javadoc.outputDirectory}/remote-api"
+ author="true"
+ version="true"
+ windowtitle="Remote API"
+ noindex="false">
+ <classpath>
+ <pathelement
+ path="${maven.compile.classpath}" />
+ </classpath>
+ <fileset
+ dir="${project.dir}"
+ defaultexcludes="yes">
+ <include
+ name="**/*Remote.java" />
+ </fileset>
+ <link
+ href="../domain" />
+ <link
+ href="../plugin-api" />
+ <link
+
href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+ <bottom><![CDATA[Copyright © 2008-2009
<a
href="http://rhq-project.org/">Red Hat, Inc.</a>. All Rights
Reserved.
+]]></bottom>
+ </javadoc>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+ </profiles>
+
</project>
diff --git a/modules/pom.xml b/modules/pom.xml
index 9954974..9512735 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -1,88 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+
xmlns="http://maven.apache.org/POM/4.0.0"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-modules-parent</artifactId>
- <packaging>pom</packaging>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-modules-parent</artifactId>
+ <packaging>pom</packaging>
- <name>RHQ Modules</name>
- <description>parent POM for all RHQ modules</description>
+ <name>RHQ Modules</name>
+ <description>parent POM for all RHQ modules</description>
- <scm>
-
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules</...
-
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
- </scm>
+ <scm>
+
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules</...
+
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
+ </scm>
- <properties>
- <scm.module.path>modules/</scm.module.path>
- </properties>
+ <properties>
+ <scm.module.path>modules/</scm.module.path>
+ </properties>
- <profiles>
+ <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>core</module>
- <module>common</module>
- <module>plugins</module>
- <module>helpers</module>
- <module>enterprise</module>
- </modules>
- </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>common</module>
+ <module>plugins</module>
+ <module>helpers</module>
+ <module>enterprise</module>
+ </modules>
+ </profile>
- <profile>
- <id>agent</id>
- <activation>
- <property>
- <name>agent</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- <module>enterprise/comm</module>
- <module>enterprise/agent</module>
- <module>enterprise/agentupdate</module>
- </modules>
- </profile>
+ <profile>
+ <id>agent</id>
+ <activation>
+ <property>
+ <name>agent</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>enterprise/comm</module>
+ <module>enterprise/agent</module>
+ <module>enterprise/agentupdate</module>
+ </modules>
+ </profile>
- <profile>
- <id>core</id>
- <activation>
- <property>
- <name>core</name>
- </property>
- </activation>
- <modules>
- <module>core</module>
- <module>common</module>
- <module>helpers</module>
- <module>enterprise</module>
- </modules>
- </profile>
+ <profile>
+ <id>core</id>
+ <activation>
+ <property>
+ <name>core</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>common</module>
+ <module>helpers</module>
+ <module>enterprise</module>
+ </modules>
+ </profile>
- <profile>
- <id>plugins</id>
- <activation>
- <property>
- <name>plugins</name>
- </property>
- </activation>
- </profile>
+ <profile>
+ <id>plugins</id>
+ <activation>
+ <property>
+ <name>plugins</name>
+ </property>
+ </activation>
+ </profile>
- </profiles>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core</module>
+ <module>enterprise</module>
+ </modules>
+ </profile>
- <modules>
- <module>test-utils</module>
- </modules>
+ </profiles>
+
+ <modules>
+ <module>test-utils</module>
+ </modules>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ca7f4c7..2525d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -459,7 +459,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
commit f736032f02e06b945462248075a6de11e806e1ff
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 09:44:38 2009 -0500
Git forced commit due to a Line Termination issue.
diff --git a/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
b/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
index 3090f97..7d3b7e3 100644
--- a/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
+++ b/modules/core/domain/src/main/java/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
-Class-Path: i18nlog-1.0.9.jar jaxb-api-2.1.jar stax-api-1.0-2.jar acti
- vation-1.1.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar
-
+Manifest-Version: 1.0
+Class-Path: i18nlog-1.0.9.jar jaxb-api-2.1.jar stax-api-1.0-2.jar acti
+ vation-1.1.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar
+
diff --git
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
index 06d7c32..13a3a73 100644
---
a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
+++
b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties
@@ -17,19 +17,19 @@ javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE = For property
"{2}", th
youareviewingraw = You are viewing this in files mode.
youareviewingstructured = You are viewing this in structured mode.
-editstructured=Change Properties
-editraw=Edit Files
+editstructured=Change Properties
+editraw=Edit Files
switch2 = Switch to
raw = files mode
structured = structured mode
files = List of files
currentfile = Current File
-uncommitted = file has uncommitted changes
-discard=Discard Changes
-commit=Commit Changes
-fullscreen=Full Screen
-upload=Upload
-save=save
-download=Download
-nopermissionedit=You do not have permission to edit this resource's configuration
+uncommitted = file has uncommitted changes
+discard=Discard Changes
+commit=Commit Changes
+fullscreen=Full Screen
+upload=Upload
+save=save
+download=Download
+nopermissionedit=You do not have permission to edit this resource's configuration
uploadcomplete=Back
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
b/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
index 6bb10a8..4c71d9a 100644
--- a/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
+++ b/modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0
-Class-Path: i18nlog-1.0.9.jar junit-3.8.1.jar rhq-enterprise-comm-1.4.
- 0-SNAPSHOT.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar rhq-core
- -comm-api-1.4.0-SNAPSHOT.jar dom4j-1.6.1-jboss.jar getopt-1.0.13.jar
- jboss-remoting-2.2.2.SP8.jar jboss-serialization-1.0.3.GA.jar concurr
- ent-1.3.4.jar rhq-enterprise-server-xml-schemas-1.4.0-SNAPSHOT.jar rh
- q-core-client-api-1.4.0-SNAPSHOT.jar jaxb-impl-2.1.6.jar rhq-core-dbu
- tils-1.4.0-SNAPSHOT.jar ant-1.6.5.jar safe-invoker-1.4.0-SNAPSHOT.jar
- jbossws-native-core-3.1.1.GA.jar jbossws-spi-1.1.1.GA.jar commons-be
- anutils-1.6.1.jar commons-collections-3.2.jar commons-httpclient-3.0.
- 1.jar commons-codec-1.2.jar commons-validator-1.1.4.jar xml-apis-1.0.
- b2.jar jboss-cache-1.4.1.SP9.jar jbpm-3.1.1.jar snmp4j-1.8.2.jar post
- gresql-8.4-701.jdbc3.jar rss4j-0.92-on.2.jar
-
+Manifest-Version: 1.0
+Class-Path: i18nlog-1.0.9.jar junit-3.8.1.jar rhq-enterprise-comm-1.4.
+ 0-SNAPSHOT.jar rhq-core-util-1.4.0-SNAPSHOT.jar jdom-1.0.jar rhq-core
+ -comm-api-1.4.0-SNAPSHOT.jar dom4j-1.6.1-jboss.jar getopt-1.0.13.jar
+ jboss-remoting-2.2.2.SP8.jar jboss-serialization-1.0.3.GA.jar concurr
+ ent-1.3.4.jar rhq-enterprise-server-xml-schemas-1.4.0-SNAPSHOT.jar rh
+ q-core-client-api-1.4.0-SNAPSHOT.jar jaxb-impl-2.1.6.jar rhq-core-dbu
+ tils-1.4.0-SNAPSHOT.jar ant-1.6.5.jar safe-invoker-1.4.0-SNAPSHOT.jar
+ jbossws-native-core-3.1.1.GA.jar jbossws-spi-1.1.1.GA.jar commons-be
+ anutils-1.6.1.jar commons-collections-3.2.jar commons-httpclient-3.0.
+ 1.jar commons-codec-1.2.jar commons-validator-1.1.4.jar xml-apis-1.0.
+ b2.jar jboss-cache-1.4.1.SP9.jar jbpm-3.1.1.jar snmp4j-1.8.2.jar post
+ gresql-8.4-701.jdbc3.jar rss4j-0.92-on.2.jar
+