modules/core/domain/pom.xml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 46
+++++++++
modules/enterprise/remoting/client-api/pom.xml | 48
++++++++++
3 files changed, 94 insertions(+), 2 deletions(-)
New commits:
commit 482a067fb38d04b2ca8e063c3a68a610bed626b5
Merge: 530106b... a9aedbd...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 16:42:24 2010 -0500
Merge branch 'linux-config' into linux-config-dev
commit a9aedbdc1fc430960061b90f249c078495f560a6
Merge: 7e25219... 57c23cc...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 16:42:03 2010 -0500
Merge branch 'linux-config' of
ssh://git.fedorahosted.org/git/rhq/rhq into
linux-config
Conflicts:
modules/core/pom.xml
modules/enterprise/server/jar/pom.xml
commit 530106b1d1f52bf30704da23dbf9624a330f9c93
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 16:37:04 2010 -0500
[BZ 545596] A further fix to handle, I think, a legacy problem avoiding
simultaneous reloads.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index fa81d78..3bd4af6 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -268,19 +268,22 @@
function refresh() {
- timeLeft = timeLeft - 1;
- document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
-
- if (timeLeft < 1) {
- window.location.href = window.location.href;
+ if (timeLeft > 0) {
+ timeLeft = timeLeft - 1;
+ document.getElementById("refreshTimeLeft").innerHTML =
timeLeft;
+ setTimeout("refresh()", 1000); // call again in 1 second
(1000ms)
}
- setTimeout("refresh()", 1000);
+
+ if (timeLeft == 0) {
+ document.getElementById("refreshTimeLeft").innerHTML =
timeLeft;
+ window.location.reload(true);
+ }
}
var refreshTime = <h:outputText
value="#{UserPreferencesUIBean.pageRefresh}"/>;
var timeLeft = refreshTime;
- if (refreshTime > 0) {
+ if (refreshTime > 0) {
setTimeout("refresh()", 1000);
}
@@ -290,7 +293,7 @@
<a4j:jsFunction
name="updatePageRefresh"
status="commonStatus"
- oncomplete="window.location.href = window.location.href;">
+ oncomplete="window.location.reload(true);">
<a4j:actionparam
name="param1"
assignTo="#{UserPreferencesUIBean.refreshPath}" />
commit 7e25219242f643a3347b267d7c812b1c0ef921b9
Merge: 90c6808... 3a73579...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 09:23:20 2010 -0500
Merge branch 'linux-config' into linux-config-dev
commit 90c6808e887884250e118815151cc2be0ff999e7
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Jan 4 09:21:11 2010 -0500
Trivial format change.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index bc30bdc..fa81d78 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -163,7 +163,6 @@
height="16" />
</f:facet>
</rich:menuItem>
-
</rich:dropDownMenu>
<ui:remove>***** Logged in as > EDIT DETAILS
*****</ui:remove>
@@ -264,6 +263,7 @@
renderRegionOnly="true"
selfRendered="true">
+
<script type="text/javascript">
function refresh() {
@@ -299,7 +299,6 @@
assignTo="#{UserPreferencesUIBean.pageRefresh}" />
</a4j:jsFunction>
</a4j:form>
-
</a4j:region>
</a4j:region>
commit 5999791dd6419bf3d484033095fd8dd8480e0aa2
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 17:52:57 2009 -0500
[BZ-545596] Fixed regression in refresh period menu item.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index 44bb844..bc30bdc 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -260,4 +260,46 @@
</h:form>
+ <a4j:region
+ renderRegionOnly="true"
+ selfRendered="true">
+
+ <script type="text/javascript">
+
+ function refresh() {
+
+ timeLeft = timeLeft - 1;
+ document.getElementById("refreshTimeLeft").innerHTML = timeLeft;
+
+ if (timeLeft < 1) {
+ window.location.href = window.location.href;
+ }
+ setTimeout("refresh()", 1000);
+ }
+
+ var refreshTime = <h:outputText
value="#{UserPreferencesUIBean.pageRefresh}"/>;
+ var timeLeft = refreshTime;
+
+ if (refreshTime > 0) {
+ setTimeout("refresh()", 1000);
+ }
+
+ </script>
+
+ <a4j:form>
+ <a4j:jsFunction
+ name="updatePageRefresh"
+ status="commonStatus"
+ oncomplete="window.location.href = window.location.href;">
+ <a4j:actionparam
+ name="param1"
+ assignTo="#{UserPreferencesUIBean.refreshPath}" />
+ <a4j:actionparam
+ name="param2"
+ assignTo="#{UserPreferencesUIBean.pageRefresh}" />
+ </a4j:jsFunction>
+ </a4j:form>
+
+ </a4j:region>
+
</a4j:region>
commit cc579c92b275ce5563f1f44bdefe6fd574e98d77
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 30 15:02:31 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
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 5e0a9e0..53d16e5 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -318,6 +318,47 @@
</build>
</profile>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+
+ <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>
+ </build>
+ </profile>
+
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 52b4963..ad83d23 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -1,85 +1,122 @@
-<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>
-
- <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>
-
- </profiles>
-
-</project>
\ No newline at end of file
+ <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>
+
+ <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>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <modules>
+ <module>native-system</module>
+ <module>plugin-api</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+
+ <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>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
diff --git a/modules/enterprise/remoting/client-api/pom.xml
b/modules/enterprise/remoting/client-api/pom.xml
index bbfb502..0fc95b6 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -182,5 +182,53 @@
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>javadoc</id>
+ <activation>
+ <property>
+ <name>javadoc.outputDirectory</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>javadoc-client-api</id>
+ <phase>compile</phase>
+
+ <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>
+ <link>../remote-api</link>
+ </links>
+ </configuration>
+ <goals>
+ <goal>javadoc</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..4377223 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -571,6 +571,76 @@
</dependency>
</dependencies>
</profile>
+
+ <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/pom.xml b/pom.xml
index 5a63160..dc2b8d0 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>