modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a19ca6be7ee20ad3fffb2f15d4722c105f62cbad
Author: Joseph Marques <joseph(a)redhat.com>
Date: Mon May 24 18:06:57 2010 -0400
fix ArrayIndexOutOfBoundsException when there are search terms but the user repositions the cursor at the beginning of the SearchBar
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
index 38fadd1..c83f4a1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
@@ -377,7 +377,7 @@ public class SearchAssistManager {
String[] tokens = assistant.getTerms().toArray(new String[0]);
debug("" + tokens.length + " tokens are " + Arrays.asList(tokens));
- if (tokens.length == 0) {
+ if (tokens.length == 0 || caretPos == 0) {
debug("getAdvancedSuggestions: no terms");
return convert(getAllContexts()); // no terms yet defined
}
1
0
modules/core/native-system/ant-run.xml | 2 +-
modules/enterprise/agent/ant-run.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d6abc10184a942057979de3d84ee36d7c24560b9
Merge: a76664e... 7a55d68...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 24 18:15:10 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit a76664e065a7b97e7e7c3296bdfd5fb50856cb57
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 24 18:12:59 2010 -0400
upgrade SIGAR from 1.6.4 to 1.6.5 (fixes https://bugzilla.redhat.com/show_bug.cgi?id=591519)
diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml
index 856c682..3856bcd 100644
--- a/modules/core/native-system/ant-run.xml
+++ b/modules/core/native-system/ant-run.xml
@@ -11,7 +11,7 @@ Ant Script that builds a test jar to run SIGAR bug replication code.
<!-- in case it wasn't passed in, assume the default location -->
<property name="settings.localRepository" location="${user.home}/.m2/repository"/>
<property name="project.version" value="3.0.0-SNAPSHOT"/>
- <property name="sigar.version" value="1.6.4.129"/>
+ <property name="sigar.version" value="1.6.5.132"/>
<fileset dir="${settings.localRepository}" id="jar.fileset">
<include name="i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar" />
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index 16a0194..fbe78f1 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -11,7 +11,7 @@ Ant Script that provides ways to package the Agent.
<!-- in case these weren't passed in (i.e. not invoked via maven), assume some defaults -->
<property name="settings.localRepository" location="${user.home}/.m2/repository"/>
<property name="project.version" value="2.0.0-SNAPSHOT"/>
- <property name="sigar.version" value="1.6.4.129"/>
+ <property name="sigar.version" value="1.6.5.132"/>
<property name="getopt.version" value="1.0.13"/>
<property name="jaxb-api.version" value="2.1"/>
<property name="jaxb-impl.version" value="2.1"/>
diff --git a/pom.xml b/pom.xml
index 0736bc7..ded19ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<jtds.version>1.2.2</jtds.version>
<richfaces.version>3.3.3.CR1</richfaces.version>
<jline.version>0.9.94</jline.version>
- <sigar.version>1.6.4.129</sigar.version>
+ <sigar.version>1.6.5.132</sigar.version>
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.2</jna.version>
1
0
modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 16 +++++-----
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 7a55d68849899f038f61f9e29df577f0e07e64c1
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon May 24 16:46:22 2010 -0400
Fixing compilation errors
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
index 0688c79..b4f64e4 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
@@ -28,13 +28,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import org.rhq.core.server.MeasurementConverter;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.testng.annotations.Test;
-import org.rhq.core.domain.measurement.MeasurementConverterClient;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-import org.rhq.core.domain.test.AbstractEJB3Test;
import org.rhq.core.server.MeasurementParser;
// TODO two tests in here need to be re-enables once the GWT client issues are resolved
@@ -98,7 +98,7 @@ public class MeasurementConverterTest extends AbstractEJB3Test {
MeasurementUnits expectedUnits) {
incrementPrecisionScalingTestCount();
- String[] results = MeasurementConverterClient.formatToSignificantPrecision(values, units, true);
+ String[] results = MeasurementConverter.formatToSignificantPrecision(values, units, true);
for (int i = 0; i < results.length; i++) {
String expected = expectedResults[i];
String actual = results[i];
@@ -109,7 +109,7 @@ public class MeasurementConverterTest extends AbstractEJB3Test {
Locale.setDefault(Locale.US);
MeasurementNumericValueAndUnits vu = MeasurementParser.parse(expected, expectedUnits);
Locale.setDefault(defaultLocale);
- expected = MeasurementConverterClient.format(vu.getValue(), expectedUnits, false, null, 4);
+ expected = MeasurementConverter.format(vu.getValue(), expectedUnits, false, null, 4);
}
assert actual.equals(expected) : "Test " + precisionScalingTestCount.get() + ": " + "Index " + i + ", "
@@ -150,7 +150,7 @@ public class MeasurementConverterTest extends AbstractEJB3Test {
}
for (String unitVariation : unitsVariations) {
- String original = MeasurementConverterClient.format(POSITIVE, units, false);
+ String original = MeasurementConverter.format(POSITIVE, units, false);
String toBeTested = magnitudeVariation.trim() + unitVariation.trim();
assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
@@ -174,7 +174,7 @@ public class MeasurementConverterTest extends AbstractEJB3Test {
}
for (String unitVariation : unitsVariations) {
- String original = MeasurementConverterClient.format(-POSITIVE, units, false);
+ String original = MeasurementConverter.format(-POSITIVE, units, false);
String toBeTested = "-" + magnitudeVariation.trim() + unitVariation.trim();
assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
@@ -259,7 +259,7 @@ public class MeasurementConverterTest extends AbstractEJB3Test {
private void validateScale(double fromValue, MeasurementUnits fromUnits, double toValue, MeasurementUnits toUnits) {
MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(fromValue, fromUnits);
try {
- double derived = MeasurementConverterClient.scale(valueAndUnits, toUnits);
+ double derived = MeasurementConverter.scale(valueAndUnits, toUnits);
assert Math.abs(toValue - derived) < 1e-9 : "Scale conversion error: " +
"From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
@@ -287,7 +287,7 @@ public class MeasurementConverterTest extends AbstractEJB3Test {
private void validateFormatConvert(double passedValue, double expectedValue, MeasurementUnits units) {
try {
- String intermediate = MeasurementConverterClient.format(passedValue, units, false);
+ String intermediate = MeasurementConverter.format(passedValue, units, false);
MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 154 +++-------
1 file changed, 52 insertions(+), 102 deletions(-)
New commits:
commit 5971d11749552d65176840755d105df2efd5e503
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 16:18:12 2010 -0400
Fix table rendering order problem (buttons missing)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 6ff4f0c..9167473 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -161,7 +161,6 @@ public class Table extends VLayout {
super.onInit();
-
// NOTE: It is essential that we wait to hide any excluded fields until after super.onDraw() is called, since
// super.onDraw() is what actually adds the fields to the ListGrid (based on what fields are defined in
// the underlying datasource).
@@ -184,129 +183,80 @@ public class Table extends VLayout {
tableInfo.setWrap(false);
- for (final TableActionInfo tableAction : tableActions) {
- IButton button = new IButton(tableAction.title);
- button.setDisabled(true);
- button.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent clickEvent) {
- if (tableAction.confirmMessage != null) {
- String message = tableAction.confirmMessage.replaceAll("\\#", String.valueOf(listGrid
- .getSelection().length));
+ }
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- tableAction.action.executeAction(listGrid.getSelection());
- }
- }
- });
- } else {
- tableAction.action.executeAction(listGrid.getSelection());
- }
- }
- });
- tableAction.actionButton = button;
- footer.addMember(button);
- }
- for (Canvas extraWidgetCanvas : extraWidgets) {
- footer.addMember(extraWidgetCanvas);
- }
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ removeMembers(getMembers());
- footer.addMember(new LayoutSpacer());
+ addMember(titleLayout);
+ addMember(listGrid);
+ if (showFooter) {
- IButton refreshButton = new IButton("Refresh");
- refreshButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent clickEvent) {
- listGrid.invalidateCache();
- }
- });
- footer.addMember(refreshButton);
- footer.addMember(tableInfo);
+ for (final TableActionInfo tableAction : tableActions) {
+ IButton button = new IButton(tableAction.title);
+ button.setDisabled(true);
+ button.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ if (tableAction.confirmMessage != null) {
+
+ String message = tableAction.confirmMessage.replaceAll("\\#", String.valueOf(listGrid
+ .getSelection().length));
- // Manages enable/disable buttons for the grid
- listGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
- public void onSelectionChanged(SelectionEvent selectionEvent) {
- refreshTableInfo();
+ SC.ask(message, new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ tableAction.action.executeAction(listGrid.getSelection());
+ }
+ }
+ });
+ } else {
+ tableAction.action.executeAction(listGrid.getSelection());
+ }
+ }
+ });
+ tableAction.actionButton = button;
+ footer.addMember(button);
}
- });
- listGrid.addDataArrivedHandler(new DataArrivedHandler() {
- public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
- refreshTableInfo();
- fieldSizes.clear();
- totalWidth = 0;
+ for (Canvas extraWidgetCanvas : extraWidgets) {
+ footer.addMember(extraWidgetCanvas);
}
- });
- // TODO GH: This doesn't yet work as desired to force the fields to fit to the table when you resize one of them.
- if (false) { // If Force Fit
- listGrid.addDataArrivedHandler(new DataArrivedHandler() {
- public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
- for (ListGridField f : listGrid.getFields()) {
- int size = listGrid.getFieldWidth(f.getName());
- fieldSizes.add(size);
- totalWidth += size;
- }
+ footer.addMember(new LayoutSpacer());
+
+ IButton refreshButton = new IButton("Refresh");
+ refreshButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ listGrid.invalidateCache();
}
});
+ footer.addMember(refreshButton);
- listGrid.addFieldStateChangedHandler(new FieldStateChangedHandler() {
- public void onFieldStateChanged(FieldStateChangedEvent fieldStateChangedEvent) {
-
- if (autoSizing) {
- return;
- }
- autoSizing = true;
-
- ArrayList<Integer> newSizes = new ArrayList<Integer>();
- int total = 0;
- int resizeCol = 0;
- int i = 0;
- for (ListGridField f : listGrid.getFields()) {
- int size = listGrid.getFieldWidth(f.getName());
- newSizes.add(size);
- total += size;
- if (fieldSizes.get(i) != size) {
- resizeCol = i;
- }
- i++;
- System.out.println("Field " + f.getName() + " width: " + listGrid.getFieldWidth(f.getName()));
- }
-
- int diff = totalWidth - total;
- int fieldsLeft = listGrid.getFields().length - resizeCol - 1;
+ footer.addMember(tableInfo);
- if (fieldsLeft > 0) {
- int perFieldSizeDiff = diff / fieldsLeft;
- for (int j = resizeCol + 1; j < listGrid.getFields().length; j++) {
- listGrid.resizeField(j, fieldSizes.get(j) + perFieldSizeDiff);
- }
- }
-
- fieldSizes = newSizes;
- markForRedraw();
-
- autoSizing = false;
+ // Manages enable/disable buttons for the grid
+ listGrid.addSelectionChangedHandler(new SelectionChangedHandler() {
+ public void onSelectionChanged(SelectionEvent selectionEvent) {
+ refreshTableInfo();
}
});
- }
- }
+ listGrid.addDataArrivedHandler(new DataArrivedHandler() {
+ public void onDataArrived(DataArrivedEvent dataArrivedEvent) {
+ refreshTableInfo();
+ fieldSizes.clear();
+ totalWidth = 0;
+ }
+ });
- @Override
- protected void onDraw() {
- super.onDraw();
-
- removeMembers(getMembers());
- addMember(titleLayout);
- addMember(listGrid);
- if (showFooter) {
addMember(footer);
}
}
1
0
[rhq] Branch 'bundle' - 126 commits - modules/core modules/enterprise modules/jopr modules/plugins pom.xml
by Greg Hinkle 24 May '10
by Greg Hinkle 24 May '10
24 May '10
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java | 14
modules/core/dbutils/pom.xml | 416 +-
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 18
modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 74
modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-data-combined-2.3.1.xml | 663 +++
modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-schema-combined-2.3.1.xml | 1916 ++++++++++
modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 2
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 56
modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 5
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 24
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java | 99
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 214 -
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java | 360 -
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 10
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java | 44
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java | 9
modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java | 22
modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java | 21
modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java | 355 -
modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java | 104
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java | 74
modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java | 54
modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 390 --
modules/core/native-system/ant-run.xml | 6
modules/core/native-system/pom.xml | 21
modules/core/plugin-container/pom.xml | 13
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java | 7
modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java | 2
modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java | 4
modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java | 6
modules/enterprise/agent/ant-run.xml | 5
modules/enterprise/agent/pom.xml | 15
modules/enterprise/gui/base-perspective-jar/pom.xml | 48
modules/enterprise/gui/coregui/pom.xml | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java | 360 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java | 85
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java | 50
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 476 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 156
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java | 178
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java | 157
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java | 307 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 3
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 20
modules/enterprise/gui/coregui/src/main/webapp/css/search.css | 218 +
modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-gray-no-border.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-white-no-border.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-left-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-right-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-left-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-right-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow_down.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/star1.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/star2.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/star3.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/trash.png |binary
modules/enterprise/gui/coregui/src/main/webapp/js/search.js | 35
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java | 2
modules/enterprise/gui/installer-war/src/main/webapp/start.jsp | 2
modules/enterprise/gui/portal-war/pom.xml | 15
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java | 194 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java | 58
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java | 10
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoResourcesUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoSubscriptionsUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoUnsubscriptionsUIBean.java | 16
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java | 37
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java | 34
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListChildResourcesUIBean.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/ResourceHubPortalAction.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeModelUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeStateAdvisor.java | 144
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java | 197 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeNode.java | 5
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp | 12
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml | 12
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 19
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml | 35
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml | 14
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/navigation/GroupTree.xhtml | 1
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 47
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 64
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml | 9
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml | 3
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml | 5
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/facelet.xhtml | 46
modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/simple.html | 36
modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/inner.xhtml | 36
modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/outer.xhtml | 28
modules/enterprise/remoting/client-api/pom.xml | 59
modules/enterprise/server/ear/pom.xml | 10
modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g | 8
modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java | 355 +
modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java | 104
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java | 84
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionException.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 97
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 156
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 199 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 231 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java | 11
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java | 57
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 23
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentServerServiceImpl.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 339 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 53
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 365 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java | 81
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java | 30
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistant.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 158
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslator.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLSimpleTerm.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 2
modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt | 14
modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 390 ++
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java | 98
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 27
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/RHQLTest.java | 5
modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java | 2
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java | 2
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java | 2
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoProvider.java | 4
modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml | 23
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 4
modules/plugins/aliases/src/main/resources/META-INF/rhq-plugin.xml | 3
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 23
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java | 10
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java | 17
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java | 19
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java | 11
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java | 12
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 39
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java | 115
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/apache/src/main/resources/httpd.aug | 2
modules/plugins/augeas/pom.xml | 17
modules/plugins/grub/pom.xml | 2
modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/hosts/src/main/resources/META-INF/rhq-plugin.xml | 3
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 126
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 105
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java | 30
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 70
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java | 55
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java | 6
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java | 319 -
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java | 13
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java | 5
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java | 180
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java | 10
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 1181 +++---
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 50
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java | 9
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 36
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java | 11
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java | 16
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 8
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 2
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java | 57
modules/plugins/pom.xml | 35
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 5
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 18
modules/plugins/script2/pom.xml | 26
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml | 3
pom.xml | 35
231 files changed, 10589 insertions(+), 4182 deletions(-)
New commits:
commit beb8a138dc8bfb19aff5bb688ac99f491e688fe7
Merge: d160bce... 5eb7cc4...
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 15:17:55 2010 -0400
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into localbundle
commit d160bce2e9bed02cb524c094ac8aebe8431628b7
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 15:12:28 2010 -0400
Need the thirdparty repos to find the new augeas dep
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 9a781ba..f210815 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -93,6 +93,21 @@
</plugins>
</build>
+ <repositories>
+
+ <!-- for the augeas jar -->
+ <repository>
+ <id>jboss-thirdparty-uploads</id>
+ <name>JBoss Third-Party Uploads</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ </repositories>
+
+
<profiles>
<profile>
commit 197880f2173382c1b6db4896f62836e653324a41
Merge: 084b6c0... 6a31c12...
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 14:37:01 2010 -0400
merging master to bundle
Merge remote branch 'remotes/origin/master' into localbundle
Conflicts:
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
modules/core/dbutils/pom.xml
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
modules/enterprise/gui/coregui/pom.xml
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
modules/enterprise/gui/portal-war/pom.xml
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
diff --cc modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 2a36ec5,6ec7660..4071b12
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@@ -2908,46 -2918,18 +2934,46 @@@
REFERENCES RHQ_TAGGING ( ID )
</statement>
</schema-directSQL>
- </schemaSpec>
+
+ <schema-directSQL>
+ <statement>
+ CREATE TABLE RHQ_TAGGING_BUNDLE_DEST_MAP ( BUNDLE_DESTINATION_ID INTEGER )
+ </statement>
+ </schema-directSQL>
+ <schema-alterColumn table="RHQ_TAGGING_BUNDLE_DEST_MAP" column="BUNDLE_DESTINATION_ID" nullable="false" />
+ <schema-addColumn table="RHQ_TAGGING_BUNDLE_DEST_MAP" column="TAG_ID" columnType="INTEGER" />
+ <schema-alterColumn table="RHQ_TAGGING_BUNDLE_DEST_MAP" column="TAG_ID" nullable="false" />
+ <schema-directSQL>
+ <statement>
+ ALTER TABLE RHQ_TAGGING_BUNDLE_DEST_MAP
+ ADD CONSTRAINT RHQ_TAGGING_BUNDLE_DES_MAP_KEY
+ PRIMARY KEY ( BUNDLE_DESTINATION_ID, TAG_ID )
+ </statement>
+ <statement>
+ ALTER TABLE RHQ_TAGGING_BUNDLE_DEST_MAP
+ ADD CONSTRAINT RHQ_TBDM_B_DESTINATION_ID_FK
+ FOREIGN KEY ( BUNDLE_DESTINATION_ID )
+ REFERENCES RHQ_BUNDLE_DESTINATION ( ID )
+ </statement>
+ <statement>
+ ALTER TABLE RHQ_TAGGING_BUNDLE_DEST_MAP
+ ADD CONSTRAINT RHQ_TBDESTM_TAG_ID_FK
+ FOREIGN KEY ( TAG_ID )
+ REFERENCES RHQ_TAGGING ( ID )
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
- <schemaSpec version="2.86">
- <schema-directSQL>
- <statement desc="Adding MANAGE_BUNDLE permission to overlord">
- INSERT INTO RHQ_PERMISSION VALUES(1, 12)
- </statement>
- <statement desc="Adding MANAGE_BUNDLE permission to superuser">
- INSERT INTO RHQ_PERMISSION VALUES(2, 12)
- </statement>
- </schema-directSQL>
- </schemaSpec>
+
+ <schemaSpec version="2.87">
+ <schema-directSQL>
+ <statement desc="Make RHQ_RES_TYPE_IDX_PLG_NAME index unique">
+ DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME ;
+ CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin)
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 6c6433c,e1e627b..f7a5a2c
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@@ -44,23 -45,23 +45,26 @@@
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/>
+ <entry-point class='org.rhq.enterprise.gui.coregui.client.SearchGUI'/>
- <servlet path="/RoleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl"/>
- <servlet path="/SubjectGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl"/>
- <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl"/>
- <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl"/>
+ <servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/>
+ <servlet path="/AuthorizationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl"/>
+ <servlet path="/AvailabilityGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl"/>
+ <servlet path="/BundleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.BundleGWTServiceImpl"/>
<servlet path="/ConfigurationGwtService" class="org.rhq.enterprise.gui.coregui.server.gwt.ConfigurationGWTServiceImpl"/>
- <servlet path="/ResourceTypeGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl"/>
<servlet path="/MeasurementDataGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.MeasurementDataGWTServiceImpl"/>
- <servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/>
<servlet path="/OperationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.OperationGWTServiceImpl"/>
- <servlet path="/BundleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.BundleGWTServiceImpl"/>
+ <servlet path="/RemoteInstallGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl"/>
<servlet path="/ResourceBossGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceBossGWTServiceImpl"/>
- <servlet path="/AuthorizationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl"/>
- <servlet path="/AvailabilityGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl"/>
+ <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl"/>
+ <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl"/>
+ <servlet path="/ResourceTypeGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl"/>
+ <servlet path="/RoleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl"/>
+ <servlet path="/SearchGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SearchGWTServiceImpl"/>
+ <servlet path="/SubjectGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl"/>
<servlet path="/TagGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.TagGWTServiceImpl"/>
+ <servlet path="/RemoteInstallGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl"/>
+ <servlet path="/RepoGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RepoGWTServiceImpl"/>
+ <servlet path="/ContentGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ContentGWTServiceImpl"/>
</module>
diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 0d15b46,a39a8a1..c49908f
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@@ -194,18 -161,14 +199,16 @@@ public class CoreGUI implements EntryPo
History.fireCurrentHistoryState();
}
-
public void onValueChange(ValueChangeEvent<String> stringValueChangeEvent) {
- System.out.println("Handling history event: " + stringValueChangeEvent.getValue());
- currentViewPath = new ViewPath(stringValueChangeEvent.getValue());
- rootCanvas.renderView(currentViewPath);
+ String event = URL.decodeComponent(stringValueChangeEvent.getValue());
+ System.out.println("Handling history event: " + event);
+ currentViewPath = new ViewPath(event);
+
+ rootCanvas.renderView(currentViewPath);
}
-
public Canvas createContent(String breadcrumbName) {
Canvas canvas;
diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
index 8dbdaa5,9d173a2..d48dd7a
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
@@@ -96,15 -96,10 +96,19 @@@ public class GWTServiceLookup
return secure(RemoteInstallGWTServiceAsync.Util.getInstance());
}
+ public static RepoGWTServiceAsync getRepoService() {
+ return secure(RepoGWTServiceAsync.Util.getInstance());
+ }
+
+ public static ContentGWTServiceAsync getContentService() {
+ return secure(ContentGWTServiceAsync.Util.getInstance());
+ }
+
+ public static SearchGWTServiceAsync getSearchService() {
+ return secure(SearchGWTServiceAsync.Util.getInstance());
+ }
+
+
private static <T> T secure(Object sdt) {
if (!(sdt instanceof ServiceDefTarget))
return null;
diff --cc modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index dd4df53,45b8fc2..97b5a3e
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@@ -80,15 -84,6 +80,19 @@@
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RemoteInstallGWTService</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl</servlet-class>
</servlet>
+ <servlet>
++ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SearchGWTService</servlet-name>
++ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.SearchGWTServiceImpl</servlet-class>
++ </servlet>
++ <servlet>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RepoGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.RepoGWTServiceImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ContentGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ContentGWTServiceImpl</servlet-class>
+ </servlet>
+
<servlet-mapping>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RoleGWTService</servlet-name>
@@@ -162,12 -161,4 +166,20 @@@
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RemoteInstallGWTService</servlet-name>
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/RemoteInstallGWTService</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
++ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SearchGWTService</servlet-name>
++ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/SearchGWTService</url-pattern>
++ </servlet-mapping>
++ <servlet-mapping>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RepoGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/RepoGWTService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ContentGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/ContentGWTService</url-pattern>
+ </servlet-mapping>
++ <servlet-mapping>
++ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SearchGWTService</servlet-name>
++ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/SearchGWTService</url-pattern>
++ </servlet-mapping>
</web-app>
commit 6a31c12f691c2e41ec833e0ef667851b38e6a12a
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon May 24 13:44:22 2010 -0400
Removing scratch work that was accidentally committed
diff --git a/modules/core/domain/mvn.out b/modules/core/domain/mvn.out
deleted file mode 100644
index 492a5b3..0000000
--- a/modules/core/domain/mvn.out
+++ /dev/null
@@ -1,1714 +0,0 @@
-[INFO] Scanning for projects...
-[INFO] snapshot org.rhq:rhq-parent:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
-[INFO] ------------------------------------------------------------------------
-[INFO] Building RHQ Domain Model
-[INFO] task-segment: [clean, gwt:compile]
-[INFO] ------------------------------------------------------------------------
-[INFO] [clean:clean {execution: default-clean}]
-[INFO] Deleting /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target
-[INFO] snapshot org.rhq:rhq-core-util:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
-[INFO] [gwt:compile {execution: default-cli}]
-[INFO] using GWT jars from project dependencies : 2.0.0
-[WARNING] You should not declare gwt-dev as a project dependency. This may introduce complex dependency conflicts
-[INFO] auto discovered modules [org.rhq.core.RHQDomain]
-[INFO] establishing classpath list (scope = compile)
-[INFO] using GWT jars for specified version 2.0.0
-[INFO] using GWT jars for specified version 2.0.0
-[INFO] Compiling module org.rhq.core.RHQDomain
-[INFO] Validating newly compiled units
-[INFO] [ERROR] Errors in 'file:/Users/john/Development/redhat/imanage/rhq/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java'
-[INFO] [ERROR] Line 23: The import org.rhq.core.server.MeasurementConverter cannot be resolved
-[INFO] [ERROR] Line 165: MeasurementConverter cannot be resolved
-[INFO] [ERROR] Line 166: MeasurementConverter cannot be resolved
-[INFO] [ERROR] Line 174: MeasurementConverter cannot be resolved
-[INFO] Resolving org.rhq.core.domain.operation.GroupOperationScheduleEntity
-[INFO] Found type 'org.rhq.core.domain.operation.GroupOperationScheduleEntity'
-[INFO] Found type 'org.rhq.core.domain.operation.OperationScheduleEntity'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.operation.ScheduleJobId
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.operation.ScheduleJobId
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.content.RepoPackageVersion
-[INFO] Found type 'org.rhq.core.domain.content.RepoPackageVersion'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoPackageVersionPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoPackageVersionPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple'
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinition'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.criteria.RoleCriteria
-[INFO] Found type 'org.rhq.core.domain.criteria.RoleCriteria'
-[INFO] Found type 'org.rhq.core.domain.authz.Role'
-[INFO] Found type 'org.rhq.core.domain.resource.group.ResourceGroup'
-[INFO] Found type 'org.rhq.core.domain.resource.Resource'
-[INFO] Found type 'org.rhq.core.domain.content.ResourceRepo'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ResourceRepoPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ResourceRepoPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.Repo'
-[INFO] Found type 'org.rhq.core.domain.content.RepoContentSource'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoContentSourcePK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoContentSourcePK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoDistribution'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoDistributionPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoDistributionPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoAdvisory'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoAdvisoryPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoAdvisoryPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.PackageVersion'
-[INFO] Found type 'org.rhq.core.domain.content.ProductVersionPackageVersion'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ProductVersionPackageVersionPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ProductVersionPackageVersionPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoRepoGroup'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoGroupPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoGroupPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoRepoRelationship'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoRelationshipPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoRelationshipPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.content.PackageVersionContentSource
-[INFO] Found type 'org.rhq.core.domain.content.PackageVersionContentSource'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.PackageVersionContentSourcePK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.PackageVersionContentSourcePK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.PropertyMap
-[INFO] Found type 'org.rhq.core.domain.configuration.PropertyMap'
-[INFO] Found type 'org.rhq.core.domain.configuration.Property'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.configuration.Configuration
-[INFO] Found type 'org.rhq.core.domain.configuration.Configuration'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.configuration.PropertyList'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.Property
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.Property
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.ConfigurationDefinition.GroupComparator
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.ConfigurationDefinition'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.bundle.BundleVersionRepo
-[INFO] Found type 'org.rhq.core.domain.bundle.BundleVersionRepo'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.bundle.BundleVersionRepoPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.bundle.BundleVersionRepoPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionMap'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.resource.ResourceType
-[INFO] Found type 'org.rhq.core.domain.resource.ResourceType'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.resource.ResourceType
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.resource.ResourceType
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionList'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Compiling 4 permutations
-[INFO] Compiling permutation 0...
-[INFO] Compiling permutation 2...
-[INFO] Compiling permutation 3...
-[INFO] Process output
-[INFO] Compiling permutation 1...
-[INFO] Compile of permutations succeeded
-[INFO] Linking into /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/rhq-core-domain-ejb3/org.rhq.core.RHQDomain. Writing extras to /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/extra/org.rhq.core.RHQDomain
-[INFO] Link succeeded
-[INFO] Compilation succeeded -- 36.634s
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 1 minute 12 seconds
-[INFO] Finished at: Mon May 24 10:12:35 EDT 2010
-[INFO] Final Memory: 32M/527M
-[INFO] ------------------------------------------------------------------------
commit 797f13a4df3a2c1798649557c9911682e3e0b9b8
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon May 24 13:39:22 2010 -0400
[BZ 586068] Moving formatting code out of core/domain to avoid problems with gwt
There are some classes and packages such as java.text that cannot be used in GWT code. One
of my previous commits refactored MeasurementOOBComposite to use MeasurementConverter which
has a dependency on java.text. I removed the formatting calls from MeausrementOOBComposite and
moved formmatting classes into server/jar. The formatting is now done in the SLSB method from
which the MeasurementOOBComposites are returned. The GWT-based formatter,
MeasurementConverterClient has been moved to coregui.
diff --git a/modules/core/domain/mvn.out b/modules/core/domain/mvn.out
new file mode 100644
index 0000000..492a5b3
--- /dev/null
+++ b/modules/core/domain/mvn.out
@@ -0,0 +1,1714 @@
+[INFO] Scanning for projects...
+[INFO] snapshot org.rhq:rhq-parent:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
+[INFO] ------------------------------------------------------------------------
+[INFO] Building RHQ Domain Model
+[INFO] task-segment: [clean, gwt:compile]
+[INFO] ------------------------------------------------------------------------
+[INFO] [clean:clean {execution: default-clean}]
+[INFO] Deleting /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target
+[INFO] snapshot org.rhq:rhq-core-util:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
+[INFO] [gwt:compile {execution: default-cli}]
+[INFO] using GWT jars from project dependencies : 2.0.0
+[WARNING] You should not declare gwt-dev as a project dependency. This may introduce complex dependency conflicts
+[INFO] auto discovered modules [org.rhq.core.RHQDomain]
+[INFO] establishing classpath list (scope = compile)
+[INFO] using GWT jars for specified version 2.0.0
+[INFO] using GWT jars for specified version 2.0.0
+[INFO] Compiling module org.rhq.core.RHQDomain
+[INFO] Validating newly compiled units
+[INFO] [ERROR] Errors in 'file:/Users/john/Development/redhat/imanage/rhq/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java'
+[INFO] [ERROR] Line 23: The import org.rhq.core.server.MeasurementConverter cannot be resolved
+[INFO] [ERROR] Line 165: MeasurementConverter cannot be resolved
+[INFO] [ERROR] Line 166: MeasurementConverter cannot be resolved
+[INFO] [ERROR] Line 174: MeasurementConverter cannot be resolved
+[INFO] Resolving org.rhq.core.domain.operation.GroupOperationScheduleEntity
+[INFO] Found type 'org.rhq.core.domain.operation.GroupOperationScheduleEntity'
+[INFO] Found type 'org.rhq.core.domain.operation.OperationScheduleEntity'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.operation.ScheduleJobId
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.operation.ScheduleJobId
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.content.RepoPackageVersion
+[INFO] Found type 'org.rhq.core.domain.content.RepoPackageVersion'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoPackageVersionPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoPackageVersionPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple'
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinition'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.criteria.RoleCriteria
+[INFO] Found type 'org.rhq.core.domain.criteria.RoleCriteria'
+[INFO] Found type 'org.rhq.core.domain.authz.Role'
+[INFO] Found type 'org.rhq.core.domain.resource.group.ResourceGroup'
+[INFO] Found type 'org.rhq.core.domain.resource.Resource'
+[INFO] Found type 'org.rhq.core.domain.content.ResourceRepo'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ResourceRepoPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ResourceRepoPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.Repo'
+[INFO] Found type 'org.rhq.core.domain.content.RepoContentSource'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoContentSourcePK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoContentSourcePK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoDistribution'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoDistributionPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoDistributionPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoAdvisory'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoAdvisoryPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoAdvisoryPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.PackageVersion'
+[INFO] Found type 'org.rhq.core.domain.content.ProductVersionPackageVersion'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ProductVersionPackageVersionPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ProductVersionPackageVersionPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoRepoGroup'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoGroupPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoGroupPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoRepoRelationship'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoRelationshipPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoRelationshipPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.content.PackageVersionContentSource
+[INFO] Found type 'org.rhq.core.domain.content.PackageVersionContentSource'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.PackageVersionContentSourcePK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.PackageVersionContentSourcePK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.PropertyMap
+[INFO] Found type 'org.rhq.core.domain.configuration.PropertyMap'
+[INFO] Found type 'org.rhq.core.domain.configuration.Property'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.configuration.Configuration
+[INFO] Found type 'org.rhq.core.domain.configuration.Configuration'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.configuration.PropertyList'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.Property
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.Property
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.ConfigurationDefinition.GroupComparator
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.ConfigurationDefinition'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.bundle.BundleVersionRepo
+[INFO] Found type 'org.rhq.core.domain.bundle.BundleVersionRepo'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.bundle.BundleVersionRepoPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.bundle.BundleVersionRepoPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionMap'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.resource.ResourceType
+[INFO] Found type 'org.rhq.core.domain.resource.ResourceType'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.resource.ResourceType
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.resource.ResourceType
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionList'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Compiling 4 permutations
+[INFO] Compiling permutation 0...
+[INFO] Compiling permutation 2...
+[INFO] Compiling permutation 3...
+[INFO] Process output
+[INFO] Compiling permutation 1...
+[INFO] Compile of permutations succeeded
+[INFO] Linking into /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/rhq-core-domain-ejb3/org.rhq.core.RHQDomain. Writing extras to /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/extra/org.rhq.core.RHQDomain
+[INFO] Link succeeded
+[INFO] Compilation succeeded -- 36.634s
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 1 minute 12 seconds
+[INFO] Finished at: Mon May 24 10:12:35 EDT 2010
+[INFO] Final Memory: 32M/527M
+[INFO] ------------------------------------------------------------------------
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
deleted file mode 100644
index f78b62c..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
+++ /dev/null
@@ -1,360 +0,0 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- package org.rhq.core.domain.measurement;
-
- import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
- import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
- import com.google.gwt.i18n.client.NumberFormat;
-
- import java.util.HashSet;
- import java.util.Set;
-
- public class MeasurementConverterClient {
- private static final int MAX_PRECISION_DIGITS = 4;
- private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
-
-
- private static NumberFormat getDefaultNumberFormat() {
- NumberFormat nf = NumberFormat.getFormat("0.0");
-
- return nf;
- }
-
- public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- MeasurementUnits originUnits = origin.getUnits();
- Double originValue = origin.getValue();
-
- return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
- }
-
- public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
- boolean wasNegative = false;
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementUnits baseUnit = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
-
- Double results = scale(valueAndUnits, targetUnits);
- if (wasNegative) {
- results = -results;
- }
-
- return results;
- }
-
- public static String format(String value, MeasurementUnits targetUnits) {
- if (targetUnits == null) {
- return value;
- } else {
- return value + targetUnits;
- }
- }
-
- /**
- * Formats the given array of double values: determines the necessary precision such that when formatted, they are
- * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
- * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
- * bounded for presentation considerations.
- *
- * @param values the values to be formatted
- * @param targetUnits the target units for the values
- * @param bestFit whether or not to use a normalized scale for the family of units
- *
- * @return the formatted values
- */
- public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
- if ((null == values) || (values.length == 0)) {
- return null;
- }
-
- MeasurementUnits originalUnits = targetUnits;
-
- /*
- * in the overwhelming majority of cases, you're going to want to apply a bestFit
- * to the passed data, but it's not required; it's perfectly possible to allow a
- * list of doubles to be formatted without being fit, in which case the targetUnits
- * will be part of the formatted display for each result element
- */
- if (bestFit) {
- // find bestFit units by taking the average
- Double average = 0.0;
-
- for (int i = 0, sz = values.length; i < sz; i++) {
- /*
- * adding fractional amount iterative leads to greater
- * error, but prevents overflow on large data sets
- */
- average += (values[i] / sz);
- }
-
- MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
- //noinspection UnnecessaryLocalVariable
- MeasurementUnits fittedUnits = fittedAverage.getUnits();
-
- /*
- * and change the local reference to targetUnits, so that the same logic
- * can be used both for the bestFit and non-bestFit computations
- */
- targetUnits = fittedUnits;
- }
-
- @SuppressWarnings("unused")
- Set<String> existingStrings; // technically this *is* unused because
- int precisionDigits = 0;
- boolean scaleWithMorePrecision = true;
- String[] results = new String[values.length];
- NumberFormat nf = getDefaultNumberFormat();
-
- /*
- * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
- *
- * increase the maxPrecisionDigits in the while condition
- * itself to ensure it gets done for every loop
- */
- while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
- /*
- * make the assumption that we no longer need to scale beyond this iteration
- */
- scaleWithMorePrecision = false;
-
- /*
- * we need to record the uniquely formatted values so we can determine
- */
- existingStrings = new HashSet<String>();
- nf = NumberFormat.getFormat(getFormat(0, precisionDigits));
-
- Double[] scaledValues = new Double[values.length];
-
- for (int i = 0; i < scaledValues.length; i++) {
- /*
- * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
- * Otherwise, apply standard multi-unit scaling.
- */
- if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
- scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
- } else {
- scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
- }
- }
-
- for (int i = 0; i < results.length; i++) {
- /*
- * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
- * we do this to see how many units we'll have to scale to afterwards (outside this
- * while loop) to make the array of values passed to us unique
- */
- String formatted = nf.format(scaledValues[i]);
-
- /*
- * check whether formatted value was in the set or not; if it was, we have to
- * loop, but only if we're not not already at our maximum precision
- */
- boolean wasNewElement = existingStrings.add(formatted);
-
- if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
- scaleWithMorePrecision = true;
- break;
- }
-
- results[i] = formatted;
- }
- }
-
- /*
- * we did the best we could in terms of trying to find a precision that adds the most
- * uniqueness to the given set of values, NOW tack on the formatted value for the units
- */
- for (int i = 0; i < results.length; i++) {
- results[i] = format(results[i], targetUnits);
- }
-
- return results;
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
- return format(value, targetUnits, bestFit, null, null);
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) {
- if (value == null || Double.isNaN(value)) {
- return NULL_OR_NAN_FORMATTED_VALUE;
- }
- if (bestFit) {
- MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
-
- value = valueAndUnits.getValue();
- targetUnits = valueAndUnits.getUnits();
- }
-
- // apply relative scale at presentation time
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- value = MeasurementUnits.scaleUp(value, targetUnits);
- }
-
- NumberFormat numberFormat =
- NumberFormat.getFormat(
- getFormat(
- minimumFractionDigits != null ? minimumFractionDigits : 1,
- maximumFractionDigits != null ? maximumFractionDigits : 1));
-
- String formatted = numberFormat.format(value);
-
- return format(formatted, targetUnits);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
- throws MeasurementConversionException {
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
-
- MeasurementUnits baseUnits = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
- Double scaledMagnitude = scale(valueAndUnits, targetUnits);
-
- return format(scaledMagnitude, targetUnits, bestFit);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
- return fit(origin, units, null, null);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
- MeasurementUnits highUnits) {
-
- // work-around for the various Chart descendants not properly setting their units field;
- if (null == units) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition, absolutely specified units don't scale to anything
- if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
- || (MeasurementUnits.Family.DURATION == units.getFamily())) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition relative-valued units are self-scaled (converted at formatting)
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // if the magnitude is zero, the best-fit also will spin around forever since it won't change
- if (Math.abs(origin) < 1e-9) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- boolean wasNegative = false;
-
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementNumericValueAndUnits currentValueAndUnits;
- MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
-
- // first, make the value smaller if it's too big
- int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
-
- do {
- currentValueAndUnits = nextValueAndUnits;
-
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
- if (nextOrdinal == maxOrdinal) {
- // we could theoretically get bigger, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
- if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as big as we can get, break out of the loop so we can return
- break;
- }
-
- Double smallerValue = scale(currentValueAndUnits, biggerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
- } while (nextValueAndUnits.getValue() > 1.0);
-
- // next, make the value bigger if it's too small
- int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
-
- while (currentValueAndUnits.getValue() < 1.0) {
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
- if (nextOrdinal == minOrdinal) {
- // we could theoretically get smaller, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
- if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as small as we can get, break out of the loop so we can return
- break;
- }
-
- Double biggerValue = scale(currentValueAndUnits, smallerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
-
- currentValueAndUnits = nextValueAndUnits;
- }
-
- if (wasNegative) {
- return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
- .getUnits());
- }
-
- return currentValueAndUnits;
- }
-
- public static String getFormat(int minDigits, int maxDigits) {
- StringBuilder buf = new StringBuilder("0.");
- for (int i = 0; i < minDigits;i++) {
- buf.append("0");
- }
- for (int i = 0; i < (maxDigits-minDigits);i++) {
- buf.append("#");
- }
- return buf.toString();
- }
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
index ecb0cd8..f32c07b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
@@ -47,6 +47,8 @@ public class MeasurementOOBComposite implements Serializable {
private MeasurementUnits units;
private String parentName;
private Integer parentId;
+ private String formattedOutlier;
+ private String formattedBaseband;
public MeasurementOOBComposite(String resourceName, int resourceId, String scheduleName, int scheduleId,
long timestamp, int definitionId, int factor, double blMin, double blMax, MeasurementUnits units,
@@ -107,6 +109,10 @@ public class MeasurementOOBComposite implements Serializable {
return timestamp;
}
+ public MeasurementUnits getUnits() {
+ return units;
+ }
+
public double getBlMin() {
return blMin;
}
@@ -160,20 +166,21 @@ public class MeasurementOOBComposite implements Serializable {
}
}
- /*
public String getFormattedBaseband() {
- String min = MeasurementConverter.format(blMin, units, true);
- String max = MeasurementConverter.format(blMax, units, true);
-
- String result = min + ", " + max;
+ return formattedBaseband;
+ }
- return result;
+ public void setFormattedBaseband(String formattedBaseband) {
+ this.formattedBaseband = formattedBaseband;
}
public String getFormattedOutlier() {
- return MeasurementConverter.format(outlier, units, true);
+ return formattedOutlier;
+ }
+
+ public void setFormattedOutlier(String formattedOutlier) {
+ this.formattedOutlier = formattedOutlier;
}
- */
@Override
public String toString() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java
deleted file mode 100644
index 443964f..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.server;
-
-import java.text.NumberFormat;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
-public class MeasurementConverter {
- private static final int MAX_PRECISION_DIGITS = 4;
- private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
-
-
- private static NumberFormat getDefaultNumberFormat() {
- NumberFormat nf = NumberFormat.getNumberInstance();
-
- nf.setMinimumFractionDigits(1);
- nf.setMaximumFractionDigits(1);
-
- return nf;
- }
-
- public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- MeasurementUnits originUnits = origin.getUnits();
- Double originValue = origin.getValue();
-
- return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
- }
-
- public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
- boolean wasNegative = false;
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementUnits baseUnit = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
-
- Double results = scale(valueAndUnits, targetUnits);
- if (wasNegative) {
- results = -results;
- }
-
- return results;
- }
-
- public static String format(String value, MeasurementUnits targetUnits) {
- if (targetUnits == null) {
- return value;
- } else {
- return value + targetUnits;
- }
- }
-
- /**
- * Formats the given array of double values: determines the necessary precision such that when formatted, they are
- * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
- * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
- * bounded for presentation considerations.
- *
- * @param values the values to be formatted
- * @param targetUnits the target units for the values
- * @param bestFit whether or not to use a normalized scale for the family of units
- *
- * @return the formatted values
- */
- public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
- if ((null == values) || (values.length == 0)) {
- return null;
- }
-
- MeasurementUnits originalUnits = targetUnits;
-
- /*
- * in the overwhelming majority of cases, you're going to want to apply a bestFit
- * to the passed data, but it's not required; it's perfectly possible to allow a
- * list of doubles to be formatted without being fit, in which case the targetUnits
- * will be part of the formatted display for each result element
- */
- if (bestFit) {
- // find bestFit units by taking the average
- Double average = 0.0;
-
- for (int i = 0, sz = values.length; i < sz; i++) {
- /*
- * adding fractional amount iterative leads to greater
- * error, but prevents overflow on large data sets
- */
- average += (values[i] / sz);
- }
-
- MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
- //noinspection UnnecessaryLocalVariable
- MeasurementUnits fittedUnits = fittedAverage.getUnits();
-
- /*
- * and change the local reference to targetUnits, so that the same logic
- * can be used both for the bestFit and non-bestFit computations
- */
- targetUnits = fittedUnits;
- }
-
- @SuppressWarnings("unused")
- Set<String> existingStrings; // technically this *is* unused because
- int precisionDigits = 0;
- boolean scaleWithMorePrecision = true;
- String[] results = new String[values.length];
- NumberFormat nf = getDefaultNumberFormat();
-
- /*
- * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
- *
- * increase the maxPrecisionDigits in the while condition
- * itself to ensure it gets done for every loop
- */
- while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
- /*
- * make the assumption that we no longer need to scale beyond this iteration
- */
- scaleWithMorePrecision = false;
-
- /*
- * we need to record the uniquely formatted values so we can determine
- */
- existingStrings = new HashSet<String>();
- nf.setMinimumFractionDigits(0);
- nf.setMaximumFractionDigits(precisionDigits);
-
- Double[] scaledValues = new Double[values.length];
-
- for (int i = 0; i < scaledValues.length; i++) {
- /*
- * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
- * Otherwise, apply standard multi-unit scaling.
- */
- if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
- scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
- } else {
- scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
- }
- }
-
- for (int i = 0; i < results.length; i++) {
- /*
- * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
- * we do this to see how many units we'll have to scale to afterwards (outside this
- * while loop) to make the array of values passed to us unique
- */
- String formatted = nf.format(scaledValues[i]);
-
- /*
- * check whether formatted value was in the set or not; if it was, we have to
- * loop, but only if we're not not already at our maximum precision
- */
- boolean wasNewElement = existingStrings.add(formatted);
-
- if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
- scaleWithMorePrecision = true;
- break;
- }
-
- results[i] = formatted;
- }
- }
-
- /*
- * we did the best we could in terms of trying to find a precision that adds the most
- * uniqueness to the given set of values, NOW tack on the formatted value for the units
- */
- for (int i = 0; i < results.length; i++) {
- results[i] = format(results[i], targetUnits);
- }
-
- return results;
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
- return format(value, targetUnits, bestFit, null, null);
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) {
- if (value == null || Double.isNaN(value)) {
- return NULL_OR_NAN_FORMATTED_VALUE;
- }
- if (bestFit) {
- MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
-
- value = valueAndUnits.getValue();
- targetUnits = valueAndUnits.getUnits();
- }
-
- // apply relative scale at presentation time
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- value = MeasurementUnits.scaleUp(value, targetUnits);
- }
-
- NumberFormat numberFormat = getDefaultNumberFormat();
- if (null != minimumFractionDigits) {
- numberFormat.setMinimumFractionDigits(minimumFractionDigits);
- }
- if (null != maximumFractionDigits) {
- numberFormat.setMaximumFractionDigits(maximumFractionDigits);
- }
- String formatted = numberFormat.format(value);
-
- return format(formatted, targetUnits);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
- throws MeasurementConversionException {
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
-
- MeasurementUnits baseUnits = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
- Double scaledMagnitude = scale(valueAndUnits, targetUnits);
-
- return format(scaledMagnitude, targetUnits, bestFit);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
- return fit(origin, units, null, null);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
- MeasurementUnits highUnits) {
-
- // work-around for the various Chart descendants not properly setting their units field;
- if (null == units) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition, absolutely specified units don't scale to anything
- if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
- || (MeasurementUnits.Family.DURATION == units.getFamily())) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition relative-valued units are self-scaled (converted at formatting)
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // if the magnitude is zero, the best-fit also will spin around forever since it won't change
- if (Math.abs(origin) < 1e-9) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- boolean wasNegative = false;
-
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementNumericValueAndUnits currentValueAndUnits;
- MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
-
- // first, make the value smaller if it's too big
- int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
-
- do {
- currentValueAndUnits = nextValueAndUnits;
-
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
- if (nextOrdinal == maxOrdinal) {
- // we could theoretically get bigger, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
- if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as big as we can get, break out of the loop so we can return
- break;
- }
-
- Double smallerValue = scale(currentValueAndUnits, biggerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
- } while (nextValueAndUnits.getValue() > 1.0);
-
- // next, make the value bigger if it's too small
- int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
-
- while (currentValueAndUnits.getValue() < 1.0) {
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
- if (nextOrdinal == minOrdinal) {
- // we could theoretically get smaller, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
- if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as small as we can get, break out of the loop so we can return
- break;
- }
-
- Double biggerValue = scale(currentValueAndUnits, smallerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
-
- currentValueAndUnits = nextValueAndUnits;
- }
-
- if (wasNegative) {
- return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
- .getUnits());
- }
-
- return currentValueAndUnits;
- }
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
deleted file mode 100644
index 42cd8f3..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.core.server;
-
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Greg Hinkle
- */
-public class MeasurementParser {
-
- private static final String NUMBER_OPTIONAL_UNIT_PATTERN_STRING = "([\\+\\-]?" + // number sign is optional but valid
- "[0-9\\.\\,]{1,})" + // followed by at least one magnitude identifier, capture number plus sign
- "([\\%a-z]*)"; // followed by an optional units identifier, capture entire suffix
- private static final Pattern NUMBER_OPTIONAL_UNIT_PATTERN;
- static {
- NUMBER_OPTIONAL_UNIT_PATTERN = Pattern.compile(NUMBER_OPTIONAL_UNIT_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
- }
-
- public static MeasurementNumericValueAndUnits parse(String input, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- input = input.replaceAll("\\s", ""); // our pattern assumes no whitespace
- Matcher matcher = NUMBER_OPTIONAL_UNIT_PATTERN.matcher(input);
-
- if (!matcher.matches()) {
- throw new MeasurementConversionException("The passed input '" + input + "' could not be parsed correctly "
- + "by the regular expression " + NUMBER_OPTIONAL_UNIT_PATTERN_STRING);
- }
-
- String magnitude = matcher.group(1);
- String units = matcher.group(2);
-
- MeasurementUnits fromUnits;
- if (units.equals("")) {
- /*
- * no units is valid, and we assume the passed targetUnits; however, we will
- * still need to check that the number is well-formed, so continue processing.
- */
- fromUnits = targetUnits;
- } else {
- fromUnits = MeasurementUnits.getUsingDisplayUnits(units, targetUnits.getFamily());
-
- if ((fromUnits == null) || (!fromUnits.isComparableTo(targetUnits))) {
- throw new MeasurementConversionException("The units in '" + input + "' were not valid, " + "expected '"
- + targetUnits.getFamily() + "' units, received '" + units + "' units");
- }
- }
-
- try {
- if (magnitude.startsWith("+")) {
- magnitude = magnitude.substring(1);
- }
-
- Number convertedMagnitude = DecimalFormat.getInstance().parse(magnitude);
- Double scaledMagnitude;
-
- // apply relative scale if applicable, otherwise perform standard scaling
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- scaledMagnitude = MeasurementUnits.scaleDown(convertedMagnitude.doubleValue(), targetUnits);
- } else {
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(convertedMagnitude
- .doubleValue(), fromUnits);
- scaledMagnitude = MeasurementConverter.scale(valueAndUnits, targetUnits);
- }
-
- return new MeasurementNumericValueAndUnits(scaledMagnitude, targetUnits);
- } catch (ParseException pe) {
- throw new MeasurementConversionException("The magnitude in '" + input + "' did not parse correctly "
- + "as a valid, localized, stringified number ");
- }
-
- }
-
- public static MeasurementNumericValueAndUnits parse(String input, MeasurementSchedule targetSchedule)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return parse(input, targetUnits);
- }
-}
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
deleted file mode 100644
index 0688c79..0000000
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.domain.util.units.test;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.testng.annotations.Test;
-
-import org.rhq.core.domain.measurement.MeasurementConverterClient;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-import org.rhq.core.domain.test.AbstractEJB3Test;
-import org.rhq.core.server.MeasurementParser;
-
-// TODO two tests in here need to be re-enables once the GWT client issues are resolved
-@Test
-public class MeasurementConverterTest extends AbstractEJB3Test {
- private final double POSITIVE = 300;
- private final double NEGATIVE = -42;
-
- private final String[] WHITESPACE = new String[] { " ", "\f", "\n", "\r", "\t" };
-
- private ThreadLocal<Integer> precisionScalingTestCount = null;
-
- private void incrementPrecisionScalingTestCount() {
- if (precisionScalingTestCount == null) {
- precisionScalingTestCount = new ThreadLocal<Integer>() {
- @Override
- protected Integer initialValue() {
- return 0;
- }
- };
- }
- precisionScalingTestCount.set(precisionScalingTestCount.get() + 1);
- }
-
- @Test(groups = "integration.ejb3", enabled = false)
- // TODO fix me
- public void testPrecisionScaling() throws Exception {
-
- // if all values are equal, it will format to the max precision
-
- testPrecisionScaling(new double[] { 1.41, 1.41, 1.41, 1.41, 1.41 }, MeasurementUnits.NONE, new String[] {
- "1.41", "1.41", "1.41", "1.41", "1.41" }, MeasurementUnits.NONE);
-
- // if all values are unique, it won't need to format any of them to more digits
- testPrecisionScaling(new double[] { 1.41, 1.42, 1.43, 1.44, 1.45 }, MeasurementUnits.NONE, new String[] {
- "1.41", "1.42", "1.43", "1.44", "1.45" }, MeasurementUnits.NONE);
-
- // even if only two are equal, it will scale all the way to max precision looking for uniqueness
- testPrecisionScaling(new double[] { 1.4, 1.4, 1.5, 1.6, 1.7 }, MeasurementUnits.NONE, new String[] { "1.4",
- "1.4", "1.5", "1.6", "1.7" }, MeasurementUnits.NONE);
-
- // to final a "good looking" target scaling units, it will use the mathematical mean
- // NOTE: formatting doesn't round up/down, thus introducing error from cutting digits (256 -> 0.2KB [instead of 0.25KB])
- testPrecisionScaling(new double[] { 128, 256, 512, 1024, 8192 }, MeasurementUnits.BYTES, new String[] {
- "0.1KB", "0.2KB", "0.5KB", "1KB", "8KB" }, MeasurementUnits.KILOBYTES);
-
- // same test with negative numbers
- testPrecisionScaling(new double[] { -128, -256, -512, -1024, -8192 }, MeasurementUnits.BYTES, new String[] {
- "-0.1KB", "-0.2KB", "-0.5KB", "-1KB", "-8KB" }, MeasurementUnits.KILOBYTES);
-
- // test self scaling relative units
- testPrecisionScaling(new double[] { 0.0, 0.065, 1.0, 0.123456 }, MeasurementUnits.PERCENTAGE, new String[] {
- "0%", "6.5%", "100%", "12.3%" }, MeasurementUnits.PERCENTAGE);
-
- // test self scaling relative units
- testPrecisionScaling(new double[] { 0.0621, 0.065, 0.0620, 0.6202 }, MeasurementUnits.PERCENTAGE, new String[] {
- "6.21%", "6.5%", "6.2%", "62.02%" }, MeasurementUnits.PERCENTAGE);
- }
-
- private void testPrecisionScaling(double[] values, MeasurementUnits units, String[] expectedResults,
- MeasurementUnits expectedUnits) {
- incrementPrecisionScalingTestCount();
-
- String[] results = MeasurementConverterClient.formatToSignificantPrecision(values, units, true);
- for (int i = 0; i < results.length; i++) {
- String expected = expectedResults[i];
- String actual = results[i];
-
- // The expected output is in Locale.US. Handle running the tests in a different default locale
- if (expected.contains(".") && (!Locale.getDefault().equals(Locale.US))) {
- Locale defaultLocale = Locale.getDefault();
- Locale.setDefault(Locale.US);
- MeasurementNumericValueAndUnits vu = MeasurementParser.parse(expected, expectedUnits);
- Locale.setDefault(defaultLocale);
- expected = MeasurementConverterClient.format(vu.getValue(), expectedUnits, false, null, 4);
- }
-
- assert actual.equals(expected) : "Test " + precisionScalingTestCount.get() + ": " + "Index " + i + ", "
- + "Expected " + expected + ", " + "Received " + actual + ", " + "Units " + units.getName();
- }
- }
-
- @Test(groups = "integration.ejb3", enabled = false)
- // TODO fix me
- public void testConversionSuccess() throws Exception {
- // test the straight-forward, non-whitespace cases
- for (MeasurementUnits units : MeasurementUnits.values()) {
- validateFormatConvert(POSITIVE, units);
- validateFormatConvert(NEGATIVE, units);
- }
-
- List<String> signVariations;
- List<String> magnitudeVariations;
- List<String> unitsVariations;
-
- // use the same NumberFormat that the MeasurementConverter uses, so that we get the correct expected results
- NumberFormat nf = DecimalFormat.getNumberInstance();
- nf.setMinimumFractionDigits(1);
- nf.setMaximumFractionDigits(1);
-
- // test a couple hundred thousand variations of whitespace around each positive number with units
- signVariations = getWhitespaceVariationsAroundSingleTokens("", "+");
- magnitudeVariations = getWhitespaceVariationsAroundSingleTokens(nf.format(POSITIVE));
- for (MeasurementUnits units : MeasurementUnits.values()) {
- unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
-
- // splice all combinations together and test conversion validity
- for (String signVariation : signVariations) {
- for (String magnitudeVariation : magnitudeVariations) {
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- magnitudeVariation = nf.format(MeasurementUnits.scaleUp(nf.parse(magnitudeVariation.trim())
- .doubleValue(), units));
- }
-
- for (String unitVariation : unitsVariations) {
- String original = MeasurementConverterClient.format(POSITIVE, units, false);
- String toBeTested = magnitudeVariation.trim() + unitVariation.trim();
-
- assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
- + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
-
- validateConvert(POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
- }
- }
- }
- }
-
- // test a couple hundred thousand variations of whitespace around each negative number with units
- signVariations = getWhitespaceVariationsAroundSingleTokens("-");
- for (MeasurementUnits units : MeasurementUnits.values()) {
- unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
-
- for (String signVariation : signVariations) {
- for (String magnitudeVariation : magnitudeVariations) {
- if (units == MeasurementUnits.PERCENTAGE) {
- magnitudeVariation = nf.format(100 * nf.parse(magnitudeVariation.trim()).doubleValue());
- }
-
- for (String unitVariation : unitsVariations) {
- String original = MeasurementConverterClient.format(-POSITIVE, units, false);
- String toBeTested = "-" + magnitudeVariation.trim() + unitVariation.trim();
-
- assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
- + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
-
- validateConvert(-POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
- }
- }
- }
- }
- }
-
- @Test(groups = "integration.ejb3")
- public void testScalingSuccess() throws Exception {
- // Family.BYTES
- validateScaleAndInverse(1024.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.KILOBYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.MEGABYTES);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.GIGABYTES);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.MEGABYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.GIGABYTES);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.GIGABYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.TERABYTES, 1.0, MeasurementUnits.PETABYTES);
-
- // Family.BITS
- validateScaleAndInverse(1024.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.KILOBITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.MEGABITS);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.GIGABITS);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.MEGABITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.GIGABITS);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.GIGABITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.TERABITS, 1.0, MeasurementUnits.PETABITS);
-
- // Family.DURATION
- validateScaleAndInverse(1000.0, MeasurementUnits.EPOCH_MILLISECONDS, 1.0, MeasurementUnits.EPOCH_SECONDS);
-
- // Family.TIME
- validateScaleAndInverse(1000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.SECONDS);
- validateScaleAndInverse(60000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.MINUTES);
- validateScaleAndInverse(3600000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.HOURS);
- validateScaleAndInverse(86400000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.DAYS);
-
- validateScaleAndInverse(60.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.MINUTES);
- validateScaleAndInverse(3600.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.HOURS);
- validateScaleAndInverse(86400.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.DAYS);
-
- validateScaleAndInverse(60.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.HOURS);
- validateScaleAndInverse(1440.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.DAYS);
-
- validateScaleAndInverse(24.0, MeasurementUnits.HOURS, 1.0, MeasurementUnits.DAYS);
- }
-
- private void validateScaleAndInverse(double fromValue, MeasurementUnits fromUnits, double toValue,
- MeasurementUnits toUnits) {
- validateScale(fromValue, fromUnits, toValue, toUnits);
- validateScale(toValue, toUnits, fromValue, fromUnits);
- }
-
- private void validateScale(double fromValue, MeasurementUnits fromUnits, double toValue, MeasurementUnits toUnits) {
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(fromValue, fromUnits);
- try {
- double derived = MeasurementConverterClient.scale(valueAndUnits, toUnits);
- assert Math.abs(toValue - derived) < 1e-9 : "Scale conversion error: " +
-
- "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
- + fromUnits + "', " +
-
- "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
- + toUnits + "', " +
-
- "Received value '" + derived + "'";
-
- } catch (MeasurementConversionException mce) {
- assert false : "Unexpected MeasurementConversionException: " +
-
- "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
- + fromUnits + "', " +
-
- "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
- + toUnits;
- }
- }
-
- private void validateFormatConvert(double value, MeasurementUnits units) {
- validateFormatConvert(value, value, units);
- }
-
- private void validateFormatConvert(double passedValue, double expectedValue, MeasurementUnits units) {
- try {
- String intermediate = MeasurementConverterClient.format(passedValue, units, false);
- MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
-
- assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
- + passedValue
- + "', "
- + "units input was '"
- + units.name()
- + "', "
- +
-
- "intermediate string was '"
- + intermediate
- + "', "
- +
-
- "Expected value '"
- + expectedValue
- + "', "
- + "with units of '"
- + units.name()
- + "', "
- + "displayed as '"
- + units
- + "', "
- +
-
- "Received value '"
- + results.getValue()
- + "', "
- + "with units of '"
- + results.getUnits().getName()
- + "', " + "displayed as '" + results.getUnits() + "'";
- } catch (MeasurementConversionException mce) {
- assert false : "Error during conversion: " + mce.getMessage();
- }
- }
-
- private void validateConvert(double value, String intermediate, MeasurementUnits units) {
- validateConvert(value, value, intermediate, units);
- }
-
- private void validateConvert(double passedValue, double expectedValue, String intermediate, MeasurementUnits units) {
- try {
- MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
-
- assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
- + passedValue
- + "', "
- + "units input was '"
- + units.name()
- + "', "
- +
-
- "intermediate string was '"
- + intermediate
- + "', "
- +
-
- "Expected value '"
- + expectedValue
- + "', "
- + "with units of '"
- + units.name()
- + "', "
- + "displayed as '"
- + units
- + "', "
- +
-
- "Received value '"
- + results.getValue()
- + "', "
- + "with units of '"
- + results.getUnits().getName()
- + "', " + "displayed as '" + results.getUnits() + "'";
- } catch (MeasurementConversionException mce) {
- assert false : "Error during conversion: " + mce.getMessage();
- }
- }
-
- private List<String> getWhitespaceVariationsAroundSingleTokens(String... tokens) {
- List<String> variations = new ArrayList<String>();
-
- for (String token : tokens) {
- for (String white : WHITESPACE) {
- variations.add(token);
- //variations.add( token + white );
- //variations.add( white + token );
- //variations.add( white + token + white );
-
- variations.add(token + white + white);
- //variations.add( white + white + token );
- //variations.add( white + white + token + white + white );
- }
- }
-
- return variations;
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
new file mode 100644
index 0000000..f78b62c
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
@@ -0,0 +1,360 @@
+ /*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ package org.rhq.core.domain.measurement;
+
+ import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+ import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+ import com.google.gwt.i18n.client.NumberFormat;
+
+ import java.util.HashSet;
+ import java.util.Set;
+
+ public class MeasurementConverterClient {
+ private static final int MAX_PRECISION_DIGITS = 4;
+ private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
+
+
+ private static NumberFormat getDefaultNumberFormat() {
+ NumberFormat nf = NumberFormat.getFormat("0.0");
+
+ return nf;
+ }
+
+ public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ MeasurementUnits originUnits = origin.getUnits();
+ Double originValue = origin.getValue();
+
+ return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
+ }
+
+ public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
+ boolean wasNegative = false;
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementUnits baseUnit = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
+
+ Double results = scale(valueAndUnits, targetUnits);
+ if (wasNegative) {
+ results = -results;
+ }
+
+ return results;
+ }
+
+ public static String format(String value, MeasurementUnits targetUnits) {
+ if (targetUnits == null) {
+ return value;
+ } else {
+ return value + targetUnits;
+ }
+ }
+
+ /**
+ * Formats the given array of double values: determines the necessary precision such that when formatted, they are
+ * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
+ * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
+ * bounded for presentation considerations.
+ *
+ * @param values the values to be formatted
+ * @param targetUnits the target units for the values
+ * @param bestFit whether or not to use a normalized scale for the family of units
+ *
+ * @return the formatted values
+ */
+ public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
+ if ((null == values) || (values.length == 0)) {
+ return null;
+ }
+
+ MeasurementUnits originalUnits = targetUnits;
+
+ /*
+ * in the overwhelming majority of cases, you're going to want to apply a bestFit
+ * to the passed data, but it's not required; it's perfectly possible to allow a
+ * list of doubles to be formatted without being fit, in which case the targetUnits
+ * will be part of the formatted display for each result element
+ */
+ if (bestFit) {
+ // find bestFit units by taking the average
+ Double average = 0.0;
+
+ for (int i = 0, sz = values.length; i < sz; i++) {
+ /*
+ * adding fractional amount iterative leads to greater
+ * error, but prevents overflow on large data sets
+ */
+ average += (values[i] / sz);
+ }
+
+ MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
+ //noinspection UnnecessaryLocalVariable
+ MeasurementUnits fittedUnits = fittedAverage.getUnits();
+
+ /*
+ * and change the local reference to targetUnits, so that the same logic
+ * can be used both for the bestFit and non-bestFit computations
+ */
+ targetUnits = fittedUnits;
+ }
+
+ @SuppressWarnings("unused")
+ Set<String> existingStrings; // technically this *is* unused because
+ int precisionDigits = 0;
+ boolean scaleWithMorePrecision = true;
+ String[] results = new String[values.length];
+ NumberFormat nf = getDefaultNumberFormat();
+
+ /*
+ * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
+ *
+ * increase the maxPrecisionDigits in the while condition
+ * itself to ensure it gets done for every loop
+ */
+ while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
+ /*
+ * make the assumption that we no longer need to scale beyond this iteration
+ */
+ scaleWithMorePrecision = false;
+
+ /*
+ * we need to record the uniquely formatted values so we can determine
+ */
+ existingStrings = new HashSet<String>();
+ nf = NumberFormat.getFormat(getFormat(0, precisionDigits));
+
+ Double[] scaledValues = new Double[values.length];
+
+ for (int i = 0; i < scaledValues.length; i++) {
+ /*
+ * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
+ * Otherwise, apply standard multi-unit scaling.
+ */
+ if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
+ scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
+ } else {
+ scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
+ }
+ }
+
+ for (int i = 0; i < results.length; i++) {
+ /*
+ * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
+ * we do this to see how many units we'll have to scale to afterwards (outside this
+ * while loop) to make the array of values passed to us unique
+ */
+ String formatted = nf.format(scaledValues[i]);
+
+ /*
+ * check whether formatted value was in the set or not; if it was, we have to
+ * loop, but only if we're not not already at our maximum precision
+ */
+ boolean wasNewElement = existingStrings.add(formatted);
+
+ if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
+ scaleWithMorePrecision = true;
+ break;
+ }
+
+ results[i] = formatted;
+ }
+ }
+
+ /*
+ * we did the best we could in terms of trying to find a precision that adds the most
+ * uniqueness to the given set of values, NOW tack on the formatted value for the units
+ */
+ for (int i = 0; i < results.length; i++) {
+ results[i] = format(results[i], targetUnits);
+ }
+
+ return results;
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
+ return format(value, targetUnits, bestFit, null, null);
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) {
+ if (value == null || Double.isNaN(value)) {
+ return NULL_OR_NAN_FORMATTED_VALUE;
+ }
+ if (bestFit) {
+ MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
+
+ value = valueAndUnits.getValue();
+ targetUnits = valueAndUnits.getUnits();
+ }
+
+ // apply relative scale at presentation time
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ value = MeasurementUnits.scaleUp(value, targetUnits);
+ }
+
+ NumberFormat numberFormat =
+ NumberFormat.getFormat(
+ getFormat(
+ minimumFractionDigits != null ? minimumFractionDigits : 1,
+ maximumFractionDigits != null ? maximumFractionDigits : 1));
+
+ String formatted = numberFormat.format(value);
+
+ return format(formatted, targetUnits);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
+ throws MeasurementConversionException {
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
+
+ MeasurementUnits baseUnits = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
+ Double scaledMagnitude = scale(valueAndUnits, targetUnits);
+
+ return format(scaledMagnitude, targetUnits, bestFit);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
+ return fit(origin, units, null, null);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
+ MeasurementUnits highUnits) {
+
+ // work-around for the various Chart descendants not properly setting their units field;
+ if (null == units) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition, absolutely specified units don't scale to anything
+ if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
+ || (MeasurementUnits.Family.DURATION == units.getFamily())) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition relative-valued units are self-scaled (converted at formatting)
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // if the magnitude is zero, the best-fit also will spin around forever since it won't change
+ if (Math.abs(origin) < 1e-9) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ boolean wasNegative = false;
+
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementNumericValueAndUnits currentValueAndUnits;
+ MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
+
+ // first, make the value smaller if it's too big
+ int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
+
+ do {
+ currentValueAndUnits = nextValueAndUnits;
+
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
+ if (nextOrdinal == maxOrdinal) {
+ // we could theoretically get bigger, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as big as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double smallerValue = scale(currentValueAndUnits, biggerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
+ } while (nextValueAndUnits.getValue() > 1.0);
+
+ // next, make the value bigger if it's too small
+ int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
+
+ while (currentValueAndUnits.getValue() < 1.0) {
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
+ if (nextOrdinal == minOrdinal) {
+ // we could theoretically get smaller, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as small as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double biggerValue = scale(currentValueAndUnits, smallerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
+
+ currentValueAndUnits = nextValueAndUnits;
+ }
+
+ if (wasNegative) {
+ return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
+ .getUnits());
+ }
+
+ return currentValueAndUnits;
+ }
+
+ public static String getFormat(int minDigits, int maxDigits) {
+ StringBuilder buf = new StringBuilder("0.");
+ for (int i = 0; i < minDigits;i++) {
+ buf.append("0");
+ }
+ for (int i = 0; i < (maxDigits-minDigits);i++) {
+ buf.append("#");
+ }
+ return buf.toString();
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java
new file mode 100644
index 0000000..443964f
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java
@@ -0,0 +1,355 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.server;
+
+import java.text.NumberFormat;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+public class MeasurementConverter {
+ private static final int MAX_PRECISION_DIGITS = 4;
+ private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
+
+
+ private static NumberFormat getDefaultNumberFormat() {
+ NumberFormat nf = NumberFormat.getNumberInstance();
+
+ nf.setMinimumFractionDigits(1);
+ nf.setMaximumFractionDigits(1);
+
+ return nf;
+ }
+
+ public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ MeasurementUnits originUnits = origin.getUnits();
+ Double originValue = origin.getValue();
+
+ return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
+ }
+
+ public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
+ boolean wasNegative = false;
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementUnits baseUnit = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
+
+ Double results = scale(valueAndUnits, targetUnits);
+ if (wasNegative) {
+ results = -results;
+ }
+
+ return results;
+ }
+
+ public static String format(String value, MeasurementUnits targetUnits) {
+ if (targetUnits == null) {
+ return value;
+ } else {
+ return value + targetUnits;
+ }
+ }
+
+ /**
+ * Formats the given array of double values: determines the necessary precision such that when formatted, they are
+ * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
+ * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
+ * bounded for presentation considerations.
+ *
+ * @param values the values to be formatted
+ * @param targetUnits the target units for the values
+ * @param bestFit whether or not to use a normalized scale for the family of units
+ *
+ * @return the formatted values
+ */
+ public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
+ if ((null == values) || (values.length == 0)) {
+ return null;
+ }
+
+ MeasurementUnits originalUnits = targetUnits;
+
+ /*
+ * in the overwhelming majority of cases, you're going to want to apply a bestFit
+ * to the passed data, but it's not required; it's perfectly possible to allow a
+ * list of doubles to be formatted without being fit, in which case the targetUnits
+ * will be part of the formatted display for each result element
+ */
+ if (bestFit) {
+ // find bestFit units by taking the average
+ Double average = 0.0;
+
+ for (int i = 0, sz = values.length; i < sz; i++) {
+ /*
+ * adding fractional amount iterative leads to greater
+ * error, but prevents overflow on large data sets
+ */
+ average += (values[i] / sz);
+ }
+
+ MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
+ //noinspection UnnecessaryLocalVariable
+ MeasurementUnits fittedUnits = fittedAverage.getUnits();
+
+ /*
+ * and change the local reference to targetUnits, so that the same logic
+ * can be used both for the bestFit and non-bestFit computations
+ */
+ targetUnits = fittedUnits;
+ }
+
+ @SuppressWarnings("unused")
+ Set<String> existingStrings; // technically this *is* unused because
+ int precisionDigits = 0;
+ boolean scaleWithMorePrecision = true;
+ String[] results = new String[values.length];
+ NumberFormat nf = getDefaultNumberFormat();
+
+ /*
+ * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
+ *
+ * increase the maxPrecisionDigits in the while condition
+ * itself to ensure it gets done for every loop
+ */
+ while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
+ /*
+ * make the assumption that we no longer need to scale beyond this iteration
+ */
+ scaleWithMorePrecision = false;
+
+ /*
+ * we need to record the uniquely formatted values so we can determine
+ */
+ existingStrings = new HashSet<String>();
+ nf.setMinimumFractionDigits(0);
+ nf.setMaximumFractionDigits(precisionDigits);
+
+ Double[] scaledValues = new Double[values.length];
+
+ for (int i = 0; i < scaledValues.length; i++) {
+ /*
+ * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
+ * Otherwise, apply standard multi-unit scaling.
+ */
+ if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
+ scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
+ } else {
+ scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
+ }
+ }
+
+ for (int i = 0; i < results.length; i++) {
+ /*
+ * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
+ * we do this to see how many units we'll have to scale to afterwards (outside this
+ * while loop) to make the array of values passed to us unique
+ */
+ String formatted = nf.format(scaledValues[i]);
+
+ /*
+ * check whether formatted value was in the set or not; if it was, we have to
+ * loop, but only if we're not not already at our maximum precision
+ */
+ boolean wasNewElement = existingStrings.add(formatted);
+
+ if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
+ scaleWithMorePrecision = true;
+ break;
+ }
+
+ results[i] = formatted;
+ }
+ }
+
+ /*
+ * we did the best we could in terms of trying to find a precision that adds the most
+ * uniqueness to the given set of values, NOW tack on the formatted value for the units
+ */
+ for (int i = 0; i < results.length; i++) {
+ results[i] = format(results[i], targetUnits);
+ }
+
+ return results;
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
+ return format(value, targetUnits, bestFit, null, null);
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) {
+ if (value == null || Double.isNaN(value)) {
+ return NULL_OR_NAN_FORMATTED_VALUE;
+ }
+ if (bestFit) {
+ MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
+
+ value = valueAndUnits.getValue();
+ targetUnits = valueAndUnits.getUnits();
+ }
+
+ // apply relative scale at presentation time
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ value = MeasurementUnits.scaleUp(value, targetUnits);
+ }
+
+ NumberFormat numberFormat = getDefaultNumberFormat();
+ if (null != minimumFractionDigits) {
+ numberFormat.setMinimumFractionDigits(minimumFractionDigits);
+ }
+ if (null != maximumFractionDigits) {
+ numberFormat.setMaximumFractionDigits(maximumFractionDigits);
+ }
+ String formatted = numberFormat.format(value);
+
+ return format(formatted, targetUnits);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
+ throws MeasurementConversionException {
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
+
+ MeasurementUnits baseUnits = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
+ Double scaledMagnitude = scale(valueAndUnits, targetUnits);
+
+ return format(scaledMagnitude, targetUnits, bestFit);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
+ return fit(origin, units, null, null);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
+ MeasurementUnits highUnits) {
+
+ // work-around for the various Chart descendants not properly setting their units field;
+ if (null == units) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition, absolutely specified units don't scale to anything
+ if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
+ || (MeasurementUnits.Family.DURATION == units.getFamily())) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition relative-valued units are self-scaled (converted at formatting)
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // if the magnitude is zero, the best-fit also will spin around forever since it won't change
+ if (Math.abs(origin) < 1e-9) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ boolean wasNegative = false;
+
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementNumericValueAndUnits currentValueAndUnits;
+ MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
+
+ // first, make the value smaller if it's too big
+ int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
+
+ do {
+ currentValueAndUnits = nextValueAndUnits;
+
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
+ if (nextOrdinal == maxOrdinal) {
+ // we could theoretically get bigger, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as big as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double smallerValue = scale(currentValueAndUnits, biggerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
+ } while (nextValueAndUnits.getValue() > 1.0);
+
+ // next, make the value bigger if it's too small
+ int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
+
+ while (currentValueAndUnits.getValue() < 1.0) {
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
+ if (nextOrdinal == minOrdinal) {
+ // we could theoretically get smaller, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as small as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double biggerValue = scale(currentValueAndUnits, smallerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
+
+ currentValueAndUnits = nextValueAndUnits;
+ }
+
+ if (wasNegative) {
+ return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
+ .getUnits());
+ }
+
+ return currentValueAndUnits;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java
new file mode 100644
index 0000000..42cd8f3
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.server;
+
+import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Greg Hinkle
+ */
+public class MeasurementParser {
+
+ private static final String NUMBER_OPTIONAL_UNIT_PATTERN_STRING = "([\\+\\-]?" + // number sign is optional but valid
+ "[0-9\\.\\,]{1,})" + // followed by at least one magnitude identifier, capture number plus sign
+ "([\\%a-z]*)"; // followed by an optional units identifier, capture entire suffix
+ private static final Pattern NUMBER_OPTIONAL_UNIT_PATTERN;
+ static {
+ NUMBER_OPTIONAL_UNIT_PATTERN = Pattern.compile(NUMBER_OPTIONAL_UNIT_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
+ }
+
+ public static MeasurementNumericValueAndUnits parse(String input, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ input = input.replaceAll("\\s", ""); // our pattern assumes no whitespace
+ Matcher matcher = NUMBER_OPTIONAL_UNIT_PATTERN.matcher(input);
+
+ if (!matcher.matches()) {
+ throw new MeasurementConversionException("The passed input '" + input + "' could not be parsed correctly "
+ + "by the regular expression " + NUMBER_OPTIONAL_UNIT_PATTERN_STRING);
+ }
+
+ String magnitude = matcher.group(1);
+ String units = matcher.group(2);
+
+ MeasurementUnits fromUnits;
+ if (units.equals("")) {
+ /*
+ * no units is valid, and we assume the passed targetUnits; however, we will
+ * still need to check that the number is well-formed, so continue processing.
+ */
+ fromUnits = targetUnits;
+ } else {
+ fromUnits = MeasurementUnits.getUsingDisplayUnits(units, targetUnits.getFamily());
+
+ if ((fromUnits == null) || (!fromUnits.isComparableTo(targetUnits))) {
+ throw new MeasurementConversionException("The units in '" + input + "' were not valid, " + "expected '"
+ + targetUnits.getFamily() + "' units, received '" + units + "' units");
+ }
+ }
+
+ try {
+ if (magnitude.startsWith("+")) {
+ magnitude = magnitude.substring(1);
+ }
+
+ Number convertedMagnitude = DecimalFormat.getInstance().parse(magnitude);
+ Double scaledMagnitude;
+
+ // apply relative scale if applicable, otherwise perform standard scaling
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ scaledMagnitude = MeasurementUnits.scaleDown(convertedMagnitude.doubleValue(), targetUnits);
+ } else {
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(convertedMagnitude
+ .doubleValue(), fromUnits);
+ scaledMagnitude = MeasurementConverter.scale(valueAndUnits, targetUnits);
+ }
+
+ return new MeasurementNumericValueAndUnits(scaledMagnitude, targetUnits);
+ } catch (ParseException pe) {
+ throw new MeasurementConversionException("The magnitude in '" + input + "' did not parse correctly "
+ + "as a valid, localized, stringified number ");
+ }
+
+ }
+
+ public static MeasurementNumericValueAndUnits parse(String input, MeasurementSchedule targetSchedule)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return parse(input, targetUnits);
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
index c7e4ce4..0d68094 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
@@ -54,6 +54,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.server.PersistenceUtility;
import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.enterprise.server.RHQConstants;
@@ -318,6 +319,8 @@ public class MeasurementOOBManagerBean implements MeasurementOOBManagerLocal {
}
+ applyFormatting(results);
+
return new PageList<MeasurementOOBComposite>(results, (int) totalCount, pc);
}
@@ -370,10 +373,25 @@ public class MeasurementOOBManagerBean implements MeasurementOOBManagerLocal {
long totalCount = (Long) countQuery.getSingleResult();
PageList<MeasurementOOBComposite> result = new PageList<MeasurementOOBComposite>(results, (int) totalCount, pc);
+ applyFormatting(result);
+
return result;
}
+ private void applyFormatting(List<MeasurementOOBComposite> composites) {
+ for (MeasurementOOBComposite oob : composites) {
+ oob.setFormattedOutlier(MeasurementConverter.format(oob.getOutlier(), oob.getUnits(), true));
+ formatBaseband(oob);
+ }
+ }
+
+ private void formatBaseband(MeasurementOOBComposite oob) {
+ String min = MeasurementConverter.format(oob.getBlMin(), oob.getUnits(), true);
+ String max = MeasurementConverter.format(oob.getBlMax(), oob.getUnits(), true);
+ oob.setFormattedBaseband(min + ", " + max);
+ }
+
/**
* Return the 1h numeric data for the passed primary keys (schedule, timestamp)
* @param pks Primary keys to look up
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
new file mode 100644
index 0000000..0688c79
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
@@ -0,0 +1,390 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.domain.util.units.test;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.measurement.MeasurementConverterClient;
+import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+import org.rhq.core.domain.test.AbstractEJB3Test;
+import org.rhq.core.server.MeasurementParser;
+
+// TODO two tests in here need to be re-enables once the GWT client issues are resolved
+@Test
+public class MeasurementConverterTest extends AbstractEJB3Test {
+ private final double POSITIVE = 300;
+ private final double NEGATIVE = -42;
+
+ private final String[] WHITESPACE = new String[] { " ", "\f", "\n", "\r", "\t" };
+
+ private ThreadLocal<Integer> precisionScalingTestCount = null;
+
+ private void incrementPrecisionScalingTestCount() {
+ if (precisionScalingTestCount == null) {
+ precisionScalingTestCount = new ThreadLocal<Integer>() {
+ @Override
+ protected Integer initialValue() {
+ return 0;
+ }
+ };
+ }
+ precisionScalingTestCount.set(precisionScalingTestCount.get() + 1);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = false)
+ // TODO fix me
+ public void testPrecisionScaling() throws Exception {
+
+ // if all values are equal, it will format to the max precision
+
+ testPrecisionScaling(new double[] { 1.41, 1.41, 1.41, 1.41, 1.41 }, MeasurementUnits.NONE, new String[] {
+ "1.41", "1.41", "1.41", "1.41", "1.41" }, MeasurementUnits.NONE);
+
+ // if all values are unique, it won't need to format any of them to more digits
+ testPrecisionScaling(new double[] { 1.41, 1.42, 1.43, 1.44, 1.45 }, MeasurementUnits.NONE, new String[] {
+ "1.41", "1.42", "1.43", "1.44", "1.45" }, MeasurementUnits.NONE);
+
+ // even if only two are equal, it will scale all the way to max precision looking for uniqueness
+ testPrecisionScaling(new double[] { 1.4, 1.4, 1.5, 1.6, 1.7 }, MeasurementUnits.NONE, new String[] { "1.4",
+ "1.4", "1.5", "1.6", "1.7" }, MeasurementUnits.NONE);
+
+ // to final a "good looking" target scaling units, it will use the mathematical mean
+ // NOTE: formatting doesn't round up/down, thus introducing error from cutting digits (256 -> 0.2KB [instead of 0.25KB])
+ testPrecisionScaling(new double[] { 128, 256, 512, 1024, 8192 }, MeasurementUnits.BYTES, new String[] {
+ "0.1KB", "0.2KB", "0.5KB", "1KB", "8KB" }, MeasurementUnits.KILOBYTES);
+
+ // same test with negative numbers
+ testPrecisionScaling(new double[] { -128, -256, -512, -1024, -8192 }, MeasurementUnits.BYTES, new String[] {
+ "-0.1KB", "-0.2KB", "-0.5KB", "-1KB", "-8KB" }, MeasurementUnits.KILOBYTES);
+
+ // test self scaling relative units
+ testPrecisionScaling(new double[] { 0.0, 0.065, 1.0, 0.123456 }, MeasurementUnits.PERCENTAGE, new String[] {
+ "0%", "6.5%", "100%", "12.3%" }, MeasurementUnits.PERCENTAGE);
+
+ // test self scaling relative units
+ testPrecisionScaling(new double[] { 0.0621, 0.065, 0.0620, 0.6202 }, MeasurementUnits.PERCENTAGE, new String[] {
+ "6.21%", "6.5%", "6.2%", "62.02%" }, MeasurementUnits.PERCENTAGE);
+ }
+
+ private void testPrecisionScaling(double[] values, MeasurementUnits units, String[] expectedResults,
+ MeasurementUnits expectedUnits) {
+ incrementPrecisionScalingTestCount();
+
+ String[] results = MeasurementConverterClient.formatToSignificantPrecision(values, units, true);
+ for (int i = 0; i < results.length; i++) {
+ String expected = expectedResults[i];
+ String actual = results[i];
+
+ // The expected output is in Locale.US. Handle running the tests in a different default locale
+ if (expected.contains(".") && (!Locale.getDefault().equals(Locale.US))) {
+ Locale defaultLocale = Locale.getDefault();
+ Locale.setDefault(Locale.US);
+ MeasurementNumericValueAndUnits vu = MeasurementParser.parse(expected, expectedUnits);
+ Locale.setDefault(defaultLocale);
+ expected = MeasurementConverterClient.format(vu.getValue(), expectedUnits, false, null, 4);
+ }
+
+ assert actual.equals(expected) : "Test " + precisionScalingTestCount.get() + ": " + "Index " + i + ", "
+ + "Expected " + expected + ", " + "Received " + actual + ", " + "Units " + units.getName();
+ }
+ }
+
+ @Test(groups = "integration.ejb3", enabled = false)
+ // TODO fix me
+ public void testConversionSuccess() throws Exception {
+ // test the straight-forward, non-whitespace cases
+ for (MeasurementUnits units : MeasurementUnits.values()) {
+ validateFormatConvert(POSITIVE, units);
+ validateFormatConvert(NEGATIVE, units);
+ }
+
+ List<String> signVariations;
+ List<String> magnitudeVariations;
+ List<String> unitsVariations;
+
+ // use the same NumberFormat that the MeasurementConverter uses, so that we get the correct expected results
+ NumberFormat nf = DecimalFormat.getNumberInstance();
+ nf.setMinimumFractionDigits(1);
+ nf.setMaximumFractionDigits(1);
+
+ // test a couple hundred thousand variations of whitespace around each positive number with units
+ signVariations = getWhitespaceVariationsAroundSingleTokens("", "+");
+ magnitudeVariations = getWhitespaceVariationsAroundSingleTokens(nf.format(POSITIVE));
+ for (MeasurementUnits units : MeasurementUnits.values()) {
+ unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
+
+ // splice all combinations together and test conversion validity
+ for (String signVariation : signVariations) {
+ for (String magnitudeVariation : magnitudeVariations) {
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ magnitudeVariation = nf.format(MeasurementUnits.scaleUp(nf.parse(magnitudeVariation.trim())
+ .doubleValue(), units));
+ }
+
+ for (String unitVariation : unitsVariations) {
+ String original = MeasurementConverterClient.format(POSITIVE, units, false);
+ String toBeTested = magnitudeVariation.trim() + unitVariation.trim();
+
+ assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
+ + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
+
+ validateConvert(POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
+ }
+ }
+ }
+ }
+
+ // test a couple hundred thousand variations of whitespace around each negative number with units
+ signVariations = getWhitespaceVariationsAroundSingleTokens("-");
+ for (MeasurementUnits units : MeasurementUnits.values()) {
+ unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
+
+ for (String signVariation : signVariations) {
+ for (String magnitudeVariation : magnitudeVariations) {
+ if (units == MeasurementUnits.PERCENTAGE) {
+ magnitudeVariation = nf.format(100 * nf.parse(magnitudeVariation.trim()).doubleValue());
+ }
+
+ for (String unitVariation : unitsVariations) {
+ String original = MeasurementConverterClient.format(-POSITIVE, units, false);
+ String toBeTested = "-" + magnitudeVariation.trim() + unitVariation.trim();
+
+ assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
+ + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
+
+ validateConvert(-POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
+ }
+ }
+ }
+ }
+ }
+
+ @Test(groups = "integration.ejb3")
+ public void testScalingSuccess() throws Exception {
+ // Family.BYTES
+ validateScaleAndInverse(1024.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.KILOBYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.MEGABYTES);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.GIGABYTES);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.MEGABYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.GIGABYTES);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.GIGABYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.TERABYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ // Family.BITS
+ validateScaleAndInverse(1024.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.KILOBITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.MEGABITS);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.GIGABITS);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.MEGABITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.GIGABITS);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.GIGABITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.TERABITS, 1.0, MeasurementUnits.PETABITS);
+
+ // Family.DURATION
+ validateScaleAndInverse(1000.0, MeasurementUnits.EPOCH_MILLISECONDS, 1.0, MeasurementUnits.EPOCH_SECONDS);
+
+ // Family.TIME
+ validateScaleAndInverse(1000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.SECONDS);
+ validateScaleAndInverse(60000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.MINUTES);
+ validateScaleAndInverse(3600000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.HOURS);
+ validateScaleAndInverse(86400000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.DAYS);
+
+ validateScaleAndInverse(60.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.MINUTES);
+ validateScaleAndInverse(3600.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.HOURS);
+ validateScaleAndInverse(86400.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.DAYS);
+
+ validateScaleAndInverse(60.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.HOURS);
+ validateScaleAndInverse(1440.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.DAYS);
+
+ validateScaleAndInverse(24.0, MeasurementUnits.HOURS, 1.0, MeasurementUnits.DAYS);
+ }
+
+ private void validateScaleAndInverse(double fromValue, MeasurementUnits fromUnits, double toValue,
+ MeasurementUnits toUnits) {
+ validateScale(fromValue, fromUnits, toValue, toUnits);
+ validateScale(toValue, toUnits, fromValue, fromUnits);
+ }
+
+ private void validateScale(double fromValue, MeasurementUnits fromUnits, double toValue, MeasurementUnits toUnits) {
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(fromValue, fromUnits);
+ try {
+ double derived = MeasurementConverterClient.scale(valueAndUnits, toUnits);
+ assert Math.abs(toValue - derived) < 1e-9 : "Scale conversion error: " +
+
+ "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
+ + fromUnits + "', " +
+
+ "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
+ + toUnits + "', " +
+
+ "Received value '" + derived + "'";
+
+ } catch (MeasurementConversionException mce) {
+ assert false : "Unexpected MeasurementConversionException: " +
+
+ "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
+ + fromUnits + "', " +
+
+ "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
+ + toUnits;
+ }
+ }
+
+ private void validateFormatConvert(double value, MeasurementUnits units) {
+ validateFormatConvert(value, value, units);
+ }
+
+ private void validateFormatConvert(double passedValue, double expectedValue, MeasurementUnits units) {
+ try {
+ String intermediate = MeasurementConverterClient.format(passedValue, units, false);
+ MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
+
+ assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
+ + passedValue
+ + "', "
+ + "units input was '"
+ + units.name()
+ + "', "
+ +
+
+ "intermediate string was '"
+ + intermediate
+ + "', "
+ +
+
+ "Expected value '"
+ + expectedValue
+ + "', "
+ + "with units of '"
+ + units.name()
+ + "', "
+ + "displayed as '"
+ + units
+ + "', "
+ +
+
+ "Received value '"
+ + results.getValue()
+ + "', "
+ + "with units of '"
+ + results.getUnits().getName()
+ + "', " + "displayed as '" + results.getUnits() + "'";
+ } catch (MeasurementConversionException mce) {
+ assert false : "Error during conversion: " + mce.getMessage();
+ }
+ }
+
+ private void validateConvert(double value, String intermediate, MeasurementUnits units) {
+ validateConvert(value, value, intermediate, units);
+ }
+
+ private void validateConvert(double passedValue, double expectedValue, String intermediate, MeasurementUnits units) {
+ try {
+ MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
+
+ assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
+ + passedValue
+ + "', "
+ + "units input was '"
+ + units.name()
+ + "', "
+ +
+
+ "intermediate string was '"
+ + intermediate
+ + "', "
+ +
+
+ "Expected value '"
+ + expectedValue
+ + "', "
+ + "with units of '"
+ + units.name()
+ + "', "
+ + "displayed as '"
+ + units
+ + "', "
+ +
+
+ "Received value '"
+ + results.getValue()
+ + "', "
+ + "with units of '"
+ + results.getUnits().getName()
+ + "', " + "displayed as '" + results.getUnits() + "'";
+ } catch (MeasurementConversionException mce) {
+ assert false : "Error during conversion: " + mce.getMessage();
+ }
+ }
+
+ private List<String> getWhitespaceVariationsAroundSingleTokens(String... tokens) {
+ List<String> variations = new ArrayList<String>();
+
+ for (String token : tokens) {
+ for (String white : WHITESPACE) {
+ variations.add(token);
+ //variations.add( token + white );
+ //variations.add( white + token );
+ //variations.add( white + token + white );
+
+ variations.add(token + white + white);
+ //variations.add( white + white + token );
+ //variations.add( white + white + token + white + white );
+ }
+ }
+
+ return variations;
+ }
+
+}
commit 53d34d5afee2a6b16007ab35c391eaf0a03c52f1
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 24 11:05:19 2010 -0400
improve testMoveResourceType() so that it verifies that when a ResourceType X is moved, that Resources of type X are also moved
(cherry picked from commit 1fe024068b6aaa61068382cf3cbc099a638e3200)
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java
index bda11e9..0d70634 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java
@@ -19,10 +19,17 @@
package org.rhq.enterprise.server.resource.metadata.test;
import java.util.Set;
+import java.util.UUID;
import javax.persistence.EntityManager;
import javax.transaction.Status;
+import org.jetbrains.annotations.NotNull;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.resource.InventoryStatus;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.server.util.LookupUtil;
import org.testng.annotations.Test;
import org.rhq.core.domain.measurement.DisplayType;
@@ -126,25 +133,36 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
System.out.println("testMoveResourceType --- start");
try {
registerPlugin("update2-v1_0.xml");
+
ResourceType platform1 = getResourceType("myPlatform");
+ Resource platformResource = createResource("foo-myPlatform", "foo-myPlatform", platform1);
+ ResourceType service1 = getResourceType("service1");
+ Resource service1Resource = createResource("foo-service1", "foo-service1", service1);
+ platformResource.addChildResource(service1Resource);
+ ResourceType nestedOne = getResourceType("nestedOne");
+ Resource nestedOneResource = createResource("foo-nestedOne", "foo-nestedOne", nestedOne);
+ service1Resource.addChildResource(nestedOneResource);
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+ resourceManager.createResource(overlord, platformResource, -1);
+
getTransactionManager().begin();
- EntityManager em = getEntityManager();
+ EntityManager em = getEntityManager();
platform1 = em.find(ResourceType.class, platform1.getId());
assert platform1 != null : "I did not find myPlatform";
Set<MeasurementDefinition> defs = platform1.getMetricDefinitions();
- assert defs.size() == 1 : "I was expecting 1 definition at platform level in v1";
+ assert defs.size() == 1 : "I was expecting 1 metric definition at platform level in v1";
assert DisplayType.DETAIL == defs.iterator().next().getDisplayType() : "Display type should be DETAIL in v1";
// one child service in v1
Set<ResourceType> platformChildren = platform1.getChildResourceTypes();
assert platformChildren.size() == 1 : "Expected 1 direct child service of platform in v1";
- ResourceType service1 = platformChildren.iterator().next();
+ service1 = platformChildren.iterator().next();
assert service1.getName().equals("service1") : "Expected 'service1' as name of direct platform child in v1";
assert service1.getMetricDefinitions().size() == 1 : "Expected 1 metric for 'service1' in v1";
- Set<ResourceType> nestedService = service1.getChildResourceTypes();
- assert nestedService.size() == 1 : "Expected 1 nested service of 'service1' in v1";
- Set<MeasurementDefinition> nestedDefs = nestedService.iterator().next().getMetricDefinitions();
+ Set<ResourceType> nestedServices = service1.getChildResourceTypes();
+ assert nestedServices.size() == 1 : "Expected 1 nested service of 'service1' in v1";
+ Set<MeasurementDefinition> nestedDefs = nestedServices.iterator().next().getMetricDefinitions();
assert nestedDefs.size() == 1 : "Expected 1 definition within 'nestedService' in v1";
MeasurementDefinition defThree = nestedDefs.iterator().next();
int definitionId = defThree.getId(); // get the id of the definition "Three" and save it for later use
@@ -166,9 +184,28 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
assert defs2.size() == 1 : "I was expecting 1 definition at platform level in v2";
assert DisplayType.SUMMARY == defs2.iterator().next().getDisplayType() : "Display type should be SUMMARY in v2";
+ ResourceCriteria resourceCriteria = new ResourceCriteria();
+ resourceCriteria.setStrict(true);
+ resourceCriteria.addFilterResourceKey("foo-myPlatform");
+ resourceCriteria.fetchChildResources(true);
+ Resource platform2Resource = getResource(resourceCriteria);
+ assert platform2Resource != null : "Expected to find platform Resource in db.";
+
// two children in v2
Set<ResourceType> platformChildren2 = platform2.getChildResourceTypes();
- assert platformChildren2.size() == 2 : "Expected 2 direct child services of platform in v2";
+ assert platformChildren2.size() == 2 : "Expected 2 direct child service types of platform in v2";
+
+ Set<Resource> platform2ChildResources = platform2Resource.getChildResources();
+ assert platform2ChildResources.size() == 2 : "Expected 2 direct child services of platform in v2";
+ boolean foundMovedResource = false;
+ for (Resource childResource : platform2ChildResources) {
+ assert childResource.getChildResources().isEmpty() : "Expected child Resource " + childResource + " to have no children";
+ if (childResource.getResourceKey().equals("foo-nestedOne")) {
+ foundMovedResource = true;
+ }
+ }
+ assert foundMovedResource : "Expected 'foo-nestedOne' Resource to have been moved directly under platform Resource";
+
for (ResourceType type : platformChildren2) {
String typeName = type.getName();
assert type.getMetricDefinitions().size() == 1 : "Expected one definition for " + typeName + " in v2";
@@ -186,7 +223,7 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
* latter is a different story. We probably should cascade that anyway.
*/
assert three.getId() == definitionId : "Expected the id of 'Three' to be " + definitionId
- + " but it was " + three.getId() + " in v2";
+ + ", but it was " + three.getId() + " in v2";
} else if (typeName.equals("service1")) {
// check that the nested service is gone
Set<ResourceType> childrenOfService = type.getChildResourceTypes();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
index 6b5c627..205108d 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
import java.net.URL;
import java.util.List;
import java.util.Set;
+import java.util.UUID;
import javax.ejb.EJB;
import javax.persistence.EntityManager;
@@ -82,12 +83,14 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
protected static ResourceMetadataManagerLocal metadataManager;
protected static ResourceTypeManagerLocal resourceTypeManager;
+ protected static ResourceManagerLocal resourceManager;
@BeforeSuite
protected void init() {
try {
metadataManager = LookupUtil.getResourceMetadataManager();
resourceTypeManager = LookupUtil.getResourceTypeManager();
+ resourceManager = LookupUtil.getResourceManager();
} catch (Throwable t) {
// Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them
// and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)!
@@ -146,6 +149,28 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
}
}
+ protected Resource createResource(String resourceKey, String name, ResourceType type) {
+ Resource resource = new Resource(resourceKey, name, type);
+ resource.setUuid(UUID.randomUUID().toString());
+ resource.setInventoryStatus(InventoryStatus.COMMITTED);
+ return resource;
+ }
+
+ protected Resource getResource(ResourceCriteria resourceCriteria) {
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ PageList<Resource> results = resourceManager
+ .findResourcesByCriteria(overlord, resourceCriteria);
+ if (results.size() == 0) {
+ return null;
+ } else if (results.size() == 1) {
+ return results.get(0);
+ } else {
+ throw new IllegalStateException("Found more than one Resource with criteria " + resourceCriteria
+ + ".");
+ }
+ }
+
protected String getSubsystemDirectory() {
return ".";
}
commit f99914e64b5d110b9b1944b4fd5798219711ab22
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Fri May 21 16:46:58 2010 -0400
oops, forgot to update current schema version in pom to 2.87
(cherry picked from commit b71faa29cafc4e4737184f7b8a348091748bd29f)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index b2b0b7e..eb5d6ea 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -22,7 +22,7 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.85</db.schema.version>
+ <db.schema.version>2.87</db.schema.version>
</properties>
<dependencies>
commit 42c11a370fcb8ddce0b5e278d3e036508ad1b083
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Fri May 21 16:45:43 2010 -0400
use schema version 2.87, rather than 2.86, for adding unique constraint to rhq_resource_type name+plugin index, since Mazz has already claimed 2.86; fix compile errors in JBossCacheComponent and JBossCacheDetailComponent caused by my previous checkin; turn down logging verbosity in ResourceMetadataManagerBean
(cherry picked from commit 10d7bf099a310e9be9d93637299d67265e29aa2f)
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 31a7b40..6ec7660 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2920,7 +2920,8 @@
</schema-directSQL>
</schemaSpec>
- <schemaSpec version="2.86">
+
+ <schemaSpec version="2.87">
<schema-directSQL>
<statement desc="Make RHQ_RES_TYPE_IDX_PLG_NAME index unique">
DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME ;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java
index cbd364b..b4b7d55 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java
@@ -65,7 +65,9 @@ public interface SubjectManagerLocal {
Subject getOverlord();
/**
- * @see SubjectManagerRemote#findAllSubjects
+ * Returns a paged list of all Subjects.
+ *
+ * @param pageControl the page control that specifies which page of the result set to return and how sort it
*/
PageList<Subject> findAllSubjects(PageControl pageControl);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
index fa31afe..e49c8f3 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
@@ -92,6 +92,7 @@ import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
* @author Greg Hinkle
* @author Heiko W. Rupp
* @author John Mazzitelli
+ * @author Ian Springer
*/
@Stateless
@javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME)
@@ -312,14 +313,14 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
if (existingPlugin != null) {
Plugin obsolete = AgentPluginDescriptorUtil.determineObsoletePlugin(plugin, existingPlugin);
- if (obsolete == existingPlugin) { // yes use == for reference equality
+ if (obsolete == existingPlugin) { // yes, use == for reference equality
newOrUpdated = true;
}
plugin.setId(existingPlugin.getId());
plugin.setEnabled(existingPlugin.isEnabled());
}
- // If this is a brand new plugin, it gets "updated" too - which ends up being a simple persist.
+ // If this is a brand new plugin, it gets "updated" too.
if (newOrUpdated) {
if (plugin.getDisplayName() == null) {
plugin.setDisplayName(plugin.getName());
@@ -347,7 +348,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
// TODO GH: JBNADM-1310/JBNADM-1630 - Push updated plugins to running agents and have them reboot their PCs
// We probably want to be smart about this - perhaps have the agents periodically poll their server to see
- // if there are new plugins and if so download them - this of course would be configurable/disablable
+ // if there are new plugins and if so download them - this of course would be configurable/disableable
return typesUpdated;
}
@@ -392,7 +393,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
* @param id the id of the plugin whose content is being updated
* @param file the plugin file whose content will be streamed to the database
*
- * @throws Exception
+ * @throws Exception on failure to update the plugin's content
*/
private void streamPluginFileContentToDatabase(int id, File file) throws Exception {
Connection conn = null;
@@ -424,7 +425,8 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
private void updateTypes(Set<ResourceType> rootResourceTypes) throws Exception {
// Iterate the resource types breadth-first, so all platform types get added before any server types or platform
// service types. This way, we'll be able to set all of the platform types as parents of the server types and
- // platform service types.
+ // platform service types. It's also helpful for other types with multiple "runs-inside" parent types (e.g
+ // Hibernate Entities), since it ensures the parent types will get persisted prior to the child types.
for (ResourceType rootResourceType : rootResourceTypes) {
updateType(rootResourceType);
}
@@ -544,7 +546,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
private void mergeExistingType(ResourceType resourceType, ResourceType existingType) {
- log.info("Merging type [" + resourceType + "] + into existing type [" + existingType + "]...");
+ log.debug("Merging type [" + resourceType + "] + into existing type [" + existingType + "]...");
// Make sure to first add/update any subcategories on the parent before trying to update children.
// Otherwise, the children may try to save themselves with subcategories which wouldn't exist yet.
@@ -648,7 +650,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
private void updateParentResourceTypes(ResourceType newType, ResourceType existingType) {
Set<ResourceType> newParentTypes = newType.getParentResourceTypes();
- log.info("Setting parent types on type: " + ((existingType != null) ? existingType : newType )
+ log.debug("Setting parent types on type: " + ((existingType != null) ? existingType : newType )
+ " to [" + newParentTypes + "]...");
newType.setParentResourceTypes(new HashSet<ResourceType>());
Set<ResourceType> originalExistingParentTypes = new HashSet<ResourceType>();
@@ -663,7 +665,8 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN).setParameter("name", newParentType.getName())
.setParameter("plugin", newParentType.getPlugin()).getSingleResult();
ResourceType type = (existingType != null) ? existingType : newType;
- log.info("Adding type [" + type + "] as child of type [" + realParentType + "]...");
+ log.info("Adding type [" + toConciseString(type) + "] as child of type ["
+ + toConciseString(realParentType) + "]...");
realParentType.addChildResourceType(type);
}
} catch (NoResultException nre) {
@@ -673,7 +676,8 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
for (ResourceType obsoleteParentType : originalExistingParentTypes) {
- log.info("Removing type [" + existingType + "] from parent type [" + obsoleteParentType + "]...");
+ log.info("Removing type [" + toConciseString(existingType) + "] from parent type ["
+ + toConciseString(obsoleteParentType) + "]...");
obsoleteParentType.removeChildResourceType(existingType);
moveResourcesToNewParent(existingType, obsoleteParentType, newParentTypes);
}
@@ -681,6 +685,10 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
entityManager.flush();
}
+ private static String toConciseString(ResourceType type) {
+ return (type != null) ? (type.getPlugin() + ":" + type.getName() + "(id=" + type.getId() + ")") : "null";
+ }
+
private void moveResourcesToNewParent(ResourceType existingType, ResourceType obsoleteParentType, Set<ResourceType> newParentTypes) {
Subject overlord = subjectManager.getOverlord();
ResourceCriteria criteria = new ResourceCriteria();
@@ -703,6 +711,8 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
for (Resource childResource : resource.getChildResources()) {
if (childResource.getResourceType().equals(newParentType)) {
// We found a child to be the new parent of our orphaned Resource.
+ // TODO: Check if there are are multiple children of the new parent type. If so,
+ // log an error and don't move the resource.
newParent = childResource;
break newParentTypes;
}
@@ -714,7 +724,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
newParent.addChildResource(resource);
} else {
- log.warn("We were unable to move " + resource + " from invalid parent " + resource.getParentResource()
+ log.debug("We were unable to move " + resource + " from invalid parent " + resource.getParentResource()
+ " to a new valid parent with one of the following types: " + newParentTypes);
}
}
@@ -735,7 +745,6 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
private List<ResourceSubCategory> getAllSubcategories(ResourceSubCategory cat) {
-
List<ResourceSubCategory> result = new ArrayList<ResourceSubCategory>();
if (cat.getChildSubCategories() != null) {
@@ -750,7 +759,6 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
/** Update the <event> tags */
private void updateEventDefinitions(ResourceType newType, ResourceType existingType) {
-
Set<EventDefinition> newEventDefs = newType.getEventDefinitions();
// Loop over the newEventDefs and set the resourceTypeId, so equals() will work
for (EventDefinition def : newEventDefs) {
@@ -1284,7 +1292,6 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
existingType.setPackageExtraPropertiesDefinition(null);
}
}
-
}
/**
diff --git a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java
index 24b3acc..17a2b1e 100644
--- a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java
+++ b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java
@@ -25,6 +25,7 @@ package org.rhq.plugins.jbosscache3;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.NotNull;
import org.mc4j.ems.connection.EmsConnection;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.measurement.AvailabilityType;
@@ -49,9 +50,12 @@ public class JBossCacheComponent implements
private String beanName;
- public void start(ResourceContext<ProfileServiceComponent> context)
+ private ResourceContext<ProfileServiceComponent> resourceContext;
+
+ public void start(ResourceContext<ProfileServiceComponent> context)
throws InvalidPluginConfigurationException, Exception {
+ resourceContext = context;
parentComp = context.getParentResourceComponent();
Configuration configuration = context.getPluginConfiguration();
@@ -80,4 +84,9 @@ public class JBossCacheComponent implements
public EmsConnection getEmsConnection() {
return parentComp.getEmsConnection();
}
+
+ @NotNull
+ public ResourceContext<ProfileServiceComponent> getResourceContext() {
+ return resourceContext;
+ }
}
diff --git a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java
index b23e404..844da14 100644
--- a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java
+++ b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java
@@ -26,6 +26,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.NotNull;
import org.mc4j.ems.connection.EmsConnection;
import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
@@ -59,10 +60,12 @@ public class JBossCacheDetailComponent implements MeasurementFacet,
public ProfileServiceComponent parentComponent;
private String beanName;
private final Log log = LogFactory.getLog(this.getClass());
+ private ResourceContext<ProfileServiceComponent> resourceContext;
- public void start(ResourceContext<ProfileServiceComponent> context)
+ public void start(ResourceContext<ProfileServiceComponent> context)
throws InvalidPluginConfigurationException, Exception {
+ resourceContext = context;
parentComponent = context.getParentResourceComponent();
EmsConnection connection = getEmsConnection();
@@ -100,7 +103,12 @@ public class JBossCacheDetailComponent implements MeasurementFacet,
return parentComponent.getConnection();
}
- public void getValues(MeasurementReport report,
+ @NotNull
+ public ResourceContext<ProfileServiceComponent> getResourceContext() {
+ return resourceContext;
+ }
+
+ public void getValues(MeasurementReport report,
Set<MeasurementScheduleRequest> metrics) throws Exception {
EmsConnection connection = getEmsConnection();
@@ -125,7 +133,7 @@ public class JBossCacheDetailComponent implements MeasurementFacet,
.toString()));
}
} catch (Exception e) {
- log.error(" Failure to collect measurement data for metric "
+ log.error("Failure to collect measurement data for metric "
+ metricName + " from bean "
+ detailComponent.getBeanName(), e);
}
@@ -151,7 +159,7 @@ public class JBossCacheDetailComponent implements MeasurementFacet,
new PropertySimple(OperationResult.SIMPLE_OPERATION_RESULT_NAME, String.valueOf(obj)));
}
} catch (Exception e) {
- log.error(" Failure to invoke operation " + name + " on bean "
+ log.error("Failure to invoke operation " + name + " on bean "
+ beanName, e);
}
return result;
commit e62ab7fc4227ad5597252f7365380dcce92fd456
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 24 11:23:54 2010 -0400
fix conflict
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
index c1457f0..b9c97f2 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
@@ -1,6 +1,6 @@
/*
* Jopr Management Platform
-* Copyright (C) 2005-2009 Red Hat, Inc.
+* Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -68,8 +68,12 @@ import org.rhq.plugins.jbossas5.util.JnpConfig;
import org.jboss.on.common.jbossas.JBossASDiscoveryUtils;
/**
- * A Resource discovery component for JBoss AS, 5.2.0.Beta1 or later, and JBoss EAP and SOA-P, 5.0.0.Beta or later,
- * Servers.
+ * A Resource discovery component for JBoss AS Server Resources, which include the following:
+ *
+ * JBoss AS, 5.2.0.Beta1 and later
+ * JBoss EAP, 5.0.0.Beta and later
+ * JBoss EWP, 5.0.0.CR1 and later
+ * JBoss SOA-P, 5.0.0.Beta and later
*
* @author Ian Springer
* @author Mark Spritzler
@@ -84,39 +88,31 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
private static final String JAVA_HOME_ENV_VAR = "JAVA_HOME";
private static final Map<JBossProductType, ComparableVersion> MINIMUM_PRODUCT_VERSIONS = new HashMap(3);
-
- private static final List<String> CLIENT_JARS = Arrays.asList(
- // NOTE: The jbossall-client.jar aggregates a whole bunch of other jars from the client dir via its
- // MANIFEST.MF Class-Path.
- "client/jbossall-client.jar",
- "client/trove.jar",
- "client/javassist.jar",
- "common/lib/jboss-security-aspects.jar",
- "lib/jboss-managed.jar",
- "lib/jboss-metatype.jar",
-<<<<<<< HEAD
- "lib/jboss-dependency.jar"
- );
-
- private static final List<String> AS6_CLIENT_JARS = new ArrayList<String>(CLIENT_JARS);
-
static {
MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1"));
MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta"));
MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EWP, new ComparableVersion("5.0.0.CR1"));
MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta"));
+ }
+
+ private static final List<String> CLIENT_JARS = Arrays.asList(
+ // NOTE: The jbossall-client.jar aggregates a whole bunch of other jars from the client dir via its
+ // MANIFEST.MF Class-Path.
+ "client/jbossall-client.jar",
+ "client/trove.jar",
+ "client/javassist.jar",
+ "common/lib/jboss-security-aspects.jar",
+ "lib/jboss-managed.jar",
+ "lib/jboss-metatype.jar",
+ "lib/jboss-dependency.jar"
+ );
+ private static final List<String> AS6_CLIENT_JARS = new ArrayList<String>(CLIENT_JARS);
+ static {
// The below jars are required for JBoss AS 6.0 M1, M2, and M3.
AS6_CLIENT_JARS.add("lib/jboss-classpool.jar");
AS6_CLIENT_JARS.add("lib/jboss-classpool-scoped.jar");
}
-=======
- "lib/jboss-dependency.jar",
- // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
- //"lib/jboss-classpool.jar",
- //"lib/jboss-classpool-scoped.jar"
- };
->>>>>>> 2e1a8be... * add support for moving resourcetypes to new locations in the type hierarchy, as well as moving any existing resources of those types (https://bugzilla.redhat.com/show_bug.cgi?id=577055)
private final Log log = LogFactory.getLog(this.getClass());
commit f74b22044b6946864c92c30322c8a07351f8981d
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 24 11:17:32 2010 -0400
* add support for moving resourcetypes to new locations in the type hierarchy, as well as moving any existing resources of those types (https://bugzilla.redhat.com/show_bug.cgi?id=577055)
* in jboss-as-5 plugin, add new JBoss Messaging singleton type and move existing Topic and Queue types under that type (https://jira.jboss.org/browse/EMBJOPR-303)
* turn off PERSIST and MERGE cascading on ResourceType.childResources to give metadata update code a greater level of control
* refactor metadata updateTypes() code
** iterate types breadth-first, rather than depth-first
** explicitly update child resources of new resources, since PERSIST cascading is now disabled
** stop using exceptions for code flow
* add unique constraint to name+plugin index on RHQ_RESOURCE_TYPE table in dbsetup and dbupgrade scripts
* remove bogus Hibernate hints on named query in ResourceType entity
(cherry picked from commit 2e1a8be116717c33c91114cb0dd9ac9f254acf10)
Conflicts:
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
index 964c975..7c51ef7 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
@@ -25,7 +25,7 @@
<column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
<column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
- <index name="RHQ_RES_TYPE_IDX_PLG_NAME">
+ <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
<field ref="NAME"/>
<field ref="PLUGIN"/>
</index>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index fe8720c..31a7b40 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2920,6 +2920,15 @@
</schema-directSQL>
</schemaSpec>
+ <schemaSpec version="2.86">
+ <schema-directSQL>
+ <statement desc="Make RHQ_RES_TYPE_IDX_PLG_NAME index unique">
+ DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME ;
+ CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin)
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
index d27a7e5..8f2b158 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java
@@ -30,6 +30,7 @@ import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.InventoryStatus;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageOrdering;
import java.util.Arrays;
@@ -56,6 +57,7 @@ public class ResourceCriteria extends Criteria {
private String filterPluginName; // needs overrides
private Integer filterParentResourceId; // needs overrides
private String filterParentResourceName; // needs overrides
+ private Integer filterParentResourceTypeId; // needs overrides
private String filterAgentName; // needs overrides
private AvailabilityType filterCurrentAvailability; // needs overrides
private Long filterStartItime;
@@ -104,6 +106,7 @@ public class ResourceCriteria extends Criteria {
filterOverrides.put("pluginName", "resourceType.plugin like ?");
filterOverrides.put("parentResourceId", "parentResource.id = ?");
filterOverrides.put("parentResourceName", "parentResource.name like ?");
+ filterOverrides.put("parentResourceTypeId", "parentResource.resourceType.id = ?");
filterOverrides.put("agentName", "agent.name like ?");
filterOverrides.put("currentAvailability", "currentAvailability.availabilityType = ?");
filterOverrides.put("startItime", "itime >= ?");
@@ -171,6 +174,10 @@ public class ResourceCriteria extends Criteria {
this.filterParentResourceName = filterParentResourceName;
}
+ public void addFilterParentResourceTypeId(int filterParentResourceTypeId) {
+ this.filterParentResourceTypeId = filterParentResourceTypeId;
+ }
+
public void addFilterAgentName(String filterAgentName) {
this.filterAgentName = filterAgentName;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 510a729..150266f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -356,7 +356,7 @@ import org.rhq.core.domain.util.Summary;
@NamedQuery(name = Resource.QUERY_FIND_BY_PARENT_AND_KEY, hints = { @QueryHint(name = "cacheable", value = "true") }, query = "" //
+ "SELECT r " //
+ " FROM Resource AS r " //
- + " WHERE (:parent = r.parentResource OR :parent IS NULL) " //
+ + " WHERE (:parent = r.parentResource OR (:parent IS NULL AND r.parentResource IS NULL)) " //
+ " AND r.resourceKey = :key " //
+ " AND r.resourceType.plugin = :plugin " //
+ " AND r.resourceType.name = :typeName"),
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
index 9a779ba..06cbc47 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
@@ -22,10 +22,6 @@
*/
package org.rhq.core.domain.resource;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
@@ -87,8 +83,7 @@ import org.rhq.core.domain.util.Summary;
query = "SELECT rt FROM ResourceType AS rt WHERE LOWER(rt.name) = LOWER(:name)"),
@NamedQuery(name = ResourceType.QUERY_FIND_BY_PLUGIN, query = "SELECT rt FROM ResourceType AS rt WHERE rt.plugin = :plugin"),
@NamedQuery(name = ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN, // TODO: QUERY: names are case-sensitive
- hints = { @QueryHint(name = "org.hibernate.able", value = "true"),
- @QueryHint(name = "org.hibernate.Region", value = "metadata") }, query = "SELECT rt FROM ResourceType AS rt WHERE LOWER(rt.name) = LOWER(:name) AND rt.plugin = :plugin"),
+ query = "SELECT rt FROM ResourceType AS rt WHERE LOWER(rt.name) = LOWER(:name) AND rt.plugin = :plugin"),
@NamedQuery(name = ResourceType.QUERY_FIND_ALL, query = "SELECT rt FROM ResourceType AS rt"),
@NamedQuery(name = ResourceType.QUERY_FIND_BY_PARENT_AND_NAME, // TODO: QUERY: Not looking up by the full key, get rid of this query
query = "SELECT rt FROM ResourceType AS rt WHERE :parent MEMBER OF rt.parentResourceTypes AND rt.name = :name"),
@@ -319,14 +314,15 @@ public class ResourceType implements Serializable, Comparable<ResourceType> {
@Column(name = "MTIME")
private Long mtime;
- @ManyToMany(mappedBy = "parentResourceTypes", cascade = CascadeType.ALL)
+ @ManyToMany(mappedBy = "parentResourceTypes", cascade = { CascadeType.REFRESH, CascadeType.REMOVE })
@OrderBy
//@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set<ResourceType> childResourceTypes;
@ManyToMany(cascade = CascadeType.PERSIST)
// persist so self-injecting plugins work
- @JoinTable(name = "RHQ_RESOURCE_TYPE_PARENTS", joinColumns = { @JoinColumn(name = "RESOURCE_TYPE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PARENT_RESOURCE_TYPE_ID") })
+ @JoinTable(name = "RHQ_RESOURCE_TYPE_PARENTS", joinColumns = { @JoinColumn(name = "RESOURCE_TYPE_ID") },
+ inverseJoinColumns = { @JoinColumn(name = "PARENT_RESOURCE_TYPE_ID") })
@OrderBy
//@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
private Set<ResourceType> parentResourceTypes;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
index 4e2ce11..c2c3ccd 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
@@ -142,8 +142,8 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
// For performance tracking
long start = System.currentTimeMillis();
- log.info("Merging packages for resource ID [" + resourceId + "]. Package count ["
- + report.getDeployedPackages().size() + "]");
+ log.debug("Merging [" + report.getDeployedPackages().size() + "] packages for Resource with id ["
+ + resourceId + "]...");
// Load the resource and its installed packages
Resource resource = entityManager.find(Resource.class, resourceId);
@@ -322,7 +322,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe
}
}
- log.info("Finished merging " + report.getDeployedPackages().size() + " packages in "
+ log.debug("Finished merging [" + report.getDeployedPackages().size() + "] packages in "
+ (System.currentTimeMillis() - start) + "ms");
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 9c90dcb..cded63b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -143,7 +143,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
mergeResource(root, Resource.ROOT, knownAgent);
}
- // do NOT delete this flush/clear - it greatly improves performance
+ // Do NOT delete this flush+clear - it greatly improves performance.
entityManager.flush();
entityManager.clear();
@@ -558,14 +558,19 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
* or if the agent didn't know about it to begin with (id was 0).
*/
ResourceType resourceType = resource.getResourceType();
- existingResource = resourceManager.getResourceByParentAndKey(subjectManager.getOverlord(), resource
- .getParentResource(), resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName());
+ Resource parent = resource;
+ while (parent != null && existingResource == null) {
+ parent = parent.getParentResource();
+ existingResource = resourceManager.getResourceByParentAndKey(subjectManager.getOverlord(), parent,
+ resource.getResourceKey(), resourceType.getPlugin(), resourceType.getName());
+ }
+
if (existingResource != null) {
- // we found it, reset the id to what it should be
+ // We found it - reset the id to what it should be.
resource.setId(existingResource.getId());
log.debug(idLogMsg + ": Found resource already in inventory with specified business key");
} else {
- log.debug(idLogMsg + ": Unable to find the agent-reported resource by id and business key.");
+ log.debug(idLogMsg + ": Unable to find the agent-reported resource by id or business key.");
if (resource.getId() != 0) {
// existingResource is still null at this point, the resource does not exist in inventory.
@@ -588,6 +593,34 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
private void updatePreviouslyInventoriedResource(Resource resource, Resource existingResource,
Resource parentResource) throws InvalidInventoryReportException {
assert (parentResource == null) || (parentResource.getId() != 0);
+
+ ResourceType existingResourceParentType = (existingResource.getParentResource() != null)
+ ? existingResource.getParentResource().getResourceType() : null;
+ ResourceType resourceParentType = (resource.getParentResource() != null)
+ ? resource.getParentResource().getResourceType() : null;
+ Set<ResourceType> validParentTypes = existingResource.getResourceType().getParentResourceTypes();
+ if (validParentTypes != null && !validParentTypes.isEmpty() &&
+ !validParentTypes.contains(existingResourceParentType)) {
+ // The existing Resource has an invalid parent ResourceType. This may be because its ResourceType was moved
+ // to a new parent ResourceType, but its new parent was not yet discovered at the time of the type move. See
+ // if the Resource reported by the Agent has a valid parent type, and, if so, update the existing Resource's
+ // parent to that type.
+
+ if (validParentTypes.contains(resourceParentType)) {
+ if (existingResource.getParentResource() != null) {
+ existingResource.getParentResource().removeChildResource(existingResource);
+ }
+ if (resource.getParentResource() != null) {
+ parentResource = getExistingResource(resource.getParentResource());
+ parentResource.addChildResource(existingResource);
+ }
+ existingResource.setParentResource(resource.getParentResource());
+ } else {
+ log.debug("Existing Resource " + existingResource + " has invalid parent type ("
+ + existingResourceParentType + ") and so does plugin-reported Resource " + resource + " ("
+ + resourceParentType + ") - valid parent types are [" + validParentTypes + "].");
+ }
+ }
// The below block is for Resources that were created via the RHQ GUI, whose descriptions will be null.
if (existingResource.getDescription() == null && resource.getDescription() != null) {
@@ -620,8 +653,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
private boolean initResourceTypes(Resource resource) {
ResourceType resourceType;
- resourceType = this.resourceTypeManager.getResourceTypeByNameAndPlugin(subjectManager.getOverlord(), resource
- .getResourceType().getName(), resource.getResourceType().getPlugin());
+ try {
+ resourceType = this.resourceTypeManager.getResourceTypeByNameAndPlugin(subjectManager.getOverlord(), resource
+ .getResourceType().getName(), resource.getResourceType().getPlugin());
+ } catch (RuntimeException e) {
+ log.error("Failed to lookup Resource type [" + resource.getResourceType() + "] for reported Resource ["
+ + resource + "] - this should not have happened.");
+ return false;
+ }
if (resourceType == null) {
log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType()
+ "]. The Agent most likely has a plugin named '" + resource.getResourceType().getPlugin()
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
index ddb5a54..fa31afe 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -83,6 +83,7 @@ import org.rhq.enterprise.server.event.EventManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
+import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
/**
* This class manages the metadata for resources. Plugins are registered against this bean so that their metadata can be
@@ -121,6 +122,9 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
private ResourceManagerLocal resourceManager;
@EJB
+ private ResourceTypeManagerLocal resourceTypeManager;
+
+ @EJB
private EventManagerLocal eventManager;
@EJB
@@ -336,7 +340,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
if (newOrUpdated || forceUpdate) {
// Only merge the plugin's ResourceTypes into the DB if the plugin is new or updated or we were forced to
- updateTypes(plugin.getName(), rootResourceTypes);
+ updateTypes(rootResourceTypes);
typesUpdated = true;
}
}
@@ -385,7 +389,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
* This will assume the MD5 in the database is already correct, so this
* method will not take the time to calculate the MD5 again.
*
- * @param name the name of the plugin whose content is being updated
+ * @param id the id of the plugin whose content is being updated
* @param file the plugin file whose content will be streamed to the database
*
* @throws Exception
@@ -398,7 +402,6 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
FileInputStream fis = new FileInputStream(file);
try {
-
conn = this.dataSource.getConnection();
ps = conn.prepareStatement("UPDATE " + Plugin.TABLE_NAME + " SET CONTENT = ? WHERE ID = ?");
ps.setBinaryStream(1, new BufferedInputStream(fis), (int) file.length());
@@ -418,10 +421,16 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
return;
}
- private void updateTypes(String pluginName, Set<ResourceType> rootResourceTypes) throws Exception {
+ private void updateTypes(Set<ResourceType> rootResourceTypes) throws Exception {
+ // Iterate the resource types breadth-first, so all platform types get added before any server types or platform
+ // service types. This way, we'll be able to set all of the platform types as parents of the server types and
+ // platform service types.
for (ResourceType rootResourceType : rootResourceTypes) {
updateType(rootResourceType);
}
+ for (ResourceType rootResourceType : rootResourceTypes) {
+ updateTypes(rootResourceType.getChildResourceTypes());
+ }
}
@SuppressWarnings("unchecked")
@@ -493,6 +502,7 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
}
+
private void removeFromParents(ResourceType typeToBeRemoved) {
// Wrap in new HashSet to avoid ConcurrentModificationExceptions.
Set<ResourceType> parents = new HashSet<ResourceType>(typeToBeRemoved.getParentResourceTypes());
@@ -503,187 +513,209 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
@SuppressWarnings("unchecked")
private void updateType(ResourceType resourceType) {
+ entityManager.flush();
+
+ // see if there is already an existing type that we need to update
+ if (log.isDebugEnabled()) {
+ log.debug("Updating resource type [" + resourceType.getName() + "] from plugin ["
+ + resourceType.getPlugin() + "]...");
+ }
+
+ ResourceType existingType;
try {
- entityManager.flush();
+ existingType = resourceTypeManager.getResourceTypeByNameAndPlugin(resourceType.getName(),
+ resourceType.getPlugin());
+ } catch (NonUniqueResultException nure) {
+ log.debug("Found more than one existing ResourceType for " + resourceType);
+ // TODO: Delete the redundant ResourceTypes to get the DB into a valid state.
+ throw new IllegalStateException(nure);
+ }
- // see if there is already an existing type that we need to update
- if (log.isDebugEnabled()) {
- log.debug("Updating resource type [" + resourceType.getName() + "] from plugin ["
- + resourceType.getPlugin() + "]...");
- }
+ // Connect the parent types if they exist, which they should.
+ // We'll do this no matter if the resourceType exists or not - but we use existing vs. resourceType appropriately
+ // This is to support the case when an existing type gets a new parent resource type in <runs-inside>
+ updateParentResourceTypes(resourceType, existingType);
- Query q = entityManager.createNamedQuery(ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN);
- q.setParameter("name", resourceType.getName()).setParameter("plugin", resourceType.getPlugin());
- List<ResourceType> findTypeByNameAndPlugin = q.getResultList();
+ if (existingType == null) {
+ persistNewType(resourceType);
+ } else {
+ mergeExistingType(resourceType, existingType);
+ }
+ }
- ResourceType existingType = null;
- if (findTypeByNameAndPlugin.size() == 1) {
- existingType = findTypeByNameAndPlugin.get(0);
- }
+ private void mergeExistingType(ResourceType resourceType, ResourceType existingType) {
+ log.info("Merging type [" + resourceType + "] + into existing type [" + existingType + "]...");
- // Connect the parent types if they exist which they should
- // We'll do this no matter if the resourceType exists or not - but we use existing vs. resourceType appropriately
- // This is to support the case when an existing type gets a new parent resource type in <runs-inside>
- updateParentResourceTypes(resourceType, existingType);
+ // Make sure to first add/update any subcategories on the parent before trying to update children.
+ // Otherwise, the children may try to save themselves with subcategories which wouldn't exist yet.
+ updateChildSubCategories(resourceType, existingType);
- if (findTypeByNameAndPlugin.size() == 0) {
- throw new NoResultException(); // falls into the catch block down below. TODO refactor this stuff
- }
+ entityManager.flush();
- // XXX: I do not think the code in this if-block is valid - see RHQ-1086 - I think it should be removed
- // see what we have. Default is 0 or 1. When hot deploying and moving a RT 2 can happen
- if (findTypeByNameAndPlugin.size() > 1) {
- // No Unique result. List what we have and bail out if more than 2 results
- if (log.isDebugEnabled()) {
- for (ResourceType rType : findTypeByNameAndPlugin) {
- log.debug("updateType: found: " + rType);
- }
- }
+ // even though we've updated our child types to use new subcategory references, its still
+ // not safe to delete the old sub categories yet, because we haven't yet deleted all of the old
+ // child types which may still be referencing these sub categories
- if (findTypeByNameAndPlugin.size() != 2) {
- throw new IllegalArgumentException("We only expected two results here, but got "
- + findTypeByNameAndPlugin.size());
- }
+ // Update the rest of these related resources
+ updatePluginConfiguration(resourceType, existingType);
+ entityManager.flush();
- // two results - see if one is us, then the other must be the existing type that we are looking for
- Iterator<ResourceType> iter = findTypeByNameAndPlugin.iterator();
- ResourceType rt1 = iter.next();
- ResourceType rt2 = iter.next();
- if (rt1.equals(resourceType)) {
- existingType = rt2;
- } else if (rt2.equals(resourceType)) {
- existingType = rt1;
- } else {
- throw new IllegalArgumentException("Existing ResourceType not found for " + resourceType);
- }
- }
+ updateResourceConfiguration(resourceType, existingType);
- // Type exists now, (if it didn't exist we'd fall through to the NSRE catch block and cascade persist everything
+ updateMeasurementDefinitions(resourceType, existingType);
- // first add/update any subcategories on the parent before trying to update children
- // if we didn't do this the children may try to save themselves with subcategories which
- // wouldn't exist yet
- updateChildSubCategories(resourceType, existingType);
+ updateContentDefinitions(resourceType, existingType);
- // update children next
- for (ResourceType childType : resourceType.getChildResourceTypes()) {
- updateType(childType);
- }
- entityManager.flush();
-
- // even though we've updated our child types to use new subcategory references, its still
- // not safe to delete the old sub categories yet, because we haven't yet deleted all of the old
- // child types which may still be referencing these sub categories
-
- // Update the rest of these related resources
- updatePluginConfiguration(resourceType, existingType);
- entityManager.flush();
-
- updateResourceConfiguration(resourceType, existingType);
-
- updateMeasurementDefinitions(resourceType, existingType);
-
- updateContentDefinitions(resourceType, existingType);
-
- updateOperationDefinitions(resourceType, existingType);
-
- updateProcessScans(resourceType, existingType);
-
- updateEventDefinitions(resourceType, existingType);
-
- // Update the type itself
- existingType.setDescription(resourceType.getDescription());
- existingType.setCreateDeletePolicy(resourceType.getCreateDeletePolicy());
- existingType.setCreationDataType(resourceType.getCreationDataType());
- existingType.setSingleton(resourceType.isSingleton());
- existingType.setSupportsManualAdd(resourceType.isSupportsManualAdd());
-
- /*
- * We need to be careful updating the subcategory. If it is not null and the same ("equals")
- * to the new one, we need to copy over the attributes, as the existing will be kept and
- * the new one not persisted. Otherwise, we can just use the new one.
- */
- ResourceSubCategory oldSubCat = existingType.getSubCategory();
- ResourceSubCategory newSubCat = resourceType.getSubCategory();
- if (oldSubCat != null && oldSubCat.equals(newSubCat)) {
- // Subcategory hasn't changed - nothing to do (call to addAndUpdateChildSubCategories()
- // above already took care of any modifications to the ResourceSubCategorys themselves).
- } else if (newSubCat == null) {
- if (oldSubCat != null) {
- log.debug("Metadata update: Subcategory of ResourceType [" + resourceType.getName()
- + "] changed from " + oldSubCat + " to " + newSubCat);
- existingType.setSubCategory(null);
- }
- } else {
- // New subcategory is non-null and not equal to the old subcategory.
- ResourceSubCategory existingSubCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor(
- existingType, newSubCat.getName());
- if (existingSubCat == null)
- throw new IllegalStateException("Resource type [" + resourceType.getName() + "] in plugin ["
- + resourceType.getPlugin() + "] has a subcategory (" + newSubCat.getName()
- + ") which was not defined as a child subcategory of one of its ancestor resource types.");
- log.debug("Metadata update: Subcategory of ResourceType [" + resourceType.getName() + "] changed from "
- + oldSubCat + " to " + existingSubCat);
- existingType.setSubCategory(existingSubCat);
- }
+ updateOperationDefinitions(resourceType, existingType);
- existingType = entityManager.merge(existingType);
- entityManager.flush();
- } catch (NoResultException nre) {
- /*
- * If the type didn't exist then we'll persist here which will cascade through
- * all child types as well as plugin and resource configs and their delegate types and
- * metric and operation definitions and their dependent types
- *
- * But first do some validity checking
- */
-
- // Check if the subcategories as children of resourceType are valid
- // Those are the subtacegories we offer for children of us
- checkForValidSubcategories(resourceType.getChildSubCategories());
-
- // Check if we have a subcategory attached that needs to be linked to one of the parents
- // This is a subcategory of our parent where we are supposed to be grouped in.
- linkSubCategoryToParents(resourceType);
-
- if (log.isDebugEnabled())
- log.debug("Persisting new ResourceType: " + resourceType);
- entityManager.persist(resourceType);
- } catch (NonUniqueResultException nure) {
- log.debug("Found more than one existing ResourceType for " + resourceType);
- throw new IllegalStateException(nure);
+ updateProcessScans(resourceType, existingType);
+
+ updateEventDefinitions(resourceType, existingType);
+
+ // Update the type itself
+ existingType.setDescription(resourceType.getDescription());
+ existingType.setCreateDeletePolicy(resourceType.getCreateDeletePolicy());
+ existingType.setCreationDataType(resourceType.getCreationDataType());
+ existingType.setSingleton(resourceType.isSingleton());
+ existingType.setSupportsManualAdd(resourceType.isSupportsManualAdd());
+
+ // We need to be careful updating the subcategory. If it is not null and the same ("equals")
+ // to the new one, we need to copy over the attributes, as the existing will be kept and
+ // the new one not persisted. Otherwise, we can just use the new one.
+ ResourceSubCategory oldSubCat = existingType.getSubCategory();
+ ResourceSubCategory newSubCat = resourceType.getSubCategory();
+ if (oldSubCat != null && oldSubCat.equals(newSubCat)) {
+ // Subcategory hasn't changed - nothing to do (call to addAndUpdateChildSubCategories()
+ // above already took care of any modifications to the ResourceSubCategories themselves).
+ } else if (newSubCat == null) {
+ if (oldSubCat != null) {
+ log.debug("Metadata update: Subcategory of ResourceType [" + resourceType.getName()
+ + "] changed from " + oldSubCat + " to " + newSubCat);
+ existingType.setSubCategory(null);
+ }
+ } else {
+ // New subcategory is non-null and not equal to the old subcategory.
+ ResourceSubCategory existingSubCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor(
+ existingType, newSubCat.getName());
+ if (existingSubCat == null)
+ throw new IllegalStateException("Resource type [" + resourceType.getName() + "] in plugin ["
+ + resourceType.getPlugin() + "] has a subcategory (" + newSubCat.getName()
+ + ") which was not defined as a child subcategory of one of its ancestor resource types.");
+ log.debug("Metadata update: Subcategory of ResourceType [" + resourceType.getName() + "] changed from "
+ + oldSubCat + " to " + existingSubCat);
+ existingType.setSubCategory(existingSubCat);
}
+
+ existingType = entityManager.merge(existingType);
+ entityManager.flush();
}
- private void linkSubCategoryToParents(ResourceType resourceType) {
+ private void persistNewType(ResourceType resourceType) {
+ log.info("Persisting new type [" + resourceType + "]...");
+ // If the type didn't exist then we'll persist here which will cascade through
+ // all child types as well as plugin and resource configs and their delegate types and
+ // metric and operation definitions and their dependent types,
+ // but first do some validity checking.
+
+ // Check if the subcategories as children of resourceType are valid
+ // Those are the subcategories we offer for children of us
+ checkForValidSubcategories(resourceType.getChildSubCategories());
- if (resourceType.getSubCategory() == null)
+ // Check if we have a subcategory attached that needs to be linked to one of the parents
+ // This is a subcategory of our parent where we are supposed to be grouped in.
+ linkSubCategoryToParents(resourceType);
+
+ entityManager.persist(resourceType);
+ entityManager.flush();
+ }
+
+ private void linkSubCategoryToParents(ResourceType resourceType) {
+ if (resourceType.getSubCategory() == null) {
return; // Nothing to do
+ }
ResourceSubCategory mySubCategory = resourceType.getSubCategory();
ResourceSubCategory existingCat = SubCategoriesMetadataParser.findSubCategoryOnResourceTypeAncestor(
resourceType, mySubCategory.getName());
- if (existingCat != null)
+ if (existingCat != null) {
resourceType.setSubCategory(existingCat);
- else
+ } else {
throw new IllegalStateException("Subcategory " + mySubCategory.getName() + " defined on resource type "
+ resourceType.getName() + " in plugin " + resourceType.getPlugin()
+ " is not defined in a parent type");
-
+ }
}
- private void updateParentResourceTypes(ResourceType resourceType, ResourceType existingType) {
- Set<ResourceType> types = new HashSet<ResourceType>(resourceType.getParentResourceTypes());
- resourceType.setParentResourceTypes(new HashSet<ResourceType>());
- for (ResourceType resourceTypeParent : types) {
+ private void updateParentResourceTypes(ResourceType newType, ResourceType existingType) {
+ Set<ResourceType> newParentTypes = newType.getParentResourceTypes();
+ log.info("Setting parent types on type: " + ((existingType != null) ? existingType : newType )
+ + " to [" + newParentTypes + "]...");
+ newType.setParentResourceTypes(new HashSet<ResourceType>());
+ Set<ResourceType> originalExistingParentTypes = new HashSet<ResourceType>();
+ if (existingType != null) {
+ originalExistingParentTypes.addAll(existingType.getParentResourceTypes());
+ }
+ for (ResourceType newParentType : newParentTypes) {
try {
- ResourceType realParentType = (ResourceType) entityManager.createNamedQuery(
- ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN).setParameter("name", resourceTypeParent.getName())
- .setParameter("plugin", resourceTypeParent.getPlugin()).getSingleResult();
- realParentType.addChildResourceType(existingType != null ? existingType : resourceType);
+ boolean parentNew = existingType == null || !originalExistingParentTypes.remove(newParentType) ;
+ if (parentNew) {
+ ResourceType realParentType = (ResourceType) entityManager.createNamedQuery(
+ ResourceType.QUERY_FIND_BY_NAME_AND_PLUGIN).setParameter("name", newParentType.getName())
+ .setParameter("plugin", newParentType.getPlugin()).getSingleResult();
+ ResourceType type = (existingType != null) ? existingType : newType;
+ log.info("Adding type [" + type + "] as child of type [" + realParentType + "]...");
+ realParentType.addChildResourceType(type);
+ }
} catch (NoResultException nre) {
- throw new RuntimeException("Couldn't persist type [" + resourceType
- + "] because parent wasn't already persisted [" + resourceTypeParent + "]");
+ throw new RuntimeException("Couldn't persist type [" + newType
+ + "] because parent [" + newParentType + "] wasn't already persisted.");
+ }
+ }
+
+ for (ResourceType obsoleteParentType : originalExistingParentTypes) {
+ log.info("Removing type [" + existingType + "] from parent type [" + obsoleteParentType + "]...");
+ obsoleteParentType.removeChildResourceType(existingType);
+ moveResourcesToNewParent(existingType, obsoleteParentType, newParentTypes);
+ }
+
+ entityManager.flush();
+ }
+
+ private void moveResourcesToNewParent(ResourceType existingType, ResourceType obsoleteParentType, Set<ResourceType> newParentTypes) {
+ Subject overlord = subjectManager.getOverlord();
+ ResourceCriteria criteria = new ResourceCriteria();
+ criteria.addFilterResourceTypeId(existingType.getId());
+ criteria.addFilterParentResourceTypeId(obsoleteParentType.getId());
+ List<Resource> resources = resourceManager.findResourcesByCriteria(overlord, criteria);
+ for (Resource resource : resources) {
+ Resource newParent = null;
+ newParentTypes:
+ for (ResourceType newParentType : newParentTypes) {
+ Resource ancestorResource = resource.getParentResource();
+ while (ancestorResource != null) {
+ if (ancestorResource.getResourceType().equals(newParentType)) {
+ // We found an ancestor to be the new parent of our orphaned Resource.
+ newParent = ancestorResource;
+ break newParentTypes;
+ }
+ ancestorResource = ancestorResource.getParentResource();
+ }
+ for (Resource childResource : resource.getChildResources()) {
+ if (childResource.getResourceType().equals(newParentType)) {
+ // We found a child to be the new parent of our orphaned Resource.
+ newParent = childResource;
+ break newParentTypes;
+ }
+ }
+ }
+ if (newParent != null) {
+ if (resource.getParentResource() != null) {
+ resource.getParentResource().removeChildResource(resource);
+ }
+ newParent.addChildResource(resource);
+ } else {
+ log.warn("We were unable to move " + resource + " from invalid parent " + resource.getParentResource()
+ + " to a new valid parent with one of the following types: " + newParentTypes);
}
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java
index 646c661..bda11e9 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
*/
package org.rhq.enterprise.server.resource.metadata.test;
-import java.util.Iterator;
import java.util.Set;
import javax.persistence.EntityManager;
@@ -31,7 +30,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.resource.ResourceType;
/**
- * Note, plugins are registered in new transactions. for tests, this means
+ * Note, plugins are registered in new transactions. For tests, this means
* you can't do everything in a trans and roll back at the end. You must clean up manually.
*/
public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
@@ -44,7 +43,7 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
/**
* See if deletion of a resource type just works
*
- * @throws Exception
+ * @throws Exception on error
*/
@Test
public void testResourceTypeDeletion() throws Exception {
@@ -113,16 +112,18 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
try {
cleanupTest();
} catch (Exception e) {
- System.out.println("CANNNOT CLEAN UP TEST: " + this.getClass().getSimpleName()
+ System.out.println("CANNOT CLEAN UP TEST: " + this.getClass().getSimpleName()
+ ".testResourceTypeDeletion");
}
}
}
- // TODO: Fix ResourceType move in the code and then re-enable this test.
- //@Test
- public void testMoveResoureType() throws Exception {
- System.out.println("testUpdatePlugin2 --- start");
+ @Test
+ /**
+ * Tests moving a resource type to a new parent resource type.
+ */
+ public void testMoveResourceType() throws Exception {
+ System.out.println("testMoveResourceType --- start");
try {
registerPlugin("update2-v1_0.xml");
ResourceType platform1 = getResourceType("myPlatform");
@@ -149,7 +150,7 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
int definitionId = defThree.getId(); // get the id of the definition "Three" and save it for later use
getTransactionManager().rollback();
- System.out.println("testUpdatePlugin2 -- done with the first plugin version");
+ System.out.println("testMoveResourceType -- done with the first plugin version");
/*
* The nested service got pulled out and put under platform
@@ -168,9 +169,7 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
// two children in v2
Set<ResourceType> platformChildren2 = platform2.getChildResourceTypes();
assert platformChildren2.size() == 2 : "Expected 2 direct child services of platform in v2";
- Iterator<ResourceType> iter = platformChildren2.iterator();
- while (iter.hasNext()) {
- ResourceType type = iter.next();
+ for (ResourceType type : platformChildren2) {
String typeName = type.getName();
assert type.getMetricDefinitions().size() == 1 : "Expected one definition for " + typeName + " in v2";
if (typeName.equals("nestedOne")) // The moved one
@@ -178,23 +177,21 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
Set<MeasurementDefinition> defs3 = type.getMetricDefinitions();
MeasurementDefinition three = defs3.iterator().next();
assert three.getDisplayName().equals("Three") : "Expected the nestedOne to have a metric withDisplayName Three in v2, but it was "
- + three.getDisplayName();
+ + three.getDisplayName();
assert three.getDisplayType() == DisplayType.SUMMARY : "Expected three to be SUMMARY in v2";
/*
* TODO check here if the Definition is the one from above which got moved. this should be the case.
- * Else we would loose all measurment schedules (and disociate them from measurement data. But the
- * later is a different story. We probably should cascade that anyway.
+ * Else we would loose all measurement schedules (and disassociate them from measurement data. But the
+ * latter is a different story. We probably should cascade that anyway.
*/
- System.out.println("Expected the id of 'Three' to be " + definitionId + " but it was "
- + three.getId() + " in v2");
assert three.getId() == definitionId : "Expected the id of 'Three' to be " + definitionId
- + " but it was " + three.getId() + " in v2";
+ + " but it was " + three.getId() + " in v2";
} else if (typeName.equals("service1")) {
// check that the nested service is gone
Set<ResourceType> childrenOfService = type.getChildResourceTypes();
assert childrenOfService.size() == 0 : "No children of 'service1' expected in v2, but found: "
- + childrenOfService.size();
+ + childrenOfService.size();
} else {
assert true == false : "We found an unknown type with name " + typeName;
}
@@ -209,23 +206,23 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
cleanupTest();
} catch (Exception e) {
System.out
- .println("CANNNOT CLEAN UP TEST: " + this.getClass().getSimpleName() + ".testMoveResoureType");
+ .println("CANNOT CLEAN UP TEST: " + this.getClass().getSimpleName() + ".testMoveResourceType");
}
}
- System.out.println("testUpdatePlugin2 --- end");
+ System.out.println("testMoveResourceType --- end");
}
@Test
public void testDuplicateResourceType() throws Exception {
System.out.println("= testDuplicateResourceType");
try {
- System.out.println(" A stack trace coming out of this is expected");
+ System.out.println("NOTE: A stack trace coming out of this is expected.");
registerPlugin("duplicateResourceType.xml");
getResourceType("ops");
assert false : "We should not have hit this line";
} catch (Exception e) {
- ; // We expect an exception to come out of the ResourceMetadataManager
+ // ignore - We expect an exception to come out of the ResourceMetadataManager
} finally {
if (Status.STATUS_NO_TRANSACTION != getTransactionManager().getStatus()) {
getTransactionManager().rollback();
@@ -233,7 +230,7 @@ public class UpdateResourceTypeSubsystemTest extends UpdateSubsytemTestBase {
try {
cleanupTest();
} catch (Exception e) {
- System.out.println("CANNNOT CLEAN UP TEST: " + this.getClass().getSimpleName()
+ System.out.println("CANNOT CLEAN UP TEST: " + this.getClass().getSimpleName()
+ ".testDuplicateResourceType");
}
}
diff --git a/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml b/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
index 559e38d..143984d 100644
--- a/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
+++ b/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.B04</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
@@ -24,7 +24,7 @@
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/jopr/tools/jbas5-plu…</developerConnection>
</scm>
- <properties>
+ <properties>
<jbossas.version>6.0.0.M1</jbossas.version>
</properties>
@@ -58,15 +58,30 @@
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-domain</artifactId>
- <version>${rhq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-client-api</artifactId>
- <version>${rhq.version}</version>
+ <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
+ <groupId>hibernate-annotations</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagemen
+t section. -->
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java b/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
index a4df7ba..7551e42 100644
--- a/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
+++ b/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
@@ -105,8 +105,8 @@ public class PluginDescriptorGenerator
public static void main(String[] args) throws Exception
{
String namingURL = "jnp://127.0.0.1:1099/";
- String principal = null;
- String credentials = null;
+ String principal = "admin";
+ String credentials = "admin";
ProfileServiceConnectionProvider connectionProvider =
new RemoteProfileServiceConnectionProvider(namingURL, principal, credentials);
ProfileServiceConnection connection = connectionProvider.connect();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java
index b436302..bde5b37 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java
@@ -47,7 +47,7 @@ public abstract class AbstractManagedComponent implements ProfileServiceComponen
return;
}
- protected ResourceContext<ProfileServiceComponent> getResourceContext()
+ public ResourceContext<ProfileServiceComponent> getResourceContext()
{
return this.resourceContext;
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
index 739d833..e4a0ec9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java
@@ -102,6 +102,7 @@ import org.rhq.plugins.jbossas5.connection.RemoteProfileServiceConnectionProvide
import org.rhq.plugins.jbossas5.deploy.Deployer;
import org.rhq.plugins.jbossas5.deploy.LocalDeployer;
import org.rhq.plugins.jbossas5.deploy.RemoteDeployer;
+import org.rhq.plugins.jbossas5.helper.CreateChildResourceFacetDelegate;
import org.rhq.plugins.jbossas5.helper.JBossAS5ConnectionTypeDescriptor;
import org.rhq.plugins.jbossas5.helper.JmxConnectionHelper;
import org.rhq.plugins.jbossas5.helper.InPluginControlActionFacade;
@@ -122,8 +123,6 @@ import com.jboss.jbossnetwork.product.jbpm.handlers.ControlActionFacade;
public class ApplicationServerComponent implements ResourceComponent, ProfileServiceComponent,
CreateChildResourceFacet, MeasurementFacet, ConfigurationFacet, ProgressListener, ContentFacet, OperationFacet {
- private static final String MANAGED_PROPERTY_GROUP = "managedPropertyGroup";
-
private static final Pattern METRIC_NAME_PATTERN = Pattern.compile("(.*)\\|(.*)\\|(.*)\\|(.*)");
public static final Map<String, String> NEW_PROPERTY_NAMES = new HashMap<String, String>();
@@ -142,6 +141,7 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer
private ApplicationServerContentFacetDelegate contentFacetDelegate;
private ApplicationServerOperationsDelegate operationDelegate;
private LogFileEventResourceComponentHelper logFileEventDelegate;
+ private CreateChildResourceFacetDelegate createChildResourceDelegate;
private AvailabilityCollectorRunnable availCollector;
@@ -205,6 +205,8 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer
this.contentFacetDelegate = new ApplicationServerContentFacetDelegate(workflowManager, configPath,
resourceContext.getContentContext());
+ this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this);
+
// prepare to perform async avail checking
Configuration pc = resourceContext.getPluginConfiguration();
String availCheckPeriodProp = pc.getSimpleValue(ApplicationServerPluginConfigurationProperties.AVAIL_CHECK_PERIOD_CONFIG_PROP, null);
@@ -330,13 +332,7 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer
// CreateChildResourceFacet --------------------------------------------
public CreateResourceReport createResource(CreateResourceReport createResourceReport) {
- // ProfileServiceFactory.refreshCurrentProfileView();
- ResourceType resourceType = createResourceReport.getResourceType();
- if (resourceType.getCreationDataType() == ResourceCreationDataType.CONTENT)
- createContentBasedResource(createResourceReport, resourceType);
- else
- createConfigurationBasedResource(createResourceReport, resourceType);
- return createResourceReport;
+ return this.createChildResourceDelegate.createResource(createResourceReport);
}
// ProgressListener --------------------------------------------
@@ -426,117 +422,6 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer
}
}
- private void handleMiscManagedProperties(Collection<PropertyDefinition> managedPropertyGroup,
- Map<String, ManagedProperty> managedProperties, Configuration pluginConfiguration) {
- for (PropertyDefinition propertyDefinition : managedPropertyGroup) {
- String propertyKey = propertyDefinition.getName();
- Property property = pluginConfiguration.get(propertyKey);
- ManagedProperty managedProperty = managedProperties.get(propertyKey);
- if (managedProperty != null && property != null) {
- PropertyAdapter propertyAdapter = PropertyAdapterFactory.getPropertyAdapter(managedProperty
- .getMetaType());
- propertyAdapter.populateMetaValueFromProperty(property, managedProperty.getValue(), propertyDefinition);
- }
- }
- }
-
- private static String getComponentName(Configuration pluginConfig, Configuration resourceConfig) {
- PropertySimple componentNameProp =
- pluginConfig.getSimple(ManagedComponentComponent.Config.COMPONENT_NAME_PROPERTY);
- if (componentNameProp == null || componentNameProp.getStringValue() == null) {
- throw new IllegalStateException("Property [" + ManagedComponentComponent.Config.COMPONENT_NAME_PROPERTY
- + "] is not defined in the default plugin configuration.");
- }
- String componentNamePropName = componentNameProp.getStringValue();
- PropertySimple propToUseAsComponentName = resourceConfig.getSimple(componentNamePropName);
- if (propToUseAsComponentName == null) {
- throw new IllegalStateException("Property [" + componentNamePropName
- + "] is not defined in user-specified initial Resource configuration.");
- }
- return propToUseAsComponentName.getStringValue();
- }
-
- private void createConfigurationBasedResource(CreateResourceReport createResourceReport, ResourceType resourceType) {
- Configuration defaultPluginConfig = getDefaultPluginConfiguration(resourceType);
- Configuration resourceConfig = createResourceReport.getResourceConfiguration();
- String componentName = getComponentName(defaultPluginConfig, resourceConfig);
- ComponentType componentType = ConversionUtils.getComponentType(resourceType);
- ManagementView managementView = getConnection().getManagementView();
- if (ManagedComponentUtils.isManagedComponent(managementView, componentName, componentType)) {
- createResourceReport.setStatus(CreateResourceStatus.FAILURE);
- createResourceReport.setErrorMessage("A " + resourceType.getName() + " named '" + componentName
- + "' already exists.");
- return;
- }
-
- // The PC doesn't use the Resource name or key for anything, but set them anyway to make it happy.
- createResourceReport.setResourceName(componentName);
- createResourceReport.setResourceKey(componentName);
-
- PropertySimple templateNameProperty = defaultPluginConfig
- .getSimple(ManagedComponentComponent.Config.TEMPLATE_NAME);
- String templateName = templateNameProperty.getStringValue();
-
- DeploymentTemplateInfo template;
- try {
- template = managementView.getTemplate(templateName);
- Map<String, ManagedProperty> managedProperties = template.getProperties();
- Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(defaultPluginConfig);
-
- if (log.isDebugEnabled())
- log.debug("BEFORE CREATE:\n" + DebugUtils.convertPropertiesToString(template));
- ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, resourceType,
- customProps);
- if (log.isDebugEnabled())
- log.debug("AFTER CREATE:\n" + DebugUtils.convertPropertiesToString(template));
-
- ConfigurationDefinition pluginConfigDef = resourceType.getPluginConfigurationDefinition();
- Collection<PropertyDefinition> managedPropertyGroup = pluginConfigDef
- .getPropertiesInGroup(MANAGED_PROPERTY_GROUP);
- handleMiscManagedProperties(managedPropertyGroup, managedProperties, defaultPluginConfig);
- log.debug("Applying template [" + templateName + "] to create ManagedComponent of type [" + componentType
- + "]...");
- try {
- managementView.applyTemplate(componentName, template);
- managementView.process();
- createResourceReport.setStatus(CreateResourceStatus.SUCCESS);
- } catch (Exception e) {
- log.error("Unable to apply template [" + templateName + "] to create ManagedComponent of type "
- + componentType + ".", e);
- createResourceReport.setStatus(CreateResourceStatus.FAILURE);
- createResourceReport.setException(e);
- }
- } catch (NoSuchDeploymentException e) {
- log.error("Unable to find template [" + templateName + "].", e);
- createResourceReport.setStatus(CreateResourceStatus.FAILURE);
- createResourceReport.setException(e);
- } catch (Exception e) {
- log.error("Unable to process create request", e);
- createResourceReport.setStatus(CreateResourceStatus.FAILURE);
- createResourceReport.setException(e);
- }
- }
-
- private void createContentBasedResource(CreateResourceReport createResourceReport, ResourceType resourceType) {
- getDeployer().deploy(createResourceReport, resourceType);
- }
-
- private Deployer getDeployer() {
- ProfileServiceConnection profileServiceConnection = getConnection();
- if (runningEmbedded()) {
- return new LocalDeployer(profileServiceConnection);
- } else {
- return new RemoteDeployer(profileServiceConnection, this.resourceContext);
- }
- }
-
- private static Configuration getDefaultPluginConfiguration(ResourceType resourceType) {
- ConfigurationTemplate pluginConfigDefaultTemplate = resourceType.getPluginConfigurationDefinition()
- .getDefaultTemplate();
- return (pluginConfigDefaultTemplate != null) ? pluginConfigDefaultTemplate.createConfiguration()
- : new Configuration();
- }
-
@NotNull
private JBossASPaths getJBossASPaths() {
Configuration pluginConfiguration = this.resourceContext.getPluginConfiguration();
@@ -594,6 +479,7 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer
return propValue;
}
+ @NotNull
public ResourceContext getResourceContext() {
return this.resourceContext;
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
index c5eb7a9..c1457f0 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
@@ -94,6 +94,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
"common/lib/jboss-security-aspects.jar",
"lib/jboss-managed.jar",
"lib/jboss-metatype.jar",
+<<<<<<< HEAD
"lib/jboss-dependency.jar"
);
@@ -109,6 +110,13 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
AS6_CLIENT_JARS.add("lib/jboss-classpool.jar");
AS6_CLIENT_JARS.add("lib/jboss-classpool-scoped.jar");
}
+=======
+ "lib/jboss-dependency.jar",
+ // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
+ //"lib/jboss-classpool.jar",
+ //"lib/jboss-classpool-scoped.jar"
+ };
+>>>>>>> 2e1a8be... * add support for moving resourcetypes to new locations in the type hierarchy, as well as moving any existing resources of those types (https://bugzilla.redhat.com/show_bug.cgi?id=577055)
private final Log log = LogFactory.getLog(this.getClass());
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java
index c1bf979..c87a82f 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java
@@ -26,21 +26,21 @@ package org.rhq.plugins.jbossas5;
* @author Ian Springer
*/
public class ApplicationServerPluginConfigurationProperties {
- static final String SERVER_NAME = "serverName";
- static final String NAMING_URL = "namingURL";
- static final String PRINCIPAL = "principal";
- static final String CREDENTIALS = "credentials";
- static final String HOME_DIR = "homeDir";
- static final String SERVER_HOME_DIR = "serverHomeDir";
- static final String JAVA_HOME = "javaHome";
- static final String BIND_ADDRESS = "bindAddress";
- static final String START_SCRIPT_CONFIG_PROP = "startScript";
- static final String SHUTDOWN_SCRIPT_CONFIG_PROP = "shutdownScript";
- static final String SHUTDOWN_MBEAN_CONFIG_PROP = "shutdownMBeanName";
- static final String SHUTDOWN_MBEAN_OPERATION_CONFIG_PROP = "shutdownMBeanOperation";
- static final String SHUTDOWN_METHOD_CONFIG_PROP = "shutdownMethod";
- static final String SCRIPT_PREFIX_CONFIG_PROP = "scriptPrefix";
- static final String AVAIL_CHECK_PERIOD_CONFIG_PROP = "availabilityCheckPeriod";
+ public static final String SERVER_NAME = "serverName";
+ public static final String NAMING_URL = "namingURL";
+ public static final String PRINCIPAL = "principal";
+ public static final String CREDENTIALS = "credentials";
+ public static final String HOME_DIR = "homeDir";
+ public static final String SERVER_HOME_DIR = "serverHomeDir";
+ public static final String JAVA_HOME = "javaHome";
+ public static final String BIND_ADDRESS = "bindAddress";
+ public static final String START_SCRIPT_CONFIG_PROP = "startScript";
+ public static final String SHUTDOWN_SCRIPT_CONFIG_PROP = "shutdownScript";
+ public static final String SHUTDOWN_MBEAN_CONFIG_PROP = "shutdownMBeanName";
+ public static final String SHUTDOWN_MBEAN_OPERATION_CONFIG_PROP = "shutdownMBeanOperation";
+ public static final String SHUTDOWN_METHOD_CONFIG_PROP = "shutdownMethod";
+ public static final String SCRIPT_PREFIX_CONFIG_PROP = "scriptPrefix";
+ public static final String AVAIL_CHECK_PERIOD_CONFIG_PROP = "availabilityCheckPeriod";
private ApplicationServerPluginConfigurationProperties() {
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
new file mode 100644
index 0000000..af47587
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java
@@ -0,0 +1,70 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbossas5;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
+import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.plugins.jbossas5.helper.CreateChildResourceFacetDelegate;
+
+import java.util.Set;
+
+/**
+ * The ResourceComponent for the singleton JBoss Messaging ResourceType, which supports creation of two child
+ * ResourceTypes - Queue and Topic.
+ *
+ * @author Ian Springer
+ */
+public class JBossMessagingComponent extends ManagedComponentComponent
+ implements CreateChildResourceFacet, MeasurementFacet {
+ private CreateChildResourceFacetDelegate createChildResourceDelegate;
+
+ public AvailabilityType getAvailability() {
+ return super.getAvailability();
+ }
+
+ public void start(ResourceContext resourceContext) throws Exception {
+ super.start(resourceContext);
+ this.createChildResourceDelegate = new CreateChildResourceFacetDelegate(this);
+ }
+
+ public void stop() {
+ super.stop();
+ }
+
+ // MeasurementFacet ---------------------------------------------------
+
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ super.getValues(report, requests);
+ }
+
+ // CreateChildResourceFacet --------------------------------------------
+
+ public CreateResourceReport createResource(CreateResourceReport createResourceReport) {
+ return this.createChildResourceDelegate.createResource(createResourceReport);
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java
new file mode 100644
index 0000000..a88ac44
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java
@@ -0,0 +1,55 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbossas5;
+
+import org.jboss.managed.api.ManagedComponent;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jbossas5.util.ManagedComponentUtils;
+
+import java.util.Set;
+
+/**
+ * The ResourceDiscoveryComponent for the singleton JBoss Messaging ResourceType.
+ *
+ * @author Ian Springer
+ */
+public class JBossMessagingDiscoveryComponent extends ManagedComponentDiscoveryComponent<ApplicationServerComponent> {
+ private static final String DEFAULT_RESOURCE_NAME = "JBoss Messaging";
+
+ @Override
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<ApplicationServerComponent> discoveryContext)
+ throws Exception {
+ return super.discoverResources(discoveryContext);
+ }
+
+ @Override
+ protected String getResourceName(ManagedComponent component) {
+ return DEFAULT_RESOURCE_NAME;
+ }
+
+ @Override
+ protected String getResourceVersion(ManagedComponent component) {
+ return (String)ManagedComponentUtils.getSimplePropertyValue(component, "providerVersion");
+ }
+}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java
index 6aec8be..9ac7274 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java
@@ -22,6 +22,7 @@
*/
package org.rhq.plugins.jbossas5;
+import org.jetbrains.annotations.NotNull;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
@@ -51,6 +52,11 @@ public class JBossWebComponent implements ProfileServiceComponent<ProfileService
return AvailabilityType.UP;
}
+ @NotNull
+ public ResourceContext<ProfileServiceComponent> getResourceContext() {
+ return this.resourceContext;
+ }
+
public ProfileServiceConnection getConnection()
{
return this.resourceContext.getParentResourceComponent().getConnection();
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
index 4ee766f..a0a62ea 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java
@@ -1,150 +1,169 @@
-/*
-* Jopr Management Platform
-* Copyright (C) 2005-2009 Red Hat, Inc.
-* All rights reserved.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License, version 2, as
-* published by the Free Software Foundation, and/or the GNU Lesser
-* General Public License, version 2.1, also as published by the Free
-* Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License and the GNU Lesser General Public License
-* for more details.
-*
-* You should have received a copy of the GNU General Public License
-* and the GNU Lesser General Public License along with this program;
-* if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-package org.rhq.plugins.jbossas5;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
-import org.jboss.managed.api.ManagedComponent;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.plugins.jbossas5.util.ConversionUtils;
-
-/**
- * Discovery component for ManagedComponents exposed by the JBoss AS 5.x Profile Service that will be represented as
- * child Resources of the JBoss AS Resource.
- *
- * @author Jason Dobies
- * @author Mark Spritzer
- * @author Ian Springer
- */
-public class ManagedComponentDiscoveryComponent<P extends ProfileServiceComponent> implements
- ResourceDiscoveryComponent<P> {
- private final Log log = LogFactory.getLog(this.getClass());
-
- public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<P> discoveryContext)
- throws Exception {
- ResourceType resourceType = discoveryContext.getResourceType();
- log.trace("Discovering " + resourceType.getName() + " Resources...");
-
- ManagementView managementView = discoveryContext.getParentResourceComponent().getConnection()
- .getManagementView();
- // TODO (ips): Only refresh the ManagementView *once* per runtime discovery scan, rather than every time this
- // method is called. Do this by providing a runtime scan id in the ResourceDiscoveryContext.
- managementView.load();
-
- ComponentType componentType = getComponentType(discoveryContext);
- Set<ManagedComponent> components;
- try {
- components = managementView.getComponentsForType(componentType);
- } catch (Exception e) {
- throw new IllegalStateException("Failed to get component types for " + resourceType + ".", e);
- }
-
- Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>(components.size());
- /* Create a resource for each managed component found. We know all managed components will be of a
- type we're interested in, so we can just add them all. There may be need for multiple iterations
- over lists retrieved from different component types, but that is possible through the current API.
- */
- for (ManagedComponent component : components) {
- if (accept(discoveryContext, component)) {
- String resourceName = getResourceName(component);
- if (resourceName == null) {
- resourceName = component.getName();
- }
- String resourceKey = getResourceKey(component);
- if (resourceKey == null) {
- resourceKey = component.getName();
- }
- String version = null; // (ips) I don't think there's anything generic we can do here.
-
- DiscoveredResourceDetails resource = new DiscoveredResourceDetails(resourceType, resourceKey,
- resourceName, version, resourceType.getDescription(), discoveryContext
- .getDefaultPluginConfiguration(), null);
-
- resource.getPluginConfiguration().put(
- new PropertySimple(ManagedComponentComponent.Config.COMPONENT_NAME, resourceKey));
-
- discoveredResources.add(resource);
- }
- }
-
- log.trace("Discovered " + discoveredResources.size() + " " + resourceType.getName() + " Resources.");
- return discoveredResources;
- }
-
- protected ComponentType getComponentType(ResourceDiscoveryContext<P> discoveryContext) {
- ResourceType resourceType = discoveryContext.getResourceType();
- return ConversionUtils.getComponentType(resourceType);
- }
-
- /**
- * Subclasses can override this method if they don't want to use the ManagedComponent name as the initial
- * Resource name.
- *
- * @param component the ManagedComponent being discovered
- * @return the name to be assigned to the corresponding Resource
- */
- protected String getResourceName(ManagedComponent component) {
- return component.getName();
- }
-
- /**
- * Return the unique resource key for the component.
- * If you override this method, make sure to override
- * {@link ManagedComponentComponent#getManagedComponent()} method as well
- * because the return value of this method is used as the component name
- * ({@link ManagedComponentComponent#getComponentName()}).
- *
- * @param component the component to uniquely identify
- * @return the unique identifier for the component
- */
- protected String getResourceKey(ManagedComponent component) {
- return component.getName();
- }
-
- /**
- * This method is called during {@link #discoverResources(ResourceDiscoveryContext)} to determine
- * whether given component that has been found in the management view by this component's configured
- * component type is applicable in the discovery context.
- * <p>
- * Because the Profile Service doesn't always provide the components in a hierarchy we present the resources
- * we need this method to filter the components into their appropriate places.
- * <p>
- * This default implementation always returns true.
- *
- * @param discoveryContext the current discovery context
- * @param component the discovered component
- * @return true if the component logically belongs in the context, false otherwise.
- */
- protected boolean accept(ResourceDiscoveryContext<P> discoveryContext, ManagedComponent component) {
- return true;
- }
-}
+/*
+* Jopr Management Platform
+* Copyright (C) 2005-2010 Red Hat, Inc.
+* All rights reserved.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License, version 2, as
+* published by the Free Software Foundation, and/or the GNU Lesser
+* General Public License, version 2.1, also as published by the Free
+* Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License and the GNU Lesser General Public License
+* for more details.
+*
+* You should have received a copy of the GNU General Public License
+* and the GNU Lesser General Public License along with this program;
+* if not, write to the Free Software Foundation, Inc.,
+* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+package org.rhq.plugins.jbossas5;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jbossas5.util.ConversionUtils;
+
+/**
+ * Discovery component for ManagedComponents exposed by the JBoss AS 5.x Profile Service that will be represented as
+ * child Resources of the JBoss AS Resource.
+ *
+ * @author Jason Dobies
+ * @author Mark Spritzer
+ * @author Ian Springer
+ */
+public class ManagedComponentDiscoveryComponent<P extends ProfileServiceComponent> implements
+ ResourceDiscoveryComponent<P> {
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<P> discoveryContext)
+ throws Exception {
+ ResourceType resourceType = discoveryContext.getResourceType();
+ log.trace("Discovering " + resourceType.getName() + " Resources...");
+
+ ManagementView managementView = discoveryContext.getParentResourceComponent().getConnection()
+ .getManagementView();
+ // TODO (ips): Only refresh the ManagementView *once* per runtime discovery scan, rather than every time this
+ // method is called. Do this by providing a runtime scan id in the ResourceDiscoveryContext.
+ managementView.load();
+
+ ComponentType componentType = getComponentType(discoveryContext);
+ Set<ManagedComponent> components;
+ try {
+ components = managementView.getComponentsForType(componentType);
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to get component types for " + resourceType + ".", e);
+ }
+ if (resourceType.isSingleton() && components.size() > 1) {
+ throw new IllegalStateException("Discovered multiple [" + componentType
+ + "] managed components during [" + resourceType
+ + "] discovery, but expected to find no more than one - components were: " + components);
+ }
+
+ Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>(components.size());
+ /* Create a resource for each managed component found. We know all managed components will be of a
+ type we're interested in, so we can just add them all. There may be need for multiple iterations
+ over lists retrieved from different component types, but that is possible through the current API.
+ */
+ for (ManagedComponent component : components) {
+ if (accept(discoveryContext, component)) {
+ String resourceName = getResourceName(component);
+ if (resourceName == null) {
+ resourceName = component.getName();
+ }
+ String resourceKey = getResourceKey(component);
+ if (resourceKey == null) {
+ resourceKey = component.getName();
+ }
+
+ String version = getResourceVersion(component);
+
+ DiscoveredResourceDetails resource = new DiscoveredResourceDetails(resourceType, resourceKey,
+ resourceName, version, resourceType.getDescription(), discoveryContext
+ .getDefaultPluginConfiguration(), null);
+
+ resource.getPluginConfiguration().put(
+ new PropertySimple(ManagedComponentComponent.Config.COMPONENT_NAME, resourceKey));
+
+ discoveredResources.add(resource);
+ }
+ }
+
+ log.trace("Discovered " + discoveredResources.size() + " " + resourceType.getName() + " Resources.");
+ return discoveredResources;
+ }
+
+ protected ComponentType getComponentType(ResourceDiscoveryContext<P> discoveryContext) {
+ ResourceType resourceType = discoveryContext.getResourceType();
+ return ConversionUtils.getComponentType(resourceType);
+ }
+
+ /**
+ * Subclasses can override this method if they don't want to use the ManagedComponent name as the initial
+ * Resource name.
+ *
+ * @param component the ManagedComponent being discovered
+ *
+ * @return the name to be assigned to the corresponding Resource
+ */
+ protected String getResourceName(ManagedComponent component) {
+ return component.getName();
+ }
+
+ /**
+ * Return the unique resource key for the component.
+ * If you override this method, make sure to override
+ * {@link ManagedComponentComponent#getManagedComponent()} method as well
+ * because the return value of this method is used as the component name
+ * ({@link ManagedComponentComponent#getComponentName()}).
+ *
+ * @param component the component to uniquely identify
+ *
+ * @return the unique identifier for the component
+ */
+ protected String getResourceKey(ManagedComponent component) {
+ return component.getName();
+ }
+
+ /**
+ * Subclasses can override this method if they want the discovered ManagedComponent to have a version.
+ *
+ * @param component the ManagedComponent being discovered
+ *
+ * @return the version to be assigned to the corresponding Resource
+ */
+ protected String getResourceVersion(ManagedComponent component) {
+ return null;
+ }
+
+ /**
+ * This method is called during {@link #discoverResources(ResourceDiscoveryContext)} to determine
+ * whether given component that has been found in the management view by this component's configured
+ * component type is applicable in the discovery context.
+ * <p>
+ * Because the Profile Service doesn't always provide the components in a hierarchy we present the resources
+ * we need this method to filter the components into their appropriate places.
+ * <p>
+ * This default implementation always returns true.
+ *
+ * @param discoveryContext the current discovery context
+ * @param component the discovered component
+ * @return true if the component logically belongs in the context, false otherwise.
+ */
+ protected boolean accept(ResourceDiscoveryContext<P> discoveryContext, ManagedComponent component) {
+ return true;
+ }
+}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java
index 1560520..2c8e6d9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java
@@ -16,6 +16,7 @@ import org.jboss.managed.api.ManagedProperty;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
+import org.jetbrains.annotations.NotNull;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.DataType;
@@ -44,7 +45,6 @@ import org.mc4j.ems.connection.EmsConnection;
public class PlatformComponent implements
ProfileServiceComponent<ProfileServiceComponent>, MeasurementFacet,
OperationFacet, ConfigurationFacet {
-
private final Log log = LogFactory.getLog(this.getClass());
private ResourceContext<ProfileServiceComponent> context;
private String deployName;
@@ -59,11 +59,15 @@ public class PlatformComponent implements
}
public void stop() {
- // TODO Auto-generated method stub
-
+ return;
}
- public ProfileServiceConnection getConnection() {
+ @NotNull
+ public ResourceContext<ProfileServiceComponent> getResourceContext() {
+ return this.context;
+ }
+
+ public ProfileServiceConnection getConnection() {
ApplicationServerComponent component = (ApplicationServerComponent) context
.getParentResourceComponent();
return component.getConnection();
@@ -272,5 +276,4 @@ public class PlatformComponent implements
}
return null;
}
-
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java
index f08f143..4e13a96 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java
@@ -22,9 +22,11 @@
*/
package org.rhq.plugins.jbossas5;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
import org.rhq.plugins.jmx.JMXComponent;
@@ -34,4 +36,7 @@ import org.rhq.plugins.jmx.JMXComponent;
public interface ProfileServiceComponent<T extends ResourceComponent> extends ResourceComponent<T>, JMXComponent<T> {
@Nullable
ProfileServiceConnection getConnection();
+
+ @NotNull
+ ResourceContext<T> getResourceContext();
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java
new file mode 100644
index 0000000..c03b435
--- /dev/null
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java
@@ -0,0 +1,180 @@
+package org.rhq.plugins.jbossas5.helper;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.deployers.spi.management.ManagementView;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.DeploymentTemplateInfo;
+import org.jboss.managed.api.ManagedProperty;
+import org.jboss.profileservice.spi.NoSuchDeploymentException;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
+import org.rhq.core.domain.configuration.definition.PropertyDefinition;
+import org.rhq.core.domain.resource.CreateResourceStatus;
+import org.rhq.core.domain.resource.ResourceCreationDataType;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
+import org.rhq.core.pluginapi.inventory.CreateResourceReport;
+import org.rhq.plugins.jbossas5.ApplicationServerPluginConfigurationProperties;
+import org.rhq.plugins.jbossas5.ManagedComponentComponent;
+import org.rhq.plugins.jbossas5.ProfileServiceComponent;
+import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter;
+import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapterFactory;
+import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection;
+import org.rhq.plugins.jbossas5.deploy.Deployer;
+import org.rhq.plugins.jbossas5.deploy.LocalDeployer;
+import org.rhq.plugins.jbossas5.deploy.RemoteDeployer;
+import org.rhq.plugins.jbossas5.util.ConversionUtils;
+import org.rhq.plugins.jbossas5.util.DebugUtils;
+import org.rhq.plugins.jbossas5.util.ManagedComponentUtils;
+import org.rhq.plugins.jbossas5.util.ResourceComponentUtils;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @author Ian Springer
+ */
+public class CreateChildResourceFacetDelegate implements CreateChildResourceFacet {
+ private static final String MANAGED_PROPERTY_GROUP = "managedPropertyGroup";
+
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ private ProfileServiceComponent component;
+
+ public CreateChildResourceFacetDelegate(ProfileServiceComponent component) {
+ this.component = component;
+ }
+
+ public CreateResourceReport createResource(CreateResourceReport createResourceReport) {
+ // ProfileServiceFactory.refreshCurrentProfileView();
+ ResourceType resourceType = createResourceReport.getResourceType();
+ if (resourceType.getCreationDataType() == ResourceCreationDataType.CONTENT)
+ createContentBasedResource(createResourceReport, resourceType);
+ else
+ createConfigurationBasedResource(createResourceReport, resourceType);
+ return createResourceReport;
+ }
+
+ void createConfigurationBasedResource(CreateResourceReport createResourceReport, ResourceType resourceType) {
+ Configuration defaultPluginConfig = getDefaultPluginConfiguration(resourceType);
+ Configuration resourceConfig = createResourceReport.getResourceConfiguration();
+ String componentName = getComponentName(defaultPluginConfig, resourceConfig);
+ ComponentType componentType = ConversionUtils.getComponentType(resourceType);
+ ManagementView managementView = this.component.getConnection().getManagementView();
+ if (ManagedComponentUtils.isManagedComponent(managementView, componentName, componentType)) {
+ createResourceReport.setStatus(CreateResourceStatus.FAILURE);
+ createResourceReport.setErrorMessage("A " + resourceType.getName() + " named '" + componentName
+ + "' already exists.");
+ return;
+ }
+
+ // The PC doesn't use the Resource name or key for anything, but set them anyway to make it happy.
+ createResourceReport.setResourceName(componentName);
+ createResourceReport.setResourceKey(componentName);
+
+ PropertySimple templateNameProperty = defaultPluginConfig
+ .getSimple(ManagedComponentComponent.Config.TEMPLATE_NAME);
+ String templateName = templateNameProperty.getStringValue();
+
+ DeploymentTemplateInfo template;
+ try {
+ template = managementView.getTemplate(templateName);
+ Map<String, ManagedProperty> managedProperties = template.getProperties();
+ Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(defaultPluginConfig);
+
+ if (log.isDebugEnabled())
+ log.debug("BEFORE CREATE:\n" + DebugUtils.convertPropertiesToString(template));
+ ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, resourceType,
+ customProps);
+ if (log.isDebugEnabled())
+ log.debug("AFTER CREATE:\n" + DebugUtils.convertPropertiesToString(template));
+
+ ConfigurationDefinition pluginConfigDef = resourceType.getPluginConfigurationDefinition();
+ Collection<PropertyDefinition> managedPropertyGroup = pluginConfigDef
+ .getPropertiesInGroup(MANAGED_PROPERTY_GROUP);
+ handleMiscManagedProperties(managedPropertyGroup, managedProperties, defaultPluginConfig);
+ log.debug("Applying template [" + templateName + "] to create ManagedComponent of type [" + componentType
+ + "]...");
+ try {
+ managementView.applyTemplate(componentName, template);
+ managementView.process();
+ createResourceReport.setStatus(CreateResourceStatus.SUCCESS);
+ } catch (Exception e) {
+ log.error("Unable to apply template [" + templateName + "] to create ManagedComponent of type "
+ + componentType + ".", e);
+ createResourceReport.setStatus(CreateResourceStatus.FAILURE);
+ createResourceReport.setException(e);
+ }
+ } catch (NoSuchDeploymentException e) {
+ log.error("Unable to find template [" + templateName + "].", e);
+ createResourceReport.setStatus(CreateResourceStatus.FAILURE);
+ createResourceReport.setException(e);
+ } catch (Exception e) {
+ log.error("Unable to process create request", e);
+ createResourceReport.setStatus(CreateResourceStatus.FAILURE);
+ createResourceReport.setException(e);
+ }
+ }
+
+ private void createContentBasedResource(CreateResourceReport createResourceReport, ResourceType resourceType) {
+ getDeployer().deploy(createResourceReport, resourceType);
+ }
+
+ private static String getComponentName(Configuration pluginConfig, Configuration resourceConfig) {
+ PropertySimple componentNameProp =
+ pluginConfig.getSimple(ManagedComponentComponent.Config.COMPONENT_NAME_PROPERTY);
+ if (componentNameProp == null || componentNameProp.getStringValue() == null) {
+ throw new IllegalStateException("Property [" + ManagedComponentComponent.Config.COMPONENT_NAME_PROPERTY
+ + "] is not defined in the default plugin configuration.");
+ }
+ String componentNamePropName = componentNameProp.getStringValue();
+ PropertySimple propToUseAsComponentName = resourceConfig.getSimple(componentNamePropName);
+ if (propToUseAsComponentName == null) {
+ throw new IllegalStateException("Property [" + componentNamePropName
+ + "] is not defined in user-specified initial Resource configuration.");
+ }
+ return propToUseAsComponentName.getStringValue();
+ }
+
+
+ private Deployer getDeployer() {
+ ProfileServiceConnection profileServiceConnection = this.component.getConnection();
+ if (runningEmbedded()) {
+ return new LocalDeployer(profileServiceConnection);
+ } else {
+ return new RemoteDeployer(profileServiceConnection, this.component.getResourceContext());
+ }
+ }
+
+ private boolean runningEmbedded() {
+ Configuration pluginConfiguration = this.component.getResourceContext().getPluginConfiguration();
+ String namingUrl = pluginConfiguration.getSimpleValue(ApplicationServerPluginConfigurationProperties.NAMING_URL,
+ null);
+ return namingUrl == null;
+ }
+
+ private static Configuration getDefaultPluginConfiguration(ResourceType resourceType) {
+ ConfigurationTemplate pluginConfigDefaultTemplate = resourceType.getPluginConfigurationDefinition()
+ .getDefaultTemplate();
+ return (pluginConfigDefaultTemplate != null) ? pluginConfigDefaultTemplate.createConfiguration()
+ : new Configuration();
+ }
+
+ private void handleMiscManagedProperties(Collection<PropertyDefinition> managedPropertyGroup,
+ Map<String, ManagedProperty> managedProperties, Configuration pluginConfiguration) {
+ for (PropertyDefinition propertyDefinition : managedPropertyGroup) {
+ String propertyKey = propertyDefinition.getName();
+ Property property = pluginConfiguration.get(propertyKey);
+ ManagedProperty managedProperty = managedProperties.get(propertyKey);
+ if (managedProperty != null && property != null) {
+ PropertyAdapter propertyAdapter = PropertyAdapterFactory.getPropertyAdapter(managedProperty
+ .getMetaType());
+ propertyAdapter.populateMetaValueFromProperty(property, managedProperty.getValue(), propertyDefinition);
+ }
+ }
+ }
+}
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 27d2b76..b6bfdd9 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -1600,653 +1600,670 @@
</service>
- <service name="Queue"
- class="JmsDestinationComponent"
- createDeletePolicy="both"
- subCategory="JMS Destinations"
- discovery="JmsDestinationDiscoveryComponent">
- <plugin-configuration>
- <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="Queue" readOnly="true"/>
+ <service name="JBoss Messaging"
+ class="JBossMessagingComponent"
+ subCategory="Resources"
+ discovery="JBossMessagingDiscoveryComponent"
+ description="the JBoss Messaging JMS provider"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="JMS" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="ServerPeer" readOnly="true"/>
<c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="QueueTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
- <c:simple-property name="jms-type" default="queue"/>
- <c:map-property name="customProperties"
- description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
- <c:simple-property name="securityConfig"
- default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
- </c:map-property>
- </c:group>
- </plugin-configuration>
+ </plugin-configuration>
- &destinationOperations;
-
- <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all messages with selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all durable messages using a selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all non durable messages using a selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML">
- <results>
- <c:notes>Get the message counter as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML">
- <results>
- <c:notes>Get the message counter history as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/>
-
- <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/>
+ <service name="Queue"
+ class="JmsDestinationComponent"
+ createDeletePolicy="both"
+ discovery="JmsDestinationDiscoveryComponent"
+ description="a JMS queue">
- &managedObjectMetrics;
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="Queue" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="QueueTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
+ <c:simple-property name="jms-type" default="queue"/>
+ <c:map-property name="customProperties"
+ description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
+ <c:simple-property name="securityConfig"
+ default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
+ </c:map-property>
+ </c:group>
+ </plugin-configuration>
- <!-- Traits -->
+ &destinationOperations;
- <metric property="createdProgrammatically" displayType="summary"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/>
+ <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all messages with selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
- <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
- (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
- <metric property="messageCounterHistoryDayLimit"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
+ <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all durable messages using a selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
- <!-- Numerics -->
+ <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all non durable messages using a selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
- <metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of consumers on the queue"/>
+ <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML">
+ <results>
+ <c:notes>Get the message counter as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
- <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of messages currently being delivered"/>
+ <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML">
+ <results>
+ <c:notes>Get the message counter history as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
- <metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of messages in the queue"/>
+ <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/>
- <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The number of scheduled messages in the queue"/>
+ <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/>
- <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The total message count since startup or last counter reset"/>
+ &managedObjectMetrics;
- <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The message count delta since last method call"/>
+ <!-- Traits -->
- <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The current message count of pending messages within the queue waiting for dispatch"/>
+ <metric property="createdProgrammatically" displayType="summary"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="Was this queue created programmatically? If Yes, the queue will not survive a restart of the application server. If No, the queue was created via a deployment XML file."/>
- <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The message count delta of pending messages since last method call"/>
+ <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
+ (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
+ <metric property="messageCounterHistoryDayLimit"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="This queue's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
- <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
- description="The timestamp of the last message add"/>
+ <!-- Numerics -->
- <resource-configuration>
+ <metric property="consumerCount" measurementType="dynamic" displayType="summary" displayName="Consumer Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of consumers on the queue"/>
- <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jboss/… -->
+ <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of messages currently being delivered"/>
- <c:simple-property required="true" name="name" readOnly="true"
- description="The name of this queue (e.g. 'MyQueue')."/>
+ <metric property="messageCount" measurementType="dynamic" displayType="summary" displayName="Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of messages in the queue"/>
- <c:simple-property required="true" name="JNDIName" readOnly="true"
- description="This queue's JNDI name (e.g. '/queue/MyQueue')."/>
+ <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The number of scheduled messages in the queue"/>
- <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
- <c:description>
- Is this queue clustered? For an existing queue, this property is read-only. If not specified
- when creating a new queue, the default value is false.
- </c:description>
- </c:simple-property>
+ <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The total message count since startup or last counter reset"/>
- <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
- <c:description>
- When paging messages to storage from a subscription, they first go into a "Down Cache" before
- being written to storage. This enables the write to occur as a single operation, thus aiding
- performance. This setting determines the maximum number of messages that the Down Cache will hold
- before they are flushed to storage.
- Updates to this property will not go into effect until the queue has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The message count delta since last method call"/>
- <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
- <c:description>
- The maximum number of messages for the queue held in memory at any one time.
- The actual queue can hold many more messages than this, but these are paged to and from
- storage as necessary, as messages are added or consumed.
- Updates to this property will not go into effect until the queue has been restarted.
- The default value is 200000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The current message count of pending messages within the queue waiting for dispatch"/>
- <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
- <c:description>
- The number of delivery attempts before a message to a subscriber of this queue is moved to the
- DLQ. The default value is 10. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The message count delta of pending messages since last method call"/>
- <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
- <c:description>
- The maximum number of messages this queue can hold before they are dropped.
- A value of -1 means there is no maximum. The default value is -1.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="utilization"
+ description="The timestamp of the last message add"/>
- <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
- <c:description>
- When loading messages from a subscription, this is the maximum number of messages to
- pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
- Updates to this property will not go into effect until the queue has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
+ <resource-configuration>
- <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
- <c:description>
- The delay in milliseconds before a rolled back or recovered message is redelivered.
- Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
+ <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jboss/… -->
- <c:simple-property required="false" name="DLQ">
- <c:description>
- The JMX ObjectName of the dead letter queue (DLQ) for this queue (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
- server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
+ <c:simple-property required="true" name="name" readOnly="true"
+ description="The name of this queue (e.g. 'MyQueue')."/>
- <c:simple-property required="false" name="expiryQueue">
- <c:description>
- The JMX ObjectName of the expiry queue for this queue (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
- expiry queue on the server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
+ <c:simple-property required="true" name="JNDIName" readOnly="true"
+ description="This queue's JNDI name (e.g. '/queue/MyQueue')."/>
- <c:simple-property required="false" name="serverPeer">
- <c:description>
- The JMX ObjectName of the server peer this queue was deployed on (e.g.
- "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
- the queue has been restarted.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
+ <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
+ <c:description>
+ Is this queue clustered? For an existing queue, this property is read-only. If not specified
+ when creating a new queue, the default value is false.
+ </c:description>
+ </c:simple-property>
- <c:list-property name="securityConfig" max="4" min="2"
- displayName="Security Configurations"
- description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
- <c:map-property name="role"
- displayName="Security Configuration Attributes"
- description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
- <c:simple-property name="name"
- displayName="Name"
- description="Name of the Security Role. e.g. Guest"
- summary="true"
- required="true"/>
- <c:simple-property name="read"
- displayName="Read"
- description="Is this role allowed to read messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="write"
- displayName="Write"
- description="Is this role allowed to write messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="create"
- displayName="Create"
- description="Is this role allowed to create messages?"
- summary="true"
- required="false"
- type="boolean"/>
- </c:map-property>
+ <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
+ <c:description>
+ When paging messages to storage from a subscription, they first go into a "Down Cache" before
+ being written to storage. This enables the write to occur as a single operation, thus aiding
+ performance. This setting determines the maximum number of messages that the Down Cache will hold
+ before they are flushed to storage.
+ Updates to this property will not go into effect until the queue has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
- </c:list-property>
+ <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
+ <c:description>
+ The maximum number of messages for the queue held in memory at any one time.
+ The actual queue can hold many more messages than this, but these are paged to and from
+ storage as necessary, as messages are added or consumed.
+ Updates to this property will not go into effect until the queue has been restarted.
+ The default value is 200000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
- </resource-configuration>
+ <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
+ <c:description>
+ The number of delivery attempts before a message to a subscriber of this queue is moved to the
+ DLQ. The default value is 10. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
- <help>
- <![CDATA[
- <p>The message counter metrics will not be collected by default. In order
- for these metrics to be collected for all Topics and Queues for a given application server instance,
- go to the instance's JMX Console, and invoke the
- <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
- To ensure the message counters are still enabled when the application server is restarted,
- edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
- <tt>EnableMessageCounters</tt> attribute to "true".</p>
- ]]>
- </help>
+ <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
+ <c:description>
+ The maximum number of messages this queue can hold before they are dropped.
+ A value of -1 means there is no maximum. The default value is -1.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
- </service>
+ <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
+ <c:description>
+ When loading messages from a subscription, this is the maximum number of messages to
+ pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
+ Updates to this property will not go into effect until the queue has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
- <service name="Topic"
- class="JmsDestinationComponent"
- createDeletePolicy="both"
- subCategory="JMS Destinations"
- discovery="JmsDestinationDiscoveryComponent">
+ <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
+ <c:description>
+ The delay in milliseconds before a rolled back or recovered message is redelivered.
+ Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
- <plugin-configuration>
- <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
- <c:simple-property name="componentSubtype" default="Topic" readOnly="true"/>
- <c:simple-property name="componentName" readOnly="true"/>
- <c:simple-property name="templateName" default="TopicTemplate" readOnly="true"/>
- <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
- <c:description>
- The name of the Resource configuration property whose value should be used as the
- underlying ManagedComponent name when creating a new Resource of this type.
- </c:description>
- </c:simple-property>
- <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
- <c:simple-property name="jms-type" default="topic"/>
- <c:map-property name="customProperties"
- description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
- <c:simple-property name="securityConfig"
- default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
- </c:map-property>
- </c:group>
- </plugin-configuration>
+ <c:simple-property required="false" name="DLQ">
+ <c:description>
+ The JMX ObjectName of the dead letter queue (DLQ) for this queue (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
+ server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
- &destinationOperations;
-
- <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
- <c:simple-property required="false" name="arg#1" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all messages for the specified subscription with the specified selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
- <c:simple-property required="false" name="arg#1" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector">
- <parameters>
- <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
- <c:simple-property required="false" name="arg#1" displayName="selector"/>
- </parameters>
- <results>
- <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes>
- <c:list-property name="result">
- <c:map-property required="false" name="element">
- <c:simple-property required="false" name="JMSCorrelationID"/>
- <c:simple-property required="false" name="JMSMessageID"/>
- <c:simple-property type="long" required="false" name="JMSTimestamp"/>
- </c:map-property>
- </c:list-property>
- </results>
- </operation>
-
- <operation name="listAllSubscriptions" displayName="List All Subscriptions"
- description="Return all subscriptions for the topic">
- <results>
- <c:notes>Return all subscriptions for the topic</c:notes>
- &subscriptionsResultProperty;
- </results>
- </operation>
-
- <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML"
- description="Return all subscriptions for the topic as HTML">
- <results>
- <c:notes>Return all subscriptions for the topic as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions"
- description="Return all durable subscriptions for the topic">
- <results>
- <c:notes>Return all durable subscriptions for the topic</c:notes>
- &subscriptionsResultProperty;
- </results>
- </operation>
-
- <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML"
- description="Return all durable subscriptions for the topic as HTML">
- <results>
- <c:notes>Return all durable subscriptions for the topic as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
-
- <operation name="listNonDurableSubscriptions" displayName="List Non-Durable Subscriptions"
- description="Return all non-durable subscriptions for the topic">
- <results>
- <c:notes>Return all non-durable subscriptions for the topic</c:notes>
- &subscriptionsResultProperty;
- </results>
- </operation>
-
- <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non-Durable Subscriptions As HTML"
- description="Return all non-durable subscriptions for the topic as HTML">
- <results>
- <c:notes>Return all non-durable subscriptions for the topic as HTML</c:notes>
- <c:simple-property name="result" type="longString"/>
- </results>
- </operation>
+ <c:simple-property required="false" name="expiryQueue">
+ <c:description>
+ The JMX ObjectName of the expiry queue for this queue (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
+ expiry queue on the server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
- &managedObjectMetrics;
+ <c:simple-property required="false" name="serverPeer">
+ <c:description>
+ The JMX ObjectName of the server peer this queue was deployed on (e.g.
+ "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
+ the queue has been restarted.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:list-property name="securityConfig" max="4" min="2"
+ displayName="Security Configurations"
+ description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
+ <c:map-property name="role"
+ displayName="Security Configuration Attributes"
+ description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
+ <c:simple-property name="name"
+ displayName="Name"
+ description="Name of the Security Role. e.g. Guest"
+ summary="true"
+ required="true"/>
+ <c:simple-property name="read"
+ displayName="Read"
+ description="Is this role allowed to read messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="write"
+ displayName="Write"
+ description="Is this role allowed to write messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="create"
+ displayName="Create"
+ description="Is this role allowed to create messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ </c:map-property>
+
+ </c:list-property>
- <!-- Traits -->
+ </resource-configuration>
- <metric property="createdProgrammatically" displayType="summary"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/>
+ <help>
+ <![CDATA[
+ <p>The message counter metrics will not be collected by default. In order
+ for these metrics to be collected for all Topics and Queues for a given application server instance,
+ go to the instance's JMX Console, and invoke the
+ <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
+ To ensure the message counters are still enabled when the application server is restarted,
+ edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
+ <tt>EnableMessageCounters</tt> attribute to "true".</p>
+ ]]>
+ </help>
- <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
- (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
- <metric property="messageCounterHistoryDayLimit"
- defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
- description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
+ </service>
- <!-- Numerics -->
+
+ <service name="Topic"
+ class="JmsDestinationComponent"
+ createDeletePolicy="both"
+ discovery="JmsDestinationDiscoveryComponent"
+ description="a JMS topic">
- <metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all messages in all subscriptions to this topic"/>
+ <plugin-configuration>
+ <c:simple-property name="componentType" default="JMSDestination" readOnly="true"/>
+ <c:simple-property name="componentSubtype" default="Topic" readOnly="true"/>
+ <c:simple-property name="componentName" readOnly="true"/>
+ <c:simple-property name="templateName" default="TopicTemplate" readOnly="true"/>
+ <c:simple-property name="componentNameProperty" default="JNDIName" readOnly="true">
+ <c:description>
+ The name of the Resource configuration property whose value should be used as the
+ underlying ManagedComponent name when creating a new Resource of this type.
+ </c:description>
+ </c:simple-property>
+ <c:group name="managedPropertyGroup" displayName="managedPropertyGroup" hiddenByDefault="true">
+ <c:simple-property name="jms-type" default="topic"/>
+ <c:map-property name="customProperties"
+ description="Maps a list of custom property names to the the fully qualified class names of the org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter implementations that should be used for those properties.">
+ <c:simple-property name="securityConfig"
+ default="org.rhq.plugins.jbossas5.adapter.impl.configuration.custom.JMSSecurityConfigAdapter"/>
+ </c:map-property>
+ </c:group>
+ </plugin-configuration>
- <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all subscriptions to this topic"/>
+ &destinationOperations;
- <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all messages for all durable subscriptions to this topic"/>
+ <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
+ <c:simple-property required="false" name="arg#1" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all messages for the specified subscription with the specified selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
- <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all durable subscriptions to this topic"/>
+ <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
+ <c:simple-property required="false" name="arg#1" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
- <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all messages in all non durable subscriptions to this topic"/>
+ <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector">
+ <parameters>
+ <c:simple-property required="false" name="arg#0" displayName="subscriptionID"/>
+ <c:simple-property required="false" name="arg#1" displayName="selector"/>
+ </parameters>
+ <results>
+ <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes>
+ <c:list-property name="result">
+ <c:map-property required="false" name="element">
+ <c:simple-property required="false" name="JMSCorrelationID"/>
+ <c:simple-property required="false" name="JMSMessageID"/>
+ <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+ </c:map-property>
+ </c:list-property>
+ </results>
+ </operation>
- <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count"
- defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
- description="The count of all non durable subscriptions to this topic"/>
+ <operation name="listAllSubscriptions" displayName="List All Subscriptions"
+ description="Return all subscriptions for the topic">
+ <results>
+ <c:notes>Return all subscriptions for the topic</c:notes>
+ &subscriptionsResultProperty;
+ </results>
+ </operation>
- <resource-configuration>
+ <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML"
+ description="Return all subscriptions for the topic as HTML">
+ <results>
+ <c:notes>Return all subscriptions for the topic as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
- <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jboss/… -->
+ <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions"
+ description="Return all durable subscriptions for the topic">
+ <results>
+ <c:notes>Return all durable subscriptions for the topic</c:notes>
+ &subscriptionsResultProperty;
+ </results>
+ </operation>
- <c:simple-property required="true" name="name" readOnly="true"
- description="The name of this topic (e.g. 'MyTopic')."/>
+ <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML"
+ description="Return all durable subscriptions for the topic as HTML">
+ <results>
+ <c:notes>Return all durable subscriptions for the topic as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
- <c:simple-property required="true" name="JNDIName" readOnly="true"
- description="This topic's JNDI name (e.g. '/topic/MyTopic')"/>
+ <operation name="listNonDurableSubscriptions" displayName="List Non-Durable Subscriptions"
+ description="Return all non-durable subscriptions for the topic">
+ <results>
+ <c:notes>Return all non-durable subscriptions for the topic</c:notes>
+ &subscriptionsResultProperty;
+ </results>
+ </operation>
- <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
- <c:description>
- Is this topic clustered? For an existing topic, this property is read-only. If not specified
- when creating a new topic, the default value is false.
- </c:description>
- </c:simple-property>
+ <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non-Durable Subscriptions As HTML"
+ description="Return all non-durable subscriptions for the topic as HTML">
+ <results>
+ <c:notes>Return all non-durable subscriptions for the topic as HTML</c:notes>
+ <c:simple-property name="result" type="longString"/>
+ </results>
+ </operation>
- <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
- <c:description>
- When paging messages to storage from a subscription, they first go into a "Down Cache" before
- being written to storage. This enables the write to occur as a single operation, thus aiding
- performance. This setting determines the maximum number of messages that the Down Cache will hold
- before they are flushed to storage.
- Updates to this property will not go into effect until the topic has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
+ &managedObjectMetrics;
- <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
- <c:description>
- The maximum number of messages held by the topic subscriptions in memory at any one time.
- The actual subscription can hold many more messages than this, but these are paged to and from
- storage as necessary, as messages are added or consumed.
- Updates to this property will not go into effect until the topic has been restarted.
- The default value is 200000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
+ <!-- Traits -->
- <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
- <c:description>
- The number of delivery attempts before a message to a subscriber of this topic is moved to the
- DLQ. The default value is 10. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="createdProgrammatically" displayType="summary"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="Was this topic created programmatically? If Yes, the topic will not survive a restart of the application server. If No, the topic was created via a deployment XML file."/>
- <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
- <c:description>
- The maximum number of messages this topic can hold before they are dropped.
- A value of -1 means there is no maximum. The default value is -1.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
+ <!-- NOTE: We have to make this a trait rather than a resource config prop due to a bug in JBMESSAGING
+ (see https://jira.jboss.org/jira/browse/JBAS-6721). -->
+ <metric property="messageCounterHistoryDayLimit"
+ defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"
+ description="This topic's message counter history day limit - <0: unlimited, =0: history disabled, >0: maximum day count"/>
- <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
- <c:description>
- When loading messages from a subscription, this is the maximum number of messages to
- pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
- Updates to this property will not go into effect until the topic has been restarted.
- The default value is 2000.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="1"/>
- </c:constraint>
- </c:simple-property>
+ <!-- Numerics -->
- <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
- <c:description>
- The delay in milliseconds before a rolled back or recovered message is redelivered.
- Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
- </c:description>
- <c:constraint>
- <c:integer-constraint minimum="-1"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="allMessageCount" measurementType="dynamic" displayType="summary" displayName="All Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all messages in all subscriptions to this topic"/>
- <c:simple-property required="false" name="DLQ">
- <c:description>
- The JMX ObjectName of the dead letter queue (DLQ) for this topic (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
- server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="summary" displayName="All Subscriptions Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all subscriptions to this topic"/>
- <c:simple-property required="false" name="expiryQueue">
- <c:description>
- The JMX ObjectName of the expiry queue for this topic (e.g.
- "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
- expiry queue on the server peer.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all messages for all durable subscriptions to this topic"/>
- <c:simple-property required="false" name="serverPeer">
- <c:description>
- The JMX ObjectName of the server peer this topic was deployed on (e.g.
- "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
- the topic has been restarted.
- </c:description>
- <c:constraint>
- <c:regex-constraint expression="[^:]+:.+"/>
- </c:constraint>
- </c:simple-property>
+ <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all durable subscriptions to this topic"/>
- <c:list-property name="securityConfig" max="4" min="2"
- displayName="Security Configurations"
- description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
- <c:map-property name="role"
- displayName="Security Configuration Attributes"
- description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
- <c:simple-property name="name"
- displayName="Name"
- description="Name of the Security Role. e.g. Guest"
- summary="true"
- required="true"/>
- <c:simple-property name="read"
- displayName="Read"
- description="Is this role allowed to read messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="write"
- displayName="Write"
- description="Is this role allowed to write messages?"
- summary="true"
- required="false"
- type="boolean"/>
- <c:simple-property name="create"
- displayName="Create"
- description="Is this role allowed to create messages?"
- summary="true"
- required="false"
- type="boolean"/>
- </c:map-property>
- </c:list-property>
+ <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all messages in all non durable subscriptions to this topic"/>
- </resource-configuration>
+ <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="throughput"
+ description="The count of all non durable subscriptions to this topic"/>
+
+ <resource-configuration>
+
+ <!-- See: https://anonsvn.jboss.org/repos/jbossas/trunk/messaging/src/main/org/jboss/… -->
+
+ <c:simple-property required="true" name="name" readOnly="true"
+ description="The name of this topic (e.g. 'MyTopic')."/>
+
+ <c:simple-property required="true" name="JNDIName" readOnly="true"
+ description="This topic's JNDI name (e.g. '/topic/MyTopic')"/>
+
+ <c:simple-property type="boolean" required="false" name="clustered" readOnly="true" defaultValue="false">
+ <c:description>
+ Is this topic clustered? For an existing topic, this property is read-only. If not specified
+ when creating a new topic, the default value is false.
+ </c:description>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="downCacheSize" defaultValue="2000">
+ <c:description>
+ When paging messages to storage from a subscription, they first go into a "Down Cache" before
+ being written to storage. This enables the write to occur as a single operation, thus aiding
+ performance. This setting determines the maximum number of messages that the Down Cache will hold
+ before they are flushed to storage.
+ Updates to this property will not go into effect until the topic has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="fullSize" defaultValue="200000">
+ <c:description>
+ The maximum number of messages held by the topic subscriptions in memory at any one time.
+ The actual subscription can hold many more messages than this, but these are paged to and from
+ storage as necessary, as messages are added or consumed.
+ Updates to this property will not go into effect until the topic has been restarted.
+ The default value is 200000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" defaultValue="-1">
+ <c:description>
+ The number of delivery attempts before a message to a subscriber of this topic is moved to the
+ DLQ. The default value is 10. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="integer" required="false" name="maxSize" defaultValue="-1">
+ <c:description>
+ The maximum number of messages this topic can hold before they are dropped.
+ A value of -1 means there is no maximum. The default value is -1.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
- <help>
- <![CDATA[
- <p>The message counter metrics will not be collected by default. In order
- for these metrics to be collected for all Topics and Queues for a given application server instance,
- go to the instance's JMX Console, and invoke the
- <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
- To ensure the message counters are still enabled when the application server is restarted,
- edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
- <tt>EnableMessageCounters</tt> attribute to "true".</p>
- ]]>
- </help>
+ <c:simple-property type="integer" required="false" name="pageSize" defaultValue="2000">
+ <c:description>
+ When loading messages from a subscription, this is the maximum number of messages to
+ pre-load in one operation. Must be less than Full Size and greater than or equal to Down Cache Size.
+ Updates to this property will not go into effect until the topic has been restarted.
+ The default value is 2000.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property type="long" required="false" name="redeliveryDelay" units="milliseconds" defaultValue="-1">
+ <c:description>
+ The delay in milliseconds before a rolled back or recovered message is redelivered.
+ Set to 0 to disable redelivery. The default value is 0. A value of -1 indicates the default value should be used.
+ </c:description>
+ <c:constraint>
+ <c:integer-constraint minimum="-1"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="DLQ">
+ <c:description>
+ The JMX ObjectName of the dead letter queue (DLQ) for this topic (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateDLQ") - overrides the default DLQ on the
+ server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="expiryQueue">
+ <c:description>
+ The JMX ObjectName of the expiry queue for this topic (e.g.
+ "jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue") - overrides the default
+ expiry queue on the server peer.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:simple-property required="false" name="serverPeer">
+ <c:description>
+ The JMX ObjectName of the server peer this topic was deployed on (e.g.
+ "jboss.messaging:service=ServerPeer"). Updates to this property will not go into effect until
+ the topic has been restarted.
+ </c:description>
+ <c:constraint>
+ <c:regex-constraint expression="[^:]+:.+"/>
+ </c:constraint>
+ </c:simple-property>
+
+ <c:list-property name="securityConfig" max="4" min="2"
+ displayName="Security Configurations"
+ description="This element specifies a XML fragment which describes the access control list to be used by the SecurityManager to authorize client operations against the destination. The content model is the same as for the SecurityManager SecurityConf attribute.">
+ <c:map-property name="role"
+ displayName="Security Configuration Attributes"
+ description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
+ <c:simple-property name="name"
+ displayName="Name"
+ description="Name of the Security Role. e.g. Guest"
+ summary="true"
+ required="true"/>
+ <c:simple-property name="read"
+ displayName="Read"
+ description="Is this role allowed to read messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="write"
+ displayName="Write"
+ description="Is this role allowed to write messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ <c:simple-property name="create"
+ displayName="Create"
+ description="Is this role allowed to create messages?"
+ summary="true"
+ required="false"
+ type="boolean"/>
+ </c:map-property>
+ </c:list-property>
+
+ </resource-configuration>
+
+ <help>
+ <![CDATA[
+ <p>The message counter metrics will not be collected by default. In order
+ for these metrics to be collected for all Topics and Queues for a given application server instance,
+ go to the instance's JMX Console, and invoke the
+ <tt>enableMessageCounters</tt> operation on the <tt>jboss.messaging:service=ServerPeer</tt> MBean.
+ To ensure the message counters are still enabled when the application server is restarted,
+ edit that instance's <tt>deploy/messaging/messaging-service.xml</tt> file and set the
+ <tt>EnableMessageCounters</tt> attribute to "true".</p>
+ ]]>
+ </help>
+
+ </service>
</service>
commit f50fcffea0dfe866b3a038f2e6044737d3ba0637
Author: Joseph Marques <joseph(a)redhat.com>
Date: Mon May 24 02:55:38 2010 -0400
BZ-586068: fix error preventing GWT-compilation from succeeding
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
index f087ff7..ecb0cd8 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
@@ -18,11 +18,10 @@
*/
package org.rhq.core.domain.measurement.composite;
+import java.io.Serializable;
+
import org.rhq.core.domain.measurement.MeasurementDataNumeric1H;
import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.server.MeasurementConverter;
-
-import java.io.Serializable;
/**
* Composite that holds information about an oob
@@ -161,11 +160,12 @@ public class MeasurementOOBComposite implements Serializable {
}
}
+ /*
public String getFormattedBaseband() {
String min = MeasurementConverter.format(blMin, units, true);
String max = MeasurementConverter.format(blMax, units, true);
- String result = min + ", " + max ;
+ String result = min + ", " + max;
return result;
}
@@ -173,6 +173,7 @@ public class MeasurementOOBComposite implements Serializable {
public String getFormattedOutlier() {
return MeasurementConverter.format(outlier, units, true);
}
+ */
@Override
public String toString() {
commit 3df5374cb486373c33c7c785675072fce2b1ecd1
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat May 22 03:29:05 2010 -0400
cosmetic fix to the display items on the menubar's subitems
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 f892b13..285807a 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
@@ -126,7 +126,7 @@
</rich:menuGroup>
<ui:remove>***** Resources > SAVED SEARCHES *****</ui:remove>
- <rich:menuGroup value="Saved Searches" icon="/images/bookmark.png">
+ <rich:menuGroup value="Resource Saved Searches" icon="/images/bookmark.png">
<c:forEach var="savedSearch" items="#{UserPreferencesUIBean.savedSearches}">
<c:if test="#{savedSearch.searchSubsystem.name == 'RESOURCE'}">
<rich:menuItem submitMode="none"
@@ -248,8 +248,8 @@
</c:forEach>
</rich:menuGroup>
- <ui:remove>***** Resources > SAVED SEARCHES *****</ui:remove>
- <rich:menuGroup value="Saved Searches" icon="/images/bookmark.png">
+ <ui:remove>***** Groups > SAVED SEARCHES *****</ui:remove>
+ <rich:menuGroup value="Group Saved Searches" icon="/images/bookmark.png">
<c:forEach var="savedSearch" items="#{UserPreferencesUIBean.savedSearches}">
<c:if test="#{savedSearch.searchSubsystem.name == 'GROUP'}">
<rich:menuItem submitMode="none"
commit a17f8553564f703e41decf3a75d9294903282bfe
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat May 22 03:25:41 2010 -0400
BZ-577853 - initial implementation for GWT-based group search
group search
* write GroupSearchAssist for availability, category, type, plugin, name
* write GroupSearchTranslator for availability, category, type, plugin, name
* fix browserGroups.xhtml to leverage the new GWT-based SearchBar
* pass the correct parameters to GWT-based SearchBar
saved searches
* add Groups > Saved Searches to the menu bar
* fully parameterize the loading routine for saved searches based off of search context/subsystem
misc
* dynamically determine the "welcome message" that renders inside the search bar by default
* fixed criteria query generator to properly generate queries that ONLY have search expressions and no other filters set
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
index 213f6c2..a810df1 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java
@@ -38,7 +38,7 @@ public class SavedSearchCriteria extends Criteria {
public static final long serialVersionUID = 1L;
private Integer filterId;
- private SearchSubsystem filterContext;
+ private SearchSubsystem filterSearchSubsystem;
private String filterName;
private String filterDescription;
private String filterPattern;
@@ -73,8 +73,8 @@ public class SavedSearchCriteria extends Criteria {
this.filterId = filterId;
}
- public void addFilterSearchContext(SearchSubsystem filterContext) {
- this.filterContext = filterContext;
+ public void addFilterSearchSubsystem(SearchSubsystem filterSearchSubsystem) {
+ this.filterSearchSubsystem = filterSearchSubsystem;
}
public void addFilterName(String filterName) {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java
index 147942b..7f43ffa 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java
@@ -71,7 +71,7 @@ public class SavedSearch implements Serializable {
@Column(name = "CONTEXT", nullable = false)
@Enumerated(EnumType.STRING)
- private SearchSubsystem context;
+ private SearchSubsystem searchSubsystem;
@Column(name = "NAME")
private String name;
@@ -104,7 +104,7 @@ public class SavedSearch implements Serializable {
public SavedSearch(SearchSubsystem context, String name, String pattern, Subject subject) {
// call setters to go through parameter validation
- setContext(context);
+ setSearchSubsystem(context);
setPattern(pattern);
setSubject(subject);
setName(name); // name can be null, to allow for saving searches quickly
@@ -123,15 +123,15 @@ public class SavedSearch implements Serializable {
this.id = id;
}
- public SearchSubsystem getContext() {
- return context;
+ public SearchSubsystem getSearchSubsystem() {
+ return searchSubsystem;
}
- private void setContext(SearchSubsystem context) {
- if (context == null) {
- throw new IllegalArgumentException("All saved searches must be bound to a SearchContext");
+ private void setSearchSubsystem(SearchSubsystem searchSubsystem) {
+ if (searchSubsystem == null) {
+ throw new IllegalArgumentException("All saved searches must be bound to a SearchSubsystem");
}
- this.context = context;
+ this.searchSubsystem = searchSubsystem;
}
public String getName() {
@@ -206,7 +206,7 @@ public class SavedSearch implements Serializable {
final int prime = 31;
int result = 1;
result = (prime * result) + subjectId;
- result = (prime * result) + context.hashCode();
+ result = (prime * result) + searchSubsystem.hashCode();
result = (prime * result) + ((name == null) ? 0 : name.hashCode());
result = (prime * result) + pattern.hashCode();
return result;
@@ -228,7 +228,7 @@ public class SavedSearch implements Serializable {
return false;
}
- if (context != other.context) {
+ if (searchSubsystem != other.searchSubsystem) {
return false;
}
@@ -251,7 +251,7 @@ public class SavedSearch implements Serializable {
public String toString() {
return "SavedSearch [" //
+ "id=" + id //
- + ", context=" + context //
+ + ", searchSubsystem=" + searchSubsystem //
+ ", description=" + description //
+ ", global=" + global //
+ ", lastComputeTime=" + lastComputeTime //
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
index 75cfbd8..388b27a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -59,7 +59,8 @@ import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox;
*/
public class SearchBar {
- public static final String DEFAULT_SEARCH_TEXT = "search for resources";
+ public String welcomeMessage;
+
public static final String DEFAULT_PATTERN_NAME = "name your pattern";
private static final String IMAGE_DIR = "/coregui/images/search/";
@@ -88,7 +89,7 @@ public class SearchBar {
private final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
- private final SavedSearchManager savedSearchManager = new SavedSearchManager(this);
+ private final SavedSearchManager savedSearchManager;
private SearchSubsystem searchSubsystem;
public static boolean existsOnPage() {
@@ -110,13 +111,20 @@ public class SearchBar {
}
});
- String searchSubsystem = searchBarElement.getAttribute("searchSubsystemName");
- this.searchSubsystem = (SearchSubsystem.valueOf(searchSubsystem.toUpperCase()));
+ String searchSubsystem = searchBarElement.getAttribute("searchSubsystem");
+ setSearchSubsystem(SearchSubsystem.valueOf(searchSubsystem.toUpperCase()));
}
public SearchBar() {
System.out.println("Loading SearchBar...");
+ // in the future, will be instantiated directly from a higher-level widget
+ if (existsOnPage()) {
+ loadAdditionalDataFromDivAttributes();
+ }
+
+ savedSearchManager = new SavedSearchManager(this);
+
RootPanel.get("patternFieldContainer").add(autoCompletePatternField);
RootPanel.get("patternFieldSuggestionsContainer").add(autoCompletePatternField.getSuggestionComponent());
autoCompletePatternField.hideInitialSuggestions();
@@ -134,10 +142,6 @@ public class SearchBar {
setupArrowImage();
setupSavedSearches();
- // in the future, will be instantiated directly from a higher-level widget
- if (existsOnPage()) {
- loadAdditionalDataFromDivAttributes();
- }
// presume the enclosing page logic loads results without a button click
}
@@ -145,17 +149,28 @@ public class SearchBar {
return savedSearchManager;
}
+ public void setSearchSubsystem(SearchSubsystem searchSubsystem) {
+ this.searchSubsystem = searchSubsystem;
+
+ this.welcomeMessage = "search for " + searchSubsystem.getName().toLowerCase() + "s";
+ this.autoCompletePatternField.setText(welcomeMessage);
+ }
+
public SearchSubsystem getSearchSubsystem() {
return searchSubsystem;
}
+ public String getWelcomeMessage() {
+ return welcomeMessage;
+ }
+
public void executeSearch() {
String searchTerms = autoCompletePatternField.getText().toLowerCase().trim();
executeSearch(searchTerms);
}
public void executeSearch(String searchTerms) {
- if (searchTerms.equals(DEFAULT_SEARCH_TEXT)) {
+ if (searchTerms.equals(welcomeMessage)) {
searchTerms = "";
}
@@ -189,7 +204,6 @@ public class SearchBar {
}
private void setupAutoCompletingPatternField() {
- autoCompletePatternField.setText(DEFAULT_SEARCH_TEXT);
autoCompletePatternField.getElement().setId("patternField");
autoCompletePatternField.addStyleName("patternField");
@@ -315,7 +329,7 @@ public class SearchBar {
@Override
public void onClick(ClickEvent event) {
// clear default search text if necessary
- if (autoCompletePatternField.getText().equals(DEFAULT_SEARCH_TEXT)) {
+ if (autoCompletePatternField.getText().equals(welcomeMessage)) {
autoCompletePatternField.setValue("", true);
}
savedSearchesPanel.hide();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
index eb5e919..17bca44 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
@@ -150,6 +150,7 @@ public class SavedSearchManager {
Subject currentUser = SearchGUI.getSessionSubject();
SavedSearchCriteria criteria = new SavedSearchCriteria();
criteria.addFilterSubjectId(currentUser.getId());
+ criteria.addFilterSearchSubsystem(searchBar.getSearchSubsystem());
searchService.findSavedSearchesByCriteria(criteria, new AsyncCallback<List<SavedSearch>>() {
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
index 0b5d877..01db575 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
@@ -34,7 +34,6 @@ import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.TextBox;
-import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
@@ -167,7 +166,7 @@ public class SuggestTextBox extends TextBox {
@Override
public void onFocus(FocusEvent event) {
- if (getText().equals(SearchBar.DEFAULT_SEARCH_TEXT)) {
+ if (getText().equals(searchBar.getWelcomeMessage())) {
setText("");
}
// send a 'fake' key, this will rerender PopupPanel with the new completion list
@@ -249,7 +248,7 @@ public class SuggestTextBox extends TextBox {
String text = this.getText();
searchService.getSuggestions( //
- SearchSubsystem.RESOURCE, // replace with appropriate subsystem somehow extracted from the context
+ searchBar.getSearchSubsystem(), //
text, //
this.getCursorPos(), //
new SearchSuggestionCallback(keyCode));
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java
index aad85f1..0846cdd 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java
@@ -1,8 +1,5 @@
package org.rhq.enterprise.gui.inventory.browse;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.faces.application.FacesMessage;
import javax.faces.model.DataModel;
@@ -13,7 +10,6 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
-import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.gui.util.FacesContextUtility;
@@ -29,9 +25,11 @@ public class BrowseGroupsUIBean extends PagedDataTableUIBean {
public static final String MANAGED_BEAN_NAME = "BrowseGroupsUIBean";
- private String filter;
+ private String search;
private GroupCategory category;
+ private ResourceGroupManagerLocal groupManager = LookupUtil.getResourceGroupManager();
+
public BrowseGroupsUIBean() {
String subtab = FacesContextUtility.getOptionalRequestParameter("subtab", "").toLowerCase();
if (subtab.equals("compatible")) {
@@ -40,15 +38,17 @@ public class BrowseGroupsUIBean extends PagedDataTableUIBean {
category = GroupCategory.MIXED;
}
- filter = FacesContextUtility.getOptionalRequestParameter("filter");
+ /*
+ search = FacesContextUtility.getOptionalRequestParameter("search");
+ */
}
- public String getFilter() {
- return filter;
+ public String getSearch() {
+ return this.search;
}
- public void setFilter(String filter) {
- this.filter = filter;
+ public void setSearch(String search) {
+ this.search = search;
}
public GroupCategory getCategory() {
@@ -63,8 +63,6 @@ public class BrowseGroupsUIBean extends PagedDataTableUIBean {
return dataModel;
}
- private ResourceGroupManagerLocal groupManager = LookupUtil.getResourceGroupManager();
-
private class ResultsDataModel extends PagedListDataModel<ResourceGroupComposite> {
public ResultsDataModel(PageControlView view, String beanName) {
@@ -72,13 +70,13 @@ public class BrowseGroupsUIBean extends PagedDataTableUIBean {
}
public PageList<ResourceGroupComposite> fetchPage(PageControl pc) {
- String filter = getFilter();
+ String search = getSearch();
GroupCategory category = getCategory();
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
criteria.setPageControl(pc);
- if (filter != null && !filter.equals("")) {
- criteria.addFilterName(filter);
+ if (search != null && !search.trim().equals("")) {
+ criteria.setSearchExpression(search);
}
criteria.addFilterGroupCategory(category);
@@ -88,15 +86,6 @@ public class BrowseGroupsUIBean extends PagedDataTableUIBean {
}
}
- public List<SearchSuggestion> autocomplete(Object suggest) {
- String currentInputText = (String) suggest;
-
- List<SearchSuggestion> suggestions = new ArrayList<SearchSuggestion>();
-
- // offer suggestions based on currentInputText
- return suggestions;
- }
-
public String deleteSelectedGroups() {
try {
Subject subject = getSubject();
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 8e016de..f892b13 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
@@ -128,7 +128,7 @@
<ui:remove>***** Resources > SAVED SEARCHES *****</ui:remove>
<rich:menuGroup value="Saved Searches" icon="/images/bookmark.png">
<c:forEach var="savedSearch" items="#{UserPreferencesUIBean.savedSearches}">
- <c:if test="#{savedSearch.context.name == 'RESOURCE'}">
+ <c:if test="#{savedSearch.searchSubsystem.name == 'RESOURCE'}">
<rich:menuItem submitMode="none"
icon="/images/icons/Flag_#{savedSearch.global ? 'yellow' : 'blue'}_16.png"
onclick="window.location = '/rhq/inventory/browseResources.xhtml?subtab=all&searchId=#{savedSearch.id}'">
@@ -247,6 +247,21 @@
</c:if>
</c:forEach>
</rich:menuGroup>
+
+ <ui:remove>***** Resources > SAVED SEARCHES *****</ui:remove>
+ <rich:menuGroup value="Saved Searches" icon="/images/bookmark.png">
+ <c:forEach var="savedSearch" items="#{UserPreferencesUIBean.savedSearches}">
+ <c:if test="#{savedSearch.searchSubsystem.name == 'GROUP'}">
+ <rich:menuItem submitMode="none"
+ icon="/images/icons/Flag_#{savedSearch.global ? 'yellow' : 'blue'}_16.png"
+ onclick="window.location = '/rhq/inventory/browseGroups.xhtml?subtab=all&searchId=#{savedSearch.id}'">
+ <h:outputText value="#{savedSearch.name}" />
+ <h:outputText value=" (#{savedSearch.resultCount})"
+ rendered="#{not empty savedSearch.resultCount}" />
+ </rich:menuItem>
+ </c:if>
+ </c:forEach>
+ </rich:menuGroup>
<rich:menuSeparator/>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
index f43cff1..6afdbd4 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
@@ -10,7 +10,7 @@
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
- <div class="searchBarContainer #{searchButtonId} #{searchSubsystem}"
+ <div class="searchBarContainer"
searchButtonId="#{searchButtonId}"
searchSubsystem="#{searchSubsystem}"
id="searchBar">
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml
index 70d9821..892a9cd 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml
@@ -30,44 +30,31 @@
<a4j:keepAlive beanName="BrowseGroupsUIBean"/>
+ <a4j:form>
+ <a4j:jsFunction name="applySearchFilter">
+ <a4j:actionparam name="param1" assignTo="#{BrowseGroupsUIBean.search}" />
+ </a4j:jsFunction>
+ </a4j:form>
<h:form id="browseGroupsForm">
<input type="hidden" name="subtab" value="${param.subtab}"/>
<p/>
- <h:panelGroup>
- <h:outputLabel for="filter" value="Search: " />
- <h:inputText id="filter" value="#{BrowseGroupsUIBean.filter}"
- onkeypress="return ignoreEnterKey(event);"
- style="width: 600px;" />
- <ui:remove>
- <rich:suggestionbox id="suggest" for="filter"
- tokens=",[]"
- width="600" height="400"
- border="1" cellpadding="1" cellspacing="1"
- minChars="0"
- first="0" rows="10"
- frequency="0.1"
- var="suggestItem"
- fetchValue="#{suggestItem.value}"
- suggestionAction="#{BrowseGroupsUIBean.autocomplete}"
- nothingLabel="Start typing for simple text matches"
- usingSuggestObjects="true"
- eventsQueue="groupSearchSuggestions"
- ignoreDupResponses="true"
- rendered="false"> <!-- disable until auto-completer is added -->
- <h:column>
- <h:outputText value="#{suggestItem.label}" />
- </h:column>
- </rich:suggestionbox>
- </ui:remove>
- <rich:spacer/>
- <a4j:commandButton value="GO"
+ <h:panelGrid columns="3">
+ <h:outputText value="Search: " />
+ <ui:include src="/rhq/common/searchInterface.xhtml">
+ <ui:param name="searchButtonId" value="browseGroupsForm:searchButtonJSF" />
+ <ui:param name="searchSubsystem" value="GROUP" />
+ </ui:include>
+
+ <a4j:commandButton id="searchButtonJSF" value="GO"
reRender="browseGroupsDataTable, browseGroupsDataTableScroller"
+ status="commonStatus"
actionListener="#{BrowseGroupsUIBean.clearDataModel}"
- styleClass="buttonmed">
+ styleClass="buttonmed"
+ onclick="applySearchFilter(getElementCrossBrowser('patternField').value);">
<s:defaultAction/>
</a4j:commandButton>
- </h:panelGroup>
+ </h:panelGrid>
<p/>
<h:panelGrid columns="1" width="100%">
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java
index 91676d0..d42f529 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java
@@ -59,7 +59,7 @@ public class SavedSearchResultCountRecalculationJob extends AbstractStatefulJob
long totalMillis = 0;
for (SavedSearch next : staleSavedSearches) {
try {
- if (next.getContext() == SearchSubsystem.RESOURCE) {
+ if (next.getSearchSubsystem() == SearchSubsystem.RESOURCE) {
ResourceCriteria criteria = new ResourceCriteria();
criteria.setSearchExpression(next.getPattern());
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java
new file mode 100644
index 0000000..1db1100
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java
@@ -0,0 +1,81 @@
+package org.rhq.enterprise.server.search.assist;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.search.SearchSubsystem;
+
+public class GroupSearchAssistant extends AbstractSearchAssistant {
+
+ private static final List<String> parameterizedContexts;
+ private static final List<String> simpleContexts;
+
+ static {
+ parameterizedContexts = Collections.emptyList();
+ simpleContexts = Collections.unmodifiableList(Arrays.asList("availability", "category", "type", "plugin",
+ "name"));
+ }
+
+ public SearchSubsystem getSearchSubsystem() {
+ return SearchSubsystem.GROUP;
+ }
+
+ @Override
+ public String getPrimarySimpleContext() {
+ return "name";
+ }
+
+ @Override
+ public List<String> getSimpleContexts() {
+ return simpleContexts;
+ }
+
+ @Override
+ public List<String> getParameterizedContexts() {
+ return parameterizedContexts;
+ }
+
+ @Override
+ public List<String> getParameters(String context, String filter) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List<String> getValues(String context, String param, String filter) {
+ if (context.equals("availability")) {
+ return filter(AvailabilityType.class, filter);
+
+ } else if (context.equals("category")) {
+ return filter(ResourceCategory.class, filter);
+
+ } else if (context.equals("type")) {
+ return execute("" //
+ + "SELECT DISTINCT type.name " //
+ + " FROM ResourceType type " //
+ + add(" WHERE LOWER(type.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
+ + " ORDER BY type.name ");
+
+ } else if (context.equals("plugin")) {
+ return execute("" //
+ + "SELECT DISTINCT type.plugin " //
+ + " FROM ResourceType type " //
+ + add(" WHERE LOWER(type.plugin) LIKE '%" + filter.toLowerCase() + "%'", filter) //
+ + " ORDER BY type.plugin ");
+
+ } else if (context.equals("name")) {
+ return execute("" //
+ + "SELECT DISTINCT rg.name " //
+ + " FROM ResourceGroup rg " //
+ + add(" WHERE LOWER(rg.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
+ + " ORDER BY rg.name ");
+
+ } else {
+ return Collections.emptyList();
+
+ }
+ }
+
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java
index abd7b1e..05ad883 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java
@@ -10,6 +10,8 @@ public class SearchAssistantFactory {
public static SearchAssistant getAssistant(SearchSubsystem searchContext) {
if (searchContext == SearchSubsystem.RESOURCE) {
return new ResourceSearchAssistant();
+ } else if (searchContext == SearchSubsystem.GROUP) {
+ return new GroupSearchAssistant();
} else {
throw new IllegalArgumentException("No SearchAssistant found for SearchSubsystem[" + searchContext + "]");
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
index e6e5f2a..38fadd1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
@@ -483,7 +483,7 @@ public class SearchAssistManager {
SavedSearchCriteria criteria = new SavedSearchCriteria();
criteria.addFilterSubjectId(subject.getId());
- criteria.addFilterSearchContext(searchSubsystem);
+ criteria.addFilterSearchSubsystem(searchSubsystem);
if (expression.equals("") == false) {
criteria.addFilterName(expression);
}
@@ -510,7 +510,7 @@ public class SearchAssistManager {
SavedSearchCriteria criteria = new SavedSearchCriteria();
criteria.addFilterGlobal(true);
- criteria.addFilterSearchContext(searchSubsystem);
+ criteria.addFilterSearchSubsystem(searchSubsystem);
if (expression.equals("") == false) {
criteria.addFilterName(expression);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java
new file mode 100644
index 0000000..a754f43
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java
@@ -0,0 +1,67 @@
+package org.rhq.enterprise.server.search.translation;
+
+import org.rhq.enterprise.server.search.translation.antlr.RHQLAdvancedTerm;
+import org.rhq.enterprise.server.search.translation.antlr.RHQLComparisonOperator;
+import org.rhq.enterprise.server.search.translation.jpql.SearchFragment;
+import org.rhq.enterprise.server.search.translation.jpql.SearchFragmentType;
+
+public class GroupSearchTranslator extends AbstractSearchTranslator {
+
+ public SearchFragment getSearchFragment(String alias, RHQLAdvancedTerm term) {
+ String path = term.getPath();
+ RHQLComparisonOperator op = term.getOperator();
+ String param = term.getParam();
+
+ String filter = term.getValue();
+
+ if (path.equals("availability")) {
+ if (op == RHQLComparisonOperator.NOT_NULL || op == RHQLComparisonOperator.NULL) {
+ return new SearchFragment(SearchFragmentType.WHERE_CLAUSE, "true");
+ }
+
+ String numericAvailabilityFragment = null;
+ if (op == RHQLComparisonOperator.EQUALS || op == RHQLComparisonOperator.EQUALS_STRICT) {
+ numericAvailabilityFragment = " = ";
+ } else {
+ numericAvailabilityFragment = " != ";
+ }
+
+ if (filter.equalsIgnoreCase("up")) {
+ numericAvailabilityFragment += "1";
+ } else {
+ numericAvailabilityFragment += "0";
+ }
+
+ return new SearchFragment( //
+ SearchFragmentType.PRIMARY_KEY_SUBQUERY, "SELECT rg.id" //
+ + " FROM ResourceGroup rg " //
+ + " WHERE ( SELECT AVG( iavail.availabilityType ) " //
+ + " FROM rg.explicitResources ires " //
+ + " JOIN ires.currentAvailability iavail ) " + numericAvailabilityFragment);
+
+ } else if (path.equals("category")) {
+ return new SearchFragment(SearchFragmentType.WHERE_CLAUSE, //
+ getJPQLForString(alias + ".resourceType.category", op, filter));
+
+ } else if (path.equals("type")) {
+ return new SearchFragment(SearchFragmentType.WHERE_CLAUSE, //
+ getJPQLForString(alias + ".resourceType.name", op, filter));
+
+ } else if (path.equals("plugin")) {
+ return new SearchFragment(SearchFragmentType.WHERE_CLAUSE, //
+ getJPQLForString(alias + ".resourceType.plugin", op, filter));
+
+ } else if (path.equals("name")) {
+ return new SearchFragment(SearchFragmentType.WHERE_CLAUSE, //
+ getJPQLForString(alias + ".name", op, filter));
+
+ } else {
+ if (param == null) {
+ throw new IllegalArgumentException("No search fragment available for " + path);
+ } else {
+ throw new IllegalArgumentException("No search fragment available for " + path + "[" + param + "]");
+ }
+ }
+ }
+
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java
index ee8ecda..10ad8f5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java
@@ -10,6 +10,8 @@ public class SearchTranslatorFactory {
public static SearchTranslator getTranslator(SearchSubsystem searchContext) {
if (searchContext == SearchSubsystem.RESOURCE) {
return new ResourceSearchTranslator();
+ } else if (searchContext == SearchSubsystem.GROUP) {
+ return new GroupSearchTranslator();
}
throw new IllegalArgumentException("No SearchTranslator found for SearchContext[" + searchContext + "]");
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 2272f12..73f1baf 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -206,7 +206,7 @@ public final class CriteriaQueryGenerator {
}
Map<String, Object> filterFields = getFilterFields(criteria);
- if (filterFields.size() > 0 || authorizationJoinFragment != null) {
+ if (filterFields.size() > 0 || authorizationJoinFragment != null || searchExpressionWhereClause != null) {
results.append("WHERE ");
}
commit a87c2c8db5aaadac9e7cf17137f8aea1c7821fe5
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sat May 22 00:52:51 2010 -0400
BZ-577853 - refactor SearchBar component so it can be reused for other SearchSubsystems
* get rid of static/singleton pattern
* have SearchBar manage creation of all other services/managers/widgets
* as necessary, instantitate children with a reference to their enclosing SearchBar
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
index 13f4e29..15a125c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
@@ -33,9 +33,8 @@ import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
public class SearchGUI implements EntryPoint {
public static SearchGUI singleton = new SearchGUI();
- public SearchBar searchBar;
-
private static Subject sessionSubject;
+ private SearchBar searchBar;
private SearchGUI() {
}
@@ -54,7 +53,7 @@ public class SearchGUI implements EntryPoint {
}
public void buildSearchGUI() {
- searchBar = SearchBar.get(); // TODO: SearchBar is a singleton right now, that restriction needs to be removed
+ searchBar = new SearchBar();
}
private static void portalWarLogin() {
@@ -79,4 +78,8 @@ public class SearchGUI implements EntryPoint {
public static Subject getSessionSubject() {
return sessionSubject;
}
+
+ public SearchBar getSearchBar() {
+ return searchBar;
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
index 8a38ed1..75cfbd8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -46,6 +46,7 @@ import com.google.gwt.user.client.ui.TextBox;
import org.rhq.core.domain.criteria.SavedSearchCriteria;
import org.rhq.core.domain.search.SavedSearch;
+import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid;
@@ -72,7 +73,7 @@ public class SearchBar {
public static final String TRASH = IMAGE_DIR + "trash.png";
- private final SuggestTextBox autoCompletePatternField;
+ private final SuggestTextBox autoCompletePatternField = new SuggestTextBox(this);
private final TextBox patternNameField = new TextBox();
private final Label patternNameLabel = new Label();
@@ -80,33 +81,46 @@ public class SearchBar {
private final Image arrowImage = new Image(ARROW_WHITE_URL);
private final PopupPanel savedSearchesPanel = new PopupPanel(true);
- private final SavedSearchGrid savedSearches = new SavedSearchGrid();
+ private final SavedSearchGrid savedSearches = new SavedSearchGrid(this);
private String currentSearch = "";
private long lastNameFieldBlurTime = 0;
- private final SavedSearchManager savedSearchManager = SavedSearchManager.get();
private final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
- public static SearchBar singleton;
+ private final SavedSearchManager savedSearchManager = new SavedSearchManager(this);
+ private SearchSubsystem searchSubsystem;
- public static SearchBar get() {
- if (singleton == null) {
- singleton = new SearchBar();
- }
- return singleton;
+ public static boolean existsOnPage() {
+ return getSearchBarElement() != null;
}
- public static boolean existsOnPage() {
- return DOM.getElementById("searchBar") != null;
+ private static Element getSearchBarElement() {
+ return DOM.getElementById("searchBar");
}
- private SearchBar() {
- System.out.println("Loading SearchBar...");
+ public void loadAdditionalDataFromDivAttributes() {
+ Element searchBarElement = getSearchBarElement();
- autoCompletePatternField = new SuggestTextBox("patternFieldSuggestionsContainer");
+ String searchButtonId = searchBarElement.getAttribute("searchButtonId");
+ DOM.setEventListener(DOM.getElementById(searchButtonId), new EventListener() {
+ @Override
+ public void onBrowserEvent(Event event) {
+ executeSearch();
+ }
+ });
+
+ String searchSubsystem = searchBarElement.getAttribute("searchSubsystemName");
+ this.searchSubsystem = (SearchSubsystem.valueOf(searchSubsystem.toUpperCase()));
+ }
+
+ public SearchBar() {
+ System.out.println("Loading SearchBar...");
RootPanel.get("patternFieldContainer").add(autoCompletePatternField);
+ RootPanel.get("patternFieldSuggestionsContainer").add(autoCompletePatternField.getSuggestionComponent());
+ autoCompletePatternField.hideInitialSuggestions();
+
RootPanel.get("patternNameFieldContainer").add(patternNameField);
RootPanel.get("patternNameLabelContainer").add(patternNameLabel);
RootPanel.get("starImageContainer").add(starImage);
@@ -119,11 +133,22 @@ public class SearchBar {
setupStarImage();
setupArrowImage();
setupSavedSearches();
- setupSearchButton();
+ // in the future, will be instantiated directly from a higher-level widget
+ if (existsOnPage()) {
+ loadAdditionalDataFromDivAttributes();
+ }
// presume the enclosing page logic loads results without a button click
}
+ public SavedSearchManager getSavedSearchManager() {
+ return savedSearchManager;
+ }
+
+ public SearchSubsystem getSearchSubsystem() {
+ return searchSubsystem;
+ }
+
public void executeSearch() {
String searchTerms = autoCompletePatternField.getText().toLowerCase().trim();
executeSearch(searchTerms);
@@ -218,27 +243,6 @@ public class SearchBar {
savedSearches.setPatternSelectionHandler(handler);
}
- private void setupSearchButton() {
- Element searchButtonContainerElement = DOM.getElementById("searchButtonContainer");
- String searchButtonElementId = searchButtonContainerElement.getClassName().split(" ")[0]; // yeah, it's hacky
-
- Element searchButtonElement = DOM.getElementById(searchButtonElementId);
- if (searchButtonElement == null) {
- return;
- }
-
- DOM.setEventListener(searchButtonElement, new EventListener() {
- @Override
- public void onBrowserEvent(Event event) {
- executeSearch();
- }
- });
-
- //searchButton.addStyleName("searchButton");
- //SearchButtonEventHandler handler = new SearchButtonEventHandler();
- //searchButton.addClickHandler(handler);
- }
-
private void turnNameFieldIntoLabel() {
String pattern = autoCompletePatternField.getValue();
String name = patternNameField.getText();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
index 76c4ad6..3c02aa4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
@@ -33,6 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
public class SavedSearchGrid extends Grid {
private PatternSelectionHandler patternSelectionHandler;
+ private SearchBar searchBar;
public interface PatternSelectionHandler {
public void handleSelection(int rowIndex, int columnIndex, String patternName);
@@ -57,15 +58,16 @@ public class SavedSearchGrid extends Grid {
}
}
- private static SavedSearchManager manager = SavedSearchManager.get();
+ public SavedSearchGrid(SearchBar searchBar) {
+ super(0, 2); // assume no rows to start, but we'll always have 2 columns
- public SavedSearchGrid() {
- super(count(), 2);
setRowFormatter(new SavedSearchRowFormatter());
sinkEvents(Event.ONMOUSEOVER | Event.ONMOUSEOUT | Event.ONCLICK);
setCellSpacing(0);
setCellPadding(5);
setStyleName("savedSearchesGrid");
+
+ this.searchBar = searchBar;
}
@Override
@@ -115,14 +117,14 @@ public class SavedSearchGrid extends Grid {
}
public void updateModel() {
- List<String> names = manager.getPatternNamesMRU();
+ List<String> names = searchBar.getSavedSearchManager().getPatternNamesMRU();
clear(true);
resizeRows(names.size());
for (int i = 0; i < names.size(); i++) {
String name = names.get(i);
- String pattern = manager.getPatternByName(name);
+ String pattern = searchBar.getSavedSearchManager().getPatternByName(name);
setHTML(i, 0, stylize(name, pattern));
setHTML(i, 1, trashify());
}
@@ -138,8 +140,8 @@ public class SavedSearchGrid extends Grid {
return "<div name=\"action\"> </div>";
}
- private static int count() {
- return manager.getSavedSearchCount();
+ private int count() {
+ return searchBar.getSavedSearchManager().getSavedSearchCount();
}
public String getSelectedItem() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
index 3365be7..eb5e919 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
@@ -29,10 +29,10 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.SavedSearchCriteria;
import org.rhq.core.domain.search.SavedSearch;
-import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.enterprise.gui.coregui.client.SearchGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
/**
@@ -43,16 +43,13 @@ public class SavedSearchManager {
private final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
private LinkedHashMap<String, SavedSearch> savedSearches = new LinkedHashMap<String, SavedSearch>();
- private static SavedSearchManager singleton = new SavedSearchManager();
+ private SearchBar searchBar;
- public SavedSearchManager() {
+ public SavedSearchManager(SearchBar searchBar) {
+ this.searchBar = searchBar;
load();
}
- public synchronized static SavedSearchManager get() {
- return singleton;
- }
-
public synchronized String getPatternByName(String name) {
SavedSearch savedSearch = savedSearches.get(name);
if (savedSearch == null) {
@@ -64,7 +61,7 @@ public class SavedSearchManager {
public synchronized void updatePatternByName(final String name, final String pattern) {
SavedSearch savedSearch = savedSearches.get(name);
if (savedSearch == null) { // created case
- final SavedSearch newSavedSearch = new SavedSearch(SearchSubsystem.RESOURCE, name, pattern, SearchGUI
+ final SavedSearch newSavedSearch = new SavedSearch(searchBar.getSearchSubsystem(), name, pattern, SearchGUI
.getSessionSubject());
searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java
index d010b30..3748e97 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.search.suggest;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import com.google.gwt.dom.client.Document;
@@ -30,34 +29,14 @@ import com.google.gwt.user.client.ui.ListBox;
import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.core.domain.search.SearchSuggestion.Kind;
-import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
public class SuggestResultsListBox extends ListBox {
public static final String FOOTER_MESSAGE = "Start typing for more simple text matches";
- private List<SearchSuggestion> searchSuggestions;
- private SuggestionItemComparator suggestionItemComparator;
+ private List<SearchSuggestion> searchSuggestions = new ArrayList<SearchSuggestion>();
private final List<String> OPERATORS = Arrays.asList("!==", "!=", "==", "=");
- public SuggestResultsListBox() {
- this.searchSuggestions = new ArrayList<SearchSuggestion>();
-
- this.suggestionItemComparator = new SuggestionItemComparator();
- }
-
- class SuggestionItemComparator implements Comparator<SearchSuggestion> {
- public int compare(SearchSuggestion first, SearchSuggestion second) {
- try {
- return first.getValue().toLowerCase().compareTo(second.getValue().toLowerCase());
- } catch (Throwable t) {
- SearchLogger.debug("Error sorting suggestions '" + first.getValue() + "' '" + second.getValue() + "': "
- + t.getMessage());
- }
- return 0;
- }
- };
-
public void setErrorMessage(String error) {
this.searchSuggestions.clear();
this.searchSuggestions.add(new SearchSuggestion(Kind.InstructionalTextComment, error));
@@ -69,9 +48,6 @@ public class SuggestResultsListBox extends ListBox {
}
public int render(int maxSuggestions, int maxResultsShown) {
- // sorting is done on the server-side
- //Collections.sort(searchSuggestions, suggestionItemComparator);
-
clear();
int addedResults = 0;
@@ -86,7 +62,6 @@ public class SuggestResultsListBox extends ListBox {
}
appendSuggestItem(next);
- //appendSuggestItem(next.getLabel(), prefix, className, next.getStartIndex(), next.getEndIndex());
addedResults++;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
index 438c163..0b5d877 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
@@ -31,7 +31,6 @@ import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.TextBox;
@@ -40,7 +39,6 @@ import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
-import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchManager;
public class SuggestTextBox extends TextBox {
@@ -48,12 +46,15 @@ public class SuggestTextBox extends TextBox {
protected ScrollPanel choicesScrollPanel = new ScrollPanel();
protected SuggestResultsListBox choices = new SuggestResultsListBox();
+ private SearchBar searchBar;
+
private SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
- public SuggestTextBox(String rootPanelID) {
+ public SuggestTextBox(SearchBar searchBar) {
super();
+ this.searchBar = searchBar;
setupTextBox();
- setupChoicesPopup(rootPanelID);
+ setupChoicesPopup();
setupChoicesListBox();
}
@@ -64,14 +65,14 @@ public class SuggestTextBox extends TextBox {
this.addFocusHandler(handler);
}
- public void setupChoicesPopup(String rootPanelID) {
+ public void setupChoicesPopup() {
choicesPopup.removeStyleName("gwt-PopupPanel");
choicesPopup.addStyleName("suggestPanel");
choicesPopup.add(choices);
+ }
- RootPanel.get(rootPanelID).add(choicesPopup);
- show();
- hide();
+ public PopupPanel getSuggestionComponent() {
+ return choicesPopup;
}
public void setupChoicesListBox() {
@@ -82,6 +83,11 @@ public class SuggestTextBox extends TextBox {
choices.addClickHandler(handler);
}
+ public void hideInitialSuggestions() {
+ show();
+ hide();
+ }
+
public boolean isSuggestionListShowing() {
return isDisplayed();
}
@@ -122,9 +128,9 @@ public class SuggestTextBox extends TextBox {
// if this is a saved search pattern completion, execute that search immediately
System.out.println("just completed to '" + this.getValue() + "'");
- String patternValue = SavedSearchManager.get().getPatternByName(this.getValue());
+ String patternValue = searchBar.getSavedSearchManager().getPatternByName(this.getValue());
if (patternValue != null) {
- SearchBar.get().executeSearch(this.getValue());
+ searchBar.executeSearch(this.getValue());
} else {
// send a 'fake' key, this will rerender PopupPanel with the new completion list
handleKeyCode(0);
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
index 98a35b1..f43cff1 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
@@ -10,7 +10,10 @@
xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
- <div class="searchBarContainer" id="searchBar">
+ <div class="searchBarContainer #{searchButtonId} #{searchSubsystem}"
+ searchButtonId="#{searchButtonId}"
+ searchSubsystem="#{searchSubsystem}"
+ id="searchBar">
<div class="searchBarBackgroundContainer">
<div class="searchBarComponentsContainer">
<div class="searchBarComponentLHS" id="patternFieldContainer"></div>
@@ -23,7 +26,7 @@
</div>
</div>
</div>
- <div class="#{searchButtonId} searchBarButtonContainer" id="searchButtonContainer"></div>
+ <div class="searchBarButtonContainer" id="searchButtonContainer"></div>
<div style="position: absolute;" id="patternFieldSuggestionsContainer"></div>
<div style="position: absolute; width: 800px;" id="savedSearchesContainer"></div>
<br style="clear: both;" />
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
index abd0489..571d93d 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
@@ -43,6 +43,7 @@
<h:outputText value="Search: " />
<ui:include src="/rhq/common/searchInterface.xhtml">
<ui:param name="searchButtonId" value="browseResourcesForm:searchButtonJSF" />
+ <ui:param name="searchSubsystem" value="RESOURCE" />
</ui:include>
<a4j:commandButton id="searchButtonJSF" value="GO"
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
index 1c31930..cf9acf7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
@@ -51,10 +51,10 @@ public class SearchTranslationManager {
this.translator = SearchTranslatorFactory.getTranslator(this.context);
this.assistant = SearchAssistantFactory.getAssistant(this.context);
- ANTLRStringStream input = new ANTLRStringStream(expression); // Create an input character stream from standard in
+ ANTLRStringStream input = new ANTLRStringStream(this.expression); // Create an input character stream from standard in
this.lexer = new RHQLLexer(input); // Create an echoLexer that feeds from that stream
- CommonTokenStream tokens = new CommonTokenStream(lexer); // Create a stream of tokens fed by the lexer
+ CommonTokenStream tokens = new CommonTokenStream(this.lexer); // Create a stream of tokens fed by the lexer
this.parser = new RHQLParser(tokens); // Create a parser that feeds off the token stream
this.adaptor = new RHQLNodeAdaptor();
commit 817a233c148bf742f94a623016e1b94ee9e993b7
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 21 20:48:54 2010 -0400
add missing interface
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java
new file mode 100644
index 0000000..013bc08
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java
@@ -0,0 +1,5 @@
+package org.rhq.enterprise.server.search.translation.antlr;
+
+public interface RHQLTerm {
+
+}
commit 8701f1d8a65a592953d4617c294559670e5ea2d4
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 21 20:27:06 2010 -0400
BZ-562434 - finish up the translation routine for simple text searches
* convert simple text terms into advanced terms for the primarySimpleContext
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java
index 2d435df..abe36f2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java
@@ -36,4 +36,4 @@ public class RHQLAdvancedTerm implements RHQLTerm {
public String getValue() {
return value;
}
-}
+}
\ No newline at end of file
commit 5207360b0c339375ab78d9f7b86ec73c3c9850cc
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 21 20:24:15 2010 -0400
BZ-562434 - finish up the translation routine for simple text searches
* convert simple text terms into advanced terms for the primarySimpleContext
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
index ddb8f3b..abd0489 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
@@ -50,7 +50,7 @@
status="commonStatus"
actionListener="#{BrowseResourcesUIBean.clearDataModel}"
styleClass="buttonmed"
- onclick="applySearchFilter(getElementCrossBrowser('patternField'));">
+ onclick="applySearchFilter(getElementCrossBrowser('patternField').value);">
<s:defaultAction/>
</a4j:commandButton>
</h:panelGrid>
diff --git a/modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g b/modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g
index 6816a1e..517bece 100644
--- a/modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g
+++ b/modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g
@@ -75,11 +75,11 @@ tokens {
*/
searchExpression
- : conditionalExpression { /* System.out.println($conditionalExpression.tree.toStringTree()); */ }
+ : conditionalExpression
;
conditionalExpression
- : conds+=conditionalFactor ( WS+ ( 'or' | '|' ) WS+ conds+=conditionalFactor )* -> { $conds.size() == 1 }? ^($conds)
+ : conds+=conditionalFactor ( WS+ ( '|' ) WS+ conds+=conditionalFactor )* -> { $conds.size() == 1 }? ^($conds)
-> ^(OR conditionalFactor+)
; // use rewrite predicates to eliminate superfluous 'or' node if only one child
@@ -136,7 +136,7 @@ boundedValue
; // consume until we find a whitespace char or ']' to terminate the current phrase
openEndedvalue
- : ~( '(' | ')' | WS )*
+ : ~( '|' ) ~( '(' | ')' | WS )*
; // consume until we find a whitespace char to ')' terminate the current phrase, or '(' begin the next phrase
comparisonOperator
@@ -149,7 +149,7 @@ comparisonOperator
/*
* lexical elements
*/
-
+
ID
: 'a'..'z' | 'A'..'Z'
;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
index a459d87..c35edc0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
@@ -27,6 +27,10 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
this.maxResultCount = maxResultCount;
}
+ public String getPrimarySimpleContext() {
+ return null;
+ }
+
public List<String> getSimpleContexts() {
return Collections.emptyList();
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
index d0721eb..476d219 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
@@ -24,6 +24,11 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
}
@Override
+ public String getPrimarySimpleContext() {
+ return "name";
+ }
+
+ @Override
public List<String> getSimpleContexts() {
return simpleContexts;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistant.java
index 4314e06..afac3f6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistant.java
@@ -8,6 +8,8 @@ public interface SearchAssistant {
SearchSubsystem getSearchSubsystem();
+ String getPrimarySimpleContext();
+
List<String> getSimpleContexts();
List<String> getParameterizedContexts();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java
new file mode 100644
index 0000000..abd7b1e
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java
@@ -0,0 +1,17 @@
+package org.rhq.enterprise.server.search.assist;
+
+import org.rhq.core.domain.search.SearchSubsystem;
+
+public class SearchAssistantFactory {
+ private SearchAssistantFactory() {
+ // force use of static methods only
+ }
+
+ public static SearchAssistant getAssistant(SearchSubsystem searchContext) {
+ if (searchContext == SearchSubsystem.RESOURCE) {
+ return new ResourceSearchAssistant();
+ } else {
+ throw new IllegalArgumentException("No SearchAssistant found for SearchSubsystem[" + searchContext + "]");
+ }
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
index a52159a..e6e5f2a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
@@ -17,8 +17,8 @@ import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.core.domain.search.SearchSuggestion.Kind;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.server.search.SavedSearchManagerLocal;
-import org.rhq.enterprise.server.search.assist.AbstractSearchAssistant;
-import org.rhq.enterprise.server.search.assist.ResourceSearchAssistant;
+import org.rhq.enterprise.server.search.assist.SearchAssistant;
+import org.rhq.enterprise.server.search.assist.SearchAssistantFactory;
import org.rhq.enterprise.server.util.LookupUtil;
public class SearchAssistManager {
@@ -309,15 +309,10 @@ public class SearchAssistManager {
public SearchAssistManager(Subject subject, SearchSubsystem searchSubsystem) {
this.subject = subject;
this.searchSubsystem = searchSubsystem;
-
}
- protected AbstractSearchAssistant getSearchAssistant() {
- if (searchSubsystem == SearchSubsystem.RESOURCE) {
- return new ResourceSearchAssistant();
- } else {
- throw new IllegalArgumentException("No SearchAssistant found for SearchSubsystem[" + searchSubsystem + "]");
- }
+ protected SearchAssistant getSearchAssistant() {
+ return SearchAssistantFactory.getAssistant(searchSubsystem);
}
private List<String> getAllContexts() {
@@ -349,7 +344,7 @@ public class SearchAssistManager {
}
public List<SearchSuggestion> getSimpleSuggestions(String expression, int caretPos) {
- AbstractSearchAssistant completor = getSearchAssistant();
+ SearchAssistant completor = getSearchAssistant();
debug("getSimpleSuggestions: START");
@@ -366,25 +361,16 @@ public class SearchAssistManager {
* would hold it's current value, which in this case we'll extract and use as the simple value match
*/
String parsedTerm = parsed.context;
- List<SearchSuggestion> results = new ArrayList<SearchSuggestion>();
- for (String nextContext : completor.getSimpleContexts()) {
-
- debug("getSimpleSuggestions: suggesting value completions for a simple context [" + nextContext + "]");
- List<String> valueSuggestions = pad("\"", completor.getValues(nextContext, null, parsedTerm), "\"");
+ String primarySimpleContext = completor.getPrimarySimpleContext();
+ debug("getSimpleSuggestions: suggesting value completions for a simple context [" + primarySimpleContext + "]");
- List<SearchSuggestion> suggestions = convert(valueSuggestions, parsed, parsedTerm, Kind.Simple);
- results.addAll(suggestions);
- }
- Collections.sort(results);
- if (results.size() > completor.getMaxResultCount()) {
- return results.subList(0, completor.getMaxResultCount());
- } else {
- return results;
- }
+ List<String> valueSuggestions = pad("\"", completor.getValues(primarySimpleContext, null, parsedTerm), "\"");
+ List<SearchSuggestion> suggestions = convert(valueSuggestions, parsed, parsedTerm, Kind.Simple);
+ return suggestions;
}
public List<SearchSuggestion> getAdvancedSuggestions(String expression, int caretPos) {
- AbstractSearchAssistant completor = getSearchAssistant();
+ SearchAssistant completor = getSearchAssistant();
debug("getAdvancedSuggestions: START");
SearchTermAssistant assistant = new SearchTermAssistant(expression, caretPos);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
index 812bc57..1c31930 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java
@@ -13,9 +13,13 @@ import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.enterprise.server.search.RHQLLexer;
import org.rhq.enterprise.server.search.RHQLParser;
import org.rhq.enterprise.server.search.antlr.RHQLNodeAdaptor;
+import org.rhq.enterprise.server.search.assist.SearchAssistant;
+import org.rhq.enterprise.server.search.assist.SearchAssistantFactory;
import org.rhq.enterprise.server.search.translation.SearchTranslator;
import org.rhq.enterprise.server.search.translation.SearchTranslatorFactory;
+import org.rhq.enterprise.server.search.translation.antlr.RHQLAdvancedTerm;
import org.rhq.enterprise.server.search.translation.antlr.RHQLComparisonOperator;
+import org.rhq.enterprise.server.search.translation.antlr.RHQLSimpleTerm;
import org.rhq.enterprise.server.search.translation.antlr.RHQLTerm;
import org.rhq.enterprise.server.search.translation.antlr.RHQLTreeOperator;
import org.rhq.enterprise.server.search.translation.jpql.SearchFragment;
@@ -26,6 +30,7 @@ public class SearchTranslationManager {
private SearchSubsystem context;
private String expression;
private SearchTranslator translator;
+ private SearchAssistant assistant;
private RHQLLexer lexer;
private RHQLParser parser;
@@ -44,6 +49,7 @@ public class SearchTranslationManager {
this.expression = expression;
this.translator = SearchTranslatorFactory.getTranslator(this.context);
+ this.assistant = SearchAssistantFactory.getAssistant(this.context);
ANTLRStringStream input = new ANTLRStringStream(expression); // Create an input character stream from standard in
this.lexer = new RHQLLexer(input); // Create an echoLexer that feeds from that stream
@@ -103,7 +109,16 @@ public class SearchTranslationManager {
first = false;
}
- SearchFragment searchFragment = translator.getSearchFragment(alias, nextTerm);
+ RHQLAdvancedTerm advancedTerm = null;
+ if (nextTerm instanceof RHQLSimpleTerm) {
+ RHQLSimpleTerm simpleTerm = (RHQLSimpleTerm) nextTerm;
+ advancedTerm = new RHQLAdvancedTerm(null, assistant.getPrimarySimpleContext(), null,
+ RHQLComparisonOperator.EQUALS, simpleTerm.getValue());
+ } else {
+ advancedTerm = (RHQLAdvancedTerm) nextTerm;
+ }
+
+ SearchFragment searchFragment = translator.getSearchFragment(alias, advancedTerm);
String jpqlFragment = searchFragment.getFragment();
if (searchFragment.getType() == SearchFragmentType.PRIMARY_KEY_SUBQUERY) {
jpqlFragment = " " + alias + ".id IN (" + jpqlFragment + ")";
@@ -120,11 +135,19 @@ public class SearchTranslationManager {
public static List<RHQLTerm> getFromAST(CommonTree tree) {
List<RHQLTerm> terms = new ArrayList<RHQLTerm>();
- CommonTree contextTree = (CommonTree) tree.getChild(0);
+ // simple text match
+ if (tree.getToken().getType() == RHQLLexer.IDENT) {
+ String value = PrintUtils.collapseStringChildren(tree);
+ RHQLTerm nextTerm = new RHQLSimpleTerm(value);
+ terms.add(nextTerm);
+ return terms;
+ }
+ // advanced query match
String lineage = null;
String path = null;
String param = null;
+ CommonTree contextTree = (CommonTree) tree.getChild(0);
for (int childIndex = 0; childIndex < contextTree.getChildCount(); childIndex++) {
CommonTree child = (CommonTree) contextTree.getChild(childIndex);
if (child.getToken().getType() == RHQLLexer.LINEAGE) {
@@ -147,7 +170,7 @@ public class SearchTranslationManager {
int type = tree.getToken().getType();
RHQLComparisonOperator operator = getComparisonOperatorFromTokenType(type, value);
- RHQLTerm nextTerm = new RHQLTerm(lineage, path, param, operator, value);
+ RHQLTerm nextTerm = new RHQLAdvancedTerm(lineage, path, param, operator, value);
terms.add(nextTerm);
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
index 1b1565c..db4269c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java
@@ -1,14 +1,14 @@
package org.rhq.enterprise.server.search.translation;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.enterprise.server.search.translation.antlr.RHQLAdvancedTerm;
import org.rhq.enterprise.server.search.translation.antlr.RHQLComparisonOperator;
-import org.rhq.enterprise.server.search.translation.antlr.RHQLTerm;
import org.rhq.enterprise.server.search.translation.jpql.SearchFragment;
import org.rhq.enterprise.server.search.translation.jpql.SearchFragmentType;
public class ResourceSearchTranslator extends AbstractSearchTranslator {
- public SearchFragment getSearchFragment(String alias, RHQLTerm term) {
+ public SearchFragment getSearchFragment(String alias, RHQLAdvancedTerm term) {
String path = term.getPath();
RHQLComparisonOperator op = term.getOperator();
String param = term.getParam();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslator.java
index eca293f..4febbe8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslator.java
@@ -1,9 +1,9 @@
package org.rhq.enterprise.server.search.translation;
-import org.rhq.enterprise.server.search.translation.antlr.RHQLTerm;
+import org.rhq.enterprise.server.search.translation.antlr.RHQLAdvancedTerm;
import org.rhq.enterprise.server.search.translation.jpql.SearchFragment;
public interface SearchTranslator {
- public SearchFragment getSearchFragment(String alias, RHQLTerm term);
+ public SearchFragment getSearchFragment(String alias, RHQLAdvancedTerm term);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java
new file mode 100644
index 0000000..2d435df
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java
@@ -0,0 +1,39 @@
+package org.rhq.enterprise.server.search.translation.antlr;
+
+public class RHQLAdvancedTerm implements RHQLTerm {
+ private final String lineage;
+ private final String path;
+ private final String param;
+
+ private final RHQLComparisonOperator operator;
+
+ private final String value;
+
+ public RHQLAdvancedTerm(String lineage, String path, String param, RHQLComparisonOperator operator, String value) {
+ this.lineage = lineage;
+ this.path = path;
+ this.param = param;
+ this.operator = operator;
+ this.value = value;
+ }
+
+ public String getLineage() {
+ return lineage;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public String getParam() {
+ return param;
+ }
+
+ public RHQLComparisonOperator getOperator() {
+ return operator;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLSimpleTerm.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLSimpleTerm.java
new file mode 100644
index 0000000..f60fe65
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLSimpleTerm.java
@@ -0,0 +1,13 @@
+package org.rhq.enterprise.server.search.translation.antlr;
+
+public class RHQLSimpleTerm implements RHQLTerm {
+ private final String value;
+
+ public RHQLSimpleTerm(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java
deleted file mode 100644
index 687607d..0000000
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.rhq.enterprise.server.search.translation.antlr;
-
-public class RHQLTerm {
- private final String lineage;
- private final String path;
- private final String param;
-
- private final RHQLComparisonOperator operator;
-
- private final String value;
-
- public RHQLTerm(String lineage, String path, String param, RHQLComparisonOperator operator, String value) {
- this.lineage = lineage;
- this.path = path;
- this.param = param;
- this.operator = operator;
- this.value = value;
- }
-
- public String getLineage() {
- return lineage;
- }
-
- public String getPath() {
- return path;
- }
-
- public String getParam() {
- return param;
- }
-
- public RHQLComparisonOperator getOperator() {
- return operator;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt b/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt
index 265071b..25746f8 100644
--- a/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt
+++ b/modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt
@@ -46,12 +46,6 @@ context[param] != null
(context[param] != null)
-# single-pair parenthetical combinations
-# simple expression, 'or' boolean operator
-context = value1 or context = value2
-(context = value1) or context = value2
-context = value1 or (context = value2)
-(context = value1) or (context = value2)
# single-pair parenthetical combinations
# simple expression, '|' boolean operator (meaning 'or')
@@ -69,14 +63,6 @@ context = value (context = value)
(context = value) (context = value)
-# double-pair parenthetical combinations
-# simple expression, 'or' boolean operator
-((context = value1 or context = value2))
-((context = value1) or context = value2)
-((context = value1)) or context = value2
-(context = value1) or (context = value2)
-(context = value1 or (context = value2))
-context = value1 or ((context = value2))
# double-pair parenthetical combinations
# simple expression, '|' boolean operator (meaning 'or')
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/RHQLTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/RHQLTest.java
index e2f3fcb..26d122c 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/RHQLTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/RHQLTest.java
@@ -41,6 +41,8 @@ import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
+import org.rhq.enterprise.server.search.RHQLParser.searchExpression_return;
+
/**
* Test harness to verify correctness of RHQL grammar
*
@@ -66,7 +68,8 @@ public class RHQLTest extends AssertJUnit {
RHQLLexer lexer = new RHQLLexer(input); // Create an echoLexer that feeds from that stream
CommonTokenStream tokens = new CommonTokenStream(lexer); // Create a stream of tokens fed by the lexer
RHQLParser parser = new RHQLParser(tokens); // Create a parser that feeds off the token stream
- parser.searchExpression(); // Begin parsing at 'searchExpression' rule
+ searchExpression_return parseResults = parser.searchExpression(); // Begin parsing at 'searchExpression' rule
+ System.out.println(parseResults.tree.toStringTree()); // Print result
return TestResult.SUCCESS;
} catch (Throwable t) {
return TestResult.FAILURE;
commit 9189cf82995c28beac1d5f060417015ce670157c
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 21 19:07:29 2010 -0400
bring back the feature to auto-fresh resource/group counts in the inventory browser tab headers
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml
index 24c4a72..ceb1d3e 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml
@@ -28,15 +28,13 @@
<ui:define name="summary"></ui:define>
<ui:define name="tabBar">
- <ui:remove>
+
<a4j:region>
<h:form>
<a4j:poll interval="60000" timeout="5000"
reRender="browserTabBarPanel" status="commonStatus" />
</h:form>
</a4j:region>
- </ui:remove>
-
<onc:tabBar id="browserTabBarPanel" selectedTabName="#{selectedTabName}" >
<onc:tab name="Resources"
commit 19a5b91156442e37c3196b1aed1e07f2c2938924
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 21 17:11:46 2010 -0400
BZ-577853 - second cut of GWT-based search bar functionality:
* fixed ViewExpiredException by NOT calling j_security_check.do from SearchGUI, which causes session invalidation and re-login
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
index faeeab0..13f4e29 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
@@ -19,11 +19,6 @@
package org.rhq.enterprise.gui.coregui.client;
import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.http.client.Request;
-import com.google.gwt.http.client.RequestBuilder;
-import com.google.gwt.http.client.RequestCallback;
-import com.google.gwt.http.client.RequestException;
-import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Label;
@@ -39,7 +34,7 @@ public class SearchGUI implements EntryPoint {
public static SearchGUI singleton = new SearchGUI();
public SearchBar searchBar;
-
+
private static Subject sessionSubject;
private SearchGUI() {
@@ -63,23 +58,6 @@ public class SearchGUI implements EntryPoint {
}
private static void portalWarLogin() {
- RequestBuilder b = new RequestBuilder(RequestBuilder.GET,
- "/j_security_check.do?j_username=rhqadmin&j_password=rhqadmin");
- try {
- b.setCallback(new RequestCallback() {
- public void onResponseReceived(Request request, Response response) {
- System.out.println("Portal-War logged in");
- }
-
- public void onError(Request request, Throwable exception) {
- System.out.println("Portal-War login failed");
- }
- });
- b.send();
- } catch (RequestException e) {
- e.printStackTrace();
- }
-
SubjectGWTServiceAsync subjectService = SubjectGWTServiceAsync.Util.getInstance();
subjectService.login("rhqadmin", "rhqadmin", new AsyncCallback<Subject>() {
@@ -97,7 +75,7 @@ public class SearchGUI implements EntryPoint {
}
});
}
-
+
public static Subject getSessionSubject() {
return sessionSubject;
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java
index dabf0a5..f6d1290 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java
@@ -1,9 +1,6 @@
package org.rhq.enterprise.gui.inventory.browse;
-import java.util.List;
-
import javax.faces.application.FacesMessage;
-import javax.faces.component.html.HtmlInputText;
import javax.faces.model.DataModel;
import org.apache.commons.logging.Log;
@@ -13,8 +10,6 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.composite.ResourceComposite;
-import org.rhq.core.domain.search.SearchSubsystem;
-import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.gui.util.FacesContextUtility;
@@ -25,8 +20,6 @@ import org.rhq.enterprise.gui.common.paging.PageControlView;
import org.rhq.enterprise.gui.common.paging.ResourceNameDisambiguatingPagedListDataModel;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
-import org.rhq.enterprise.server.search.execution.SearchAssistManager;
-import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
import org.rhq.enterprise.server.util.LookupUtil;
public class BrowseResourcesUIBean extends PagedDataTableUIBean {
@@ -35,7 +28,6 @@ public class BrowseResourcesUIBean extends PagedDataTableUIBean {
public static final String MANAGED_BEAN_NAME = "BrowseResourcesUIBean";
private String search;
- private HtmlInputText searchInput;
private ResourceCategory category;
private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
@@ -134,24 +126,4 @@ public class BrowseResourcesUIBean extends PagedDataTableUIBean {
private String[] getSelectedItems() {
return FacesContextUtility.getRequest().getParameterValues("selectedItems");
}
-
- SearchAssistManager searchAssist = new SearchAssistManager(getSubject(), SearchSubsystem.RESOURCE);
-
- public List<SearchSuggestion> autocomplete(Object suggest) {
- String currentInputText = (String) suggest;
-
- // assume caret at the end of the input
- long id = HibernatePerformanceMonitor.get().start();
- List<SearchSuggestion> suggestions = searchAssist.getSuggestions(currentInputText, currentInputText.length());
- HibernatePerformanceMonitor.get().stop(id, "ResourceSuggestions");
- return suggestions;
- }
-
- public HtmlInputText getSearchInput() {
- return searchInput;
- }
-
- public void setSearchInput(HtmlInputText searchInput) {
- this.searchInput = searchInput;
- }
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
index 4972201..ddb8f3b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
@@ -31,7 +31,7 @@
<a4j:keepAlive beanName="BrowseResourcesUIBean"/>
<a4j:form>
- <a4j:jsFunction name="extractSearchFilter">
+ <a4j:jsFunction name="applySearchFilter">
<a4j:actionparam name="param1" assignTo="#{BrowseResourcesUIBean.search}" />
</a4j:jsFunction>
</a4j:form>
@@ -39,60 +39,6 @@
<input type="hidden" name="subtab" value="${param.subtab}" />
<p/>
- <h:panelGroup>
- <h:outputLabel for="search" value="Search: " />
- <h:inputText id="search"
- binding="#{BrowseResourcesUIBean.searchInput}"
- value="#{BrowseResourcesUIBean.search}"
- onkeypress="return ignoreEnterKey(event);"
- style="width: 600px;">
- <ui:remove>
- <a4j:support event="onfocus" reRender="suggest"
- disableDefault="true" status="commonStatus" limitToList="true"
- ajaxSingle="true" oncomplete="#{rich:component('suggest')}.show(event, {})"/>
- </ui:remove>
- </h:inputText>
- <rich:suggestionbox id="suggest" for="search"
- width="600" height="400"
- border="1" cellpadding="1" cellspacing="1"
- minChars="0"
- first="0" rows="10"
- frequency="0"
- var="suggestItem"
- fetchValue="#{suggestItem.value}"
- selfRendered="true"
- suggestionAction="#{BrowseResourcesUIBean.autocomplete}"
- nothingLabel="Start typing for simple text matches"
- usingSuggestObjects="true"
- eventsQueue="resourceSearchSuggestions"
- ignoreDupResponses="true"
- rendered="true">
- <h:column width="10%">
- <h:outputText value="#{suggestItem.kind.displayName}" style="font-variant: small-caps; color: gray;"
- rendered="#{suggestItem.kind.name eq 'Simple'}" />
- <h:outputText value="#{suggestItem.kind.displayName}" style="font-variant: small-caps; "
- rendered="#{suggestItem.kind.name eq 'Advanced'}" />
- <h:outputText value="#{suggestItem.kind.displayName}" style="font-variant: small-caps; color: yellow"
- rendered="#{suggestItem.kind.name eq 'AdvancedOperator'}" />
- <h:outputText value="#{suggestItem.kind.displayName}" style="font-variant: small-caps; color: green;"
- rendered="#{suggestItem.kind.name eq 'UserSavedSearch'}" />
- <h:outputText value="#{suggestItem.kind.displayName}" style="font-variant: small-caps; color: orange;"
- rendered="#{suggestItem.kind.name eq 'GlobalSavedSearch'}" />
- </h:column>
- <h:column width="90%">
- <h:outputText value="#{suggestItem.label}" />
- </h:column>
- </rich:suggestionbox>
- <rich:spacer/>
- <a4j:commandButton value="GO"
- reRender="browseResourcesDataTable, browseResourcesDataTableScroller"
- status="commonStatus"
- actionListener="#{BrowseResourcesUIBean.clearDataModel}"
- styleClass="buttonmed">
- <s:defaultAction/>
- </a4j:commandButton>
- </h:panelGroup>
- <ui:remove>
<h:panelGrid columns="3">
<h:outputText value="Search: " />
<ui:include src="/rhq/common/searchInterface.xhtml">
@@ -104,11 +50,10 @@
status="commonStatus"
actionListener="#{BrowseResourcesUIBean.clearDataModel}"
styleClass="buttonmed"
- onclick="extractSearchFilter(getElementCrossBrowser('patternField').value)">
+ onclick="applySearchFilter(getElementCrossBrowser('patternField'));">
<s:defaultAction/>
</a4j:commandButton>
</h:panelGrid>
- </ui:remove>
<p/>
<h:panelGrid columns="1" width="100%">
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
index 3d5393b..a52159a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
@@ -599,6 +599,6 @@ public class SearchAssistManager {
}
private void debug(String message) {
- LOG.info(message);
+ LOG.debug(message);
}
}
commit 457218a94047b24443699df5fab3fc67031f884b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri May 21 15:39:13 2010 -0400
if failed to load in inventory.dat, clear out any inventory that might have been partially loaded, remove the inventory.dat (we rename it actually, in case we want to perform some post-failure analysis on it) and return as if there was no inventory.dat (thus making the agent start up as if it has no known inventory to start with)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index e309286..8944b99 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1535,8 +1535,9 @@ public class InventoryManager extends AgentService implements ContainerService,
private void loadFromDisk() {
this.inventoryLock.writeLock().lock();
+ File file = null;
try {
- File file = new File(this.configuration.getDataDirectory(), "inventory.dat");
+ file = new File(this.configuration.getDataDirectory(), "inventory.dat");
if (file.exists()) {
long start = System.currentTimeMillis();
log.info("Loading inventory from data file [" + file + "]...");
@@ -1558,7 +1559,14 @@ public class InventoryManager extends AgentService implements ContainerService,
+ (System.currentTimeMillis() - start) + "ms]");
}
} catch (Exception e) {
- log.error("Could not load inventory from data file.", e);
+ this.platform = null;
+ this.resourceContainers.clear();
+ if (file != null) {
+ file.renameTo(new File(file.getAbsolutePath() + ".invalid")); // move it out of the way if we can, retain it for later analysis
+ }
+ log.error(
+ "Could not load inventory from data file. The agent has lost knowledge of its previous inventory - "
+ + "it will resync its inventory once it can reconnect with a server.", e);
} finally {
this.inventoryLock.writeLock().unlock();
}
commit aeebeea6b406adbcfbb9fa246df7aa56564eb5c5
Merge: 18c8f56... dc9a555...
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 21 15:28:46 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 18c8f561255db46b53584314d75cdb0ea2cdc241
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 21 15:27:08 2010 -0400
[BZ 586068] Removing GWT dependency
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
index 32271fe..f087ff7 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
@@ -18,9 +18,9 @@
*/
package org.rhq.core.domain.measurement.composite;
-import org.rhq.core.domain.measurement.MeasurementConverterClient;
import org.rhq.core.domain.measurement.MeasurementDataNumeric1H;
import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.server.MeasurementConverter;
import java.io.Serializable;
@@ -162,9 +162,8 @@ public class MeasurementOOBComposite implements Serializable {
}
public String getFormattedBaseband() {
-
- String min = MeasurementConverterClient.format(blMin, units, true);
- String max = MeasurementConverterClient.format(blMax, units, true);
+ String min = MeasurementConverter.format(blMin, units, true);
+ String max = MeasurementConverter.format(blMax, units, true);
String result = min + ", " + max ;
@@ -172,7 +171,7 @@ public class MeasurementOOBComposite implements Serializable {
}
public String getFormattedOutlier() {
- return MeasurementConverterClient.format(outlier, units, true);
+ return MeasurementConverter.format(outlier, units, true);
}
@Override
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
new file mode 100644
index 0000000..c205f03
--- /dev/null
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java
@@ -0,0 +1,74 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.rhq.core.domain.configuration;
+
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.test.AbstractEJB3Test;
+import org.testng.annotations.Test;
+
+import javax.persistence.EntityManager;
+
+public class ResourceConfigurationUpdateIntegrationTest extends AbstractEJB3Test {
+
+ @Test
+ public void testUpdate() throws Exception {
+ try {
+ getTransactionManager().begin();
+ EntityManager entityMgr = getEntityManager();
+
+ ResourceType resourceType = new ResourceType("Test Resource Type", "Test Plugin", ResourceCategory.PLATFORM,
+ null);
+ entityMgr.persist(resourceType);
+ entityMgr.flush();
+
+ Resource resource = new Resource("test-resource", "Test Resource", resourceType);
+ resource.setUuid("123456789");
+ entityMgr.persist(resource);
+ entityMgr.flush();
+
+ Configuration configuration = new Configuration();
+
+ PropertyList listProperty = new PropertyList("listProperty");
+ listProperty.add(new PropertySimple("x", 1));
+ listProperty.add(new PropertySimple("x", 2));
+
+ configuration.put(listProperty);
+
+ ResourceConfigurationUpdate configUpdate = new ResourceConfigurationUpdate(resource, configuration,
+ "tester");
+ entityMgr.persist(configUpdate);
+ entityMgr.flush();
+
+ entityMgr.clear();
+
+ configUpdate = entityMgr.find(ResourceConfigurationUpdate.class, configUpdate.getId());
+ entityMgr.flush();
+ } finally {
+ getTransactionManager().rollback();
+ }
+ }
+
+}
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
new file mode 100644
index 0000000..d7dfc03
--- /dev/null
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java
@@ -0,0 +1,54 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.rhq.core.domain.search;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.SavedSearchCriteria;
+import org.rhq.core.domain.test.AbstractEJB3Test;
+import org.testng.annotations.Test;
+
+import javax.persistence.EntityManager;
+import java.util.List;
+
+public class SavedSearchTest extends AbstractEJB3Test {
+
+ @Test
+ public void testInsert() throws Exception {
+ getTransactionManager().begin();
+ EntityManager entityMgr = getEntityManager();
+ try {
+ Subject subject = new Subject("searcher", true, true);
+ entityMgr.persist(subject);
+
+ SavedSearch search = new SavedSearch(SearchSubsystem.RESOURCE, "test search", "test pattern", subject);
+ search.setGlobal(true);
+ entityMgr.persist(search);
+ entityMgr.flush();
+ }
+ finally {
+ getTransactionManager().rollback();
+ }
+ }
+
+}
commit dc9a55520695f9ef7ae77c7b2a3abe9c4b319105
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 21 11:05:42 2010 -0400
BZ-577853 - add first cut of GWT-based search bar functionality:
search bar features
* caret position-aware auto-completion
* suggestion highlighting
back-end improvements
* parameterized contexts (e.g. trait[foo]) now perform "LIKE '%foo%'" matches instead of exact
* finished auto-completion algorithm for simple text searches
* fixed authorized-related bugs in SavedSearchManager
gwt integration issues
* added code so that CoreGUI only loads when visiting that webapp
* added code so that SearchGUI only loads when the SearchBar is present on the page, regardless of webapp
cosmetic fixes
* alphabetized servlet definitions in CoreGUI.gwt.xml
* fixed indentation in coregui's web.xml
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
index bef8a2c..aa02b08 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
@@ -30,11 +30,15 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
}
}
- private final Kind kind;
- private final String value;
- private final String label;
- private final int startIndex;
- private final int endIndex;
+ private Kind kind;
+ private String value;
+ private String label;
+ private int startIndex;
+ private int endIndex;
+
+ public SearchSuggestion() {
+ // public ctor for GWT
+ }
public SearchSuggestion(Kind kind, String value) {
this(kind, value, 0, 0);
@@ -60,6 +64,10 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
return kind;
}
+ public void setKind(Kind kind) {
+ this.kind = kind;
+ }
+
public String getLabel() {
return label;
}
@@ -81,7 +89,7 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
if (kindComparision != 0) {
return kindComparision;
}
- return label.compareTo(other.label);
+ return label.toLowerCase().compareTo(other.label.toLowerCase());
}
public String toString() {
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index c45e91f..c5615d3 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -219,7 +219,7 @@
<logLevel>INFO</logLevel>
<runTarget>http://localhost:7080/coregui/CoreGUI.html</runTarget>
<extraJvmArgs>-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M</extraJvmArgs>
- <localWorkers>2</localWorkers>
+ <localWorkers>4</localWorkers>
<draftCompile>true</draftCompile>
<buildOutputDirectory>target/gwtclasses</buildOutputDirectory>
<hostedWebapp>target/hostedwar</hostedWebapp>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 4faf4ff..e1e627b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -9,6 +9,7 @@
<inherits name='com.smartgwt.SmartGwt' />
<inherits name="com.smartgwt.tools.SmartGwtTools"/>
+ <inherits name='com.google.gwt.user.theme.standard.Standard'/>
<!--
<inherits name="com.smartclient.theme.graphite.Graphite"/>
-->
@@ -25,13 +26,13 @@
<replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl">
- <when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
- </replace-with>
+ <when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
+ </replace-with>
- <replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImplIE6">
- <when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
- <when-property-is name="user.agent" value="ie6"/>
- </replace-with>
+ <replace-with class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImplIE6">
+ <when-type-is class="org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackFormImpl"/>
+ <when-property-is name="user.agent" value="ie6"/>
+ </replace-with>
<!-- limit builds to your preferred browser -->
@@ -44,21 +45,23 @@
<entry-point class='org.rhq.enterprise.gui.coregui.client.CoreGUI'/>
+ <entry-point class='org.rhq.enterprise.gui.coregui.client.SearchGUI'/>
- <servlet path="/RoleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl"/>
- <servlet path="/SubjectGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl"/>
- <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl"/>
- <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl"/>
+ <servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/>
+ <servlet path="/AuthorizationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl"/>
+ <servlet path="/AvailabilityGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl"/>
+ <servlet path="/BundleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.BundleGWTServiceImpl"/>
<servlet path="/ConfigurationGwtService" class="org.rhq.enterprise.gui.coregui.server.gwt.ConfigurationGWTServiceImpl"/>
- <servlet path="/ResourceTypeGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl"/>
<servlet path="/MeasurementDataGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.MeasurementDataGWTServiceImpl"/>
- <servlet path="/AlertGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AlertGWTServiceImpl"/>
<servlet path="/OperationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.OperationGWTServiceImpl"/>
- <servlet path="/BundleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.BundleGWTServiceImpl"/>
+ <servlet path="/RemoteInstallGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl"/>
<servlet path="/ResourceBossGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceBossGWTServiceImpl"/>
- <servlet path="/AuthorizationGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl"/>
- <servlet path="/AvailabilityGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl"/>
+ <servlet path="/ResourceGroupGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGroupGWTServiceImpl"/>
+ <servlet path="/ResourceGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceGWTServiceImpl"/>
+ <servlet path="/ResourceTypeGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.ResourceTypeGWTServiceImpl"/>
+ <servlet path="/RoleGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl"/>
+ <servlet path="/SearchGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SearchGWTServiceImpl"/>
+ <servlet path="/SubjectGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.SubjectGWTServiceImpl"/>
<servlet path="/TagGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.TagGWTServiceImpl"/>
- <servlet path="/RemoteInstallGWTService" class="org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl"/>
</module>
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 60b4b4b..a39a8a1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -1,10 +1,5 @@
package org.rhq.enterprise.gui.coregui.client;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
@@ -67,6 +62,11 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
private static CoreGUI coreGUI;
public void onModuleLoad() {
+ if (GWT.getHostPageBaseURL().indexOf("/coregui/") == -1) {
+ System.out.println("Suppressing load of CoreGUI module");
+ return; // suppress loading this module if not using the new GWT app
+ }
+
coreGUI = this;
if (!GWT.isScript()) {
@@ -88,9 +88,8 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
messageCenter = new MessageCenter();
-
RequestBuilder b = new RequestBuilder(RequestBuilder.GET,
- "/j_security_check.do?j_username=rhqadmin&j_password=rhqadmin");
+ "/j_security_check.do?j_username=rhqadmin&j_password=rhqadmin");
try {
b.setCallback(new RequestCallback() {
public void onResponseReceived(Request request, Response response) {
@@ -106,7 +105,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
-
SubjectGWTServiceAsync subjectService = SubjectGWTServiceAsync.Util.getInstance();
subjectService.login("rhqadmin", "rhqadmin", new AsyncCallback<Subject>() {
@@ -131,7 +129,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
// HTMLPane menuPane = new HTMLPane();
// menuPane.setWidth100();
// menuPane.setHeight(26);
- // menuPane.setContentsType(ContentsType.PAGE);
+ // //To change body of catch statement use File | Settings | File Templates. menuPane.setContentsType(ContentsType.PAGE);
// menuPane.setContentsURL("/rhq/common/menu/menu.xhtml");
// menuPane.setZIndex(400000);
// layout.addMember(menuPane);
@@ -163,7 +161,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
History.fireCurrentHistoryState();
}
-
public void onValueChange(ValueChangeEvent<String> stringValueChangeEvent) {
System.out.println("Handling history event: " + stringValueChangeEvent.getValue());
currentViewPath = new ViewPath(stringValueChangeEvent.getValue());
@@ -172,7 +169,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
}
-
public Canvas createContent(String breadcrumbName) {
Canvas canvas;
@@ -202,7 +198,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
return messageCenter;
}
-
public static ErrorHandler getErrorHandler() {
return errorHandler;
}
@@ -215,7 +210,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
return userPreferences;
}
-
public static void setSessionSubject(Subject subject) {
GWTServiceLookup.registerSession(String.valueOf(subject.getSessionId()));
@@ -248,7 +242,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
breadCrumbTrailPane.refresh(currentViewPath);
}
-
private class RootCanvas extends VLayout implements BookmarkableView {
ViewId currentViewId;
@@ -259,7 +252,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
setHeight100();
}
-
public void renderView(ViewPath viewPath) {
if (viewPath.isEnd()) {
// default view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
new file mode 100644
index 0000000..faeeab0
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.RequestCallback;
+import com.google.gwt.http.client.RequestException;
+import com.google.gwt.http.client.Response;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.widgets.Label;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
+
+/**
+ * @author Joseph Marques
+ */
+public class SearchGUI implements EntryPoint {
+
+ public static SearchGUI singleton = new SearchGUI();
+ public SearchBar searchBar;
+
+ private static Subject sessionSubject;
+
+ private SearchGUI() {
+ }
+
+ public static SearchGUI get() {
+ return singleton;
+ }
+
+ public void onModuleLoad() {
+ if (SearchBar.existsOnPage() == false) {
+ System.out.println("Suppressing load of SearchGUI module");
+ return;
+ }
+
+ portalWarLogin();
+ }
+
+ public void buildSearchGUI() {
+ searchBar = SearchBar.get(); // TODO: SearchBar is a singleton right now, that restriction needs to be removed
+ }
+
+ private static void portalWarLogin() {
+ RequestBuilder b = new RequestBuilder(RequestBuilder.GET,
+ "/j_security_check.do?j_username=rhqadmin&j_password=rhqadmin");
+ try {
+ b.setCallback(new RequestCallback() {
+ public void onResponseReceived(Request request, Response response) {
+ System.out.println("Portal-War logged in");
+ }
+
+ public void onError(Request request, Throwable exception) {
+ System.out.println("Portal-War login failed");
+ }
+ });
+ b.send();
+ } catch (RequestException e) {
+ e.printStackTrace();
+ }
+
+ SubjectGWTServiceAsync subjectService = SubjectGWTServiceAsync.Util.getInstance();
+
+ subjectService.login("rhqadmin", "rhqadmin", new AsyncCallback<Subject>() {
+ public void onFailure(Throwable caught) {
+ System.out.println("Failed to login - cause: " + caught);
+ Label loginFailed = new Label("Failed to login - cause: " + caught);
+ loginFailed.draw();
+ }
+
+ public void onSuccess(Subject result) {
+ System.out.println("Logged in: " + result.getSessionId());
+ GWTServiceLookup.registerSession(String.valueOf(result.getSessionId()));
+ SearchGUI.sessionSubject = result;
+ singleton.buildSearchGUI();
+ }
+ });
+ }
+
+ public static Subject getSessionSubject() {
+ return sessionSubject;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
index 689c26f..9d173a2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java
@@ -96,6 +96,9 @@ public class GWTServiceLookup {
return secure(RemoteInstallGWTServiceAsync.Util.getInstance());
}
+ public static SearchGWTServiceAsync getSearchService() {
+ return secure(SearchGWTServiceAsync.Util.getInstance());
+ }
private static <T> T secure(Object sdt) {
if (!(sdt instanceof ServiceDefTarget))
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java
new file mode 100644
index 0000000..be00e9c
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java
@@ -0,0 +1,50 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.gwt;
+
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+
+import org.rhq.core.domain.criteria.SavedSearchCriteria;
+import org.rhq.core.domain.search.SavedSearch;
+import org.rhq.core.domain.search.SearchSubsystem;
+import org.rhq.core.domain.search.SearchSuggestion;
+
+/**
+ * @author Joseph Marques
+ */
+public interface SearchGWTService extends RemoteService {
+
+ /*
+ * search suggestions
+ */
+ List<SearchSuggestion> getSuggestions(SearchSubsystem searchSubsystem, String expression, int caretPosition);
+
+ /*
+ * saved searches
+ */
+ int createSavedSearch(SavedSearch savedSearch);
+
+ void updateSavedSearch(SavedSearch savedSearch);
+
+ void deleteSavedSearch(int savedSearchId);
+
+ List<SavedSearch> findSavedSearchesByCriteria(SavedSearchCriteria criteria);
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
new file mode 100644
index 0000000..8a38ed1
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -0,0 +1,458 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.search;
+
+import java.util.List;
+
+import com.google.gwt.event.dom.client.BlurEvent;
+import com.google.gwt.event.dom.client.BlurHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.dom.client.KeyPressEvent;
+import com.google.gwt.event.dom.client.KeyPressHandler;
+import com.google.gwt.event.dom.client.MouseOutEvent;
+import com.google.gwt.event.dom.client.MouseOutHandler;
+import com.google.gwt.event.dom.client.MouseOverEvent;
+import com.google.gwt.event.dom.client.MouseOverHandler;
+import com.google.gwt.event.logical.shared.CloseEvent;
+import com.google.gwt.event.logical.shared.CloseHandler;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.EventListener;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.PopupPanel;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.TextBox;
+
+import org.rhq.core.domain.criteria.SavedSearchCriteria;
+import org.rhq.core.domain.search.SavedSearch;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid;
+import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchManager;
+import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid.PatternSelectionHandler;
+import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox;
+
+/**
+ * @author Joseph Marques
+ */
+public class SearchBar {
+
+ public static final String DEFAULT_SEARCH_TEXT = "search for resources";
+ public static final String DEFAULT_PATTERN_NAME = "name your pattern";
+
+ private static final String IMAGE_DIR = "/coregui/images/search/";
+
+ private static final String STAR_OFF_URL = IMAGE_DIR + "star1.png";
+ private static final String STAR_ACTIVE_URL = IMAGE_DIR + "star2.png";
+ private static final String STAR_ON_URL = IMAGE_DIR + "star3.png";
+
+ private static final String ARROW_WHITE_URL = IMAGE_DIR + "menu_arrow.png";
+ private static final String ARROW_GRAY_URL = IMAGE_DIR + "menu_arrow_down.png";
+
+ public static final String TRASH = IMAGE_DIR + "trash.png";
+
+ private final SuggestTextBox autoCompletePatternField;
+ private final TextBox patternNameField = new TextBox();
+ private final Label patternNameLabel = new Label();
+
+ private final Image starImage = new Image(STAR_OFF_URL);
+ private final Image arrowImage = new Image(ARROW_WHITE_URL);
+
+ private final PopupPanel savedSearchesPanel = new PopupPanel(true);
+ private final SavedSearchGrid savedSearches = new SavedSearchGrid();
+
+ private String currentSearch = "";
+ private long lastNameFieldBlurTime = 0;
+
+ private final SavedSearchManager savedSearchManager = SavedSearchManager.get();
+ private final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
+
+ public static SearchBar singleton;
+
+ public static SearchBar get() {
+ if (singleton == null) {
+ singleton = new SearchBar();
+ }
+ return singleton;
+ }
+
+ public static boolean existsOnPage() {
+ return DOM.getElementById("searchBar") != null;
+ }
+
+ private SearchBar() {
+ System.out.println("Loading SearchBar...");
+
+ autoCompletePatternField = new SuggestTextBox("patternFieldSuggestionsContainer");
+
+ RootPanel.get("patternFieldContainer").add(autoCompletePatternField);
+ RootPanel.get("patternNameFieldContainer").add(patternNameField);
+ RootPanel.get("patternNameLabelContainer").add(patternNameLabel);
+ RootPanel.get("starImageContainer").add(starImage);
+ RootPanel.get("arrowImageContainer").add(arrowImage);
+ RootPanel.get("savedSearchesContainer").add(savedSearchesPanel);
+
+ setupAutoCompletingPatternField();
+ setupPatternNameField();
+ setupPatternNameLabel();
+ setupStarImage();
+ setupArrowImage();
+ setupSavedSearches();
+ setupSearchButton();
+
+ // presume the enclosing page logic loads results without a button click
+ }
+
+ public void executeSearch() {
+ String searchTerms = autoCompletePatternField.getText().toLowerCase().trim();
+ executeSearch(searchTerms);
+ }
+
+ public void executeSearch(String searchTerms) {
+ if (searchTerms.equals(DEFAULT_SEARCH_TEXT)) {
+ searchTerms = "";
+ }
+
+ SavedSearchCriteria criteria = new SavedSearchCriteria();
+ criteria.addFilterName(searchTerms);
+ criteria.setCaseSensitive(true);
+
+ searchService.findSavedSearchesByCriteria(criteria, new AsyncCallback<List<SavedSearch>>() {
+
+ @Override
+ public void onSuccess(List<SavedSearch> result) {
+ if (result.size() == 1) {
+ process(result.get(0));
+ }
+
+ }
+
+ private void process(SavedSearch savedSearch) {
+ autoCompletePatternField.setValue(savedSearch.getPattern(), true);
+ patternNameField.setValue(savedSearch.getName(), true);
+ currentSearch = "";
+ turnNameFieldIntoLabel();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ // TODO Auto-generated method stub
+ }
+ });
+
+ }
+
+ private void setupAutoCompletingPatternField() {
+ autoCompletePatternField.setText(DEFAULT_SEARCH_TEXT);
+ autoCompletePatternField.getElement().setId("patternField");
+ autoCompletePatternField.addStyleName("patternField");
+
+ AutoCompletePatternFieldEventHandler handler = new AutoCompletePatternFieldEventHandler();
+ autoCompletePatternField.addClickHandler(handler);
+ autoCompletePatternField.addKeyPressHandler(handler);
+ }
+
+ private void setupPatternNameField() {
+ patternNameField.addStyleName("patternNameField");
+ patternNameField.setVisible(false);
+
+ PatternNameFieldEventHandler handler = new PatternNameFieldEventHandler();
+ patternNameField.addKeyPressHandler(handler);
+ patternNameField.addClickHandler(handler);
+ patternNameField.addBlurHandler(handler);
+ }
+
+ private void setupPatternNameLabel() {
+ patternNameLabel.addStyleName("patternNameLabel");
+ patternNameLabel.setVisible(false);
+
+ PatternNameLabelEventHandler handler = new PatternNameLabelEventHandler();
+ patternNameLabel.addClickHandler(handler);
+ }
+
+ private void setupStarImage() {
+ StarImageEventHandler handler = new StarImageEventHandler();
+ starImage.addClickHandler(handler);
+ starImage.addMouseOverHandler(handler);
+ starImage.addMouseOutHandler(handler);
+ }
+
+ private void setupArrowImage() {
+ ArrowImageEventHandler handler = new ArrowImageEventHandler();
+ arrowImage.addClickHandler(handler);
+ }
+
+ private void setupSavedSearches() {
+ savedSearchesPanel.add(savedSearches);
+ savedSearchesPanel.removeStyleName("gwt-PopupPanel");
+ savedSearchesPanel.addStyleName("savedSearchesPanel");
+ savedSearches.addStyleName("savedSearchesPanel");
+
+ // panel position will be re-calculated on down-arrow click
+ savedSearchesPanel.show();
+ savedSearchesPanel.hide();
+
+ SavedSearchesEventHandler handler = new SavedSearchesEventHandler();
+ savedSearchesPanel.addCloseHandler(handler);
+ savedSearches.setPatternSelectionHandler(handler);
+ }
+
+ private void setupSearchButton() {
+ Element searchButtonContainerElement = DOM.getElementById("searchButtonContainer");
+ String searchButtonElementId = searchButtonContainerElement.getClassName().split(" ")[0]; // yeah, it's hacky
+
+ Element searchButtonElement = DOM.getElementById(searchButtonElementId);
+ if (searchButtonElement == null) {
+ return;
+ }
+
+ DOM.setEventListener(searchButtonElement, new EventListener() {
+ @Override
+ public void onBrowserEvent(Event event) {
+ executeSearch();
+ }
+ });
+
+ //searchButton.addStyleName("searchButton");
+ //SearchButtonEventHandler handler = new SearchButtonEventHandler();
+ //searchButton.addClickHandler(handler);
+ }
+
+ private void turnNameFieldIntoLabel() {
+ String pattern = autoCompletePatternField.getValue();
+ String name = patternNameField.getText();
+
+ if (name.equalsIgnoreCase(DEFAULT_PATTERN_NAME)) {
+ name = "";
+ }
+
+ savedSearchManager.removePatternByName(currentSearch);
+
+ arrowImage.setVisible(true);
+ patternNameField.setVisible(false);
+
+ if (name.equals("")) {
+ starImage.setUrl(STAR_OFF_URL);
+ } else {
+ savedSearchManager.updatePatternByName(name, pattern);
+ patternNameLabel.setVisible(true);
+ patternNameLabel.setText(elipse(name));
+ starImage.setUrl(STAR_ON_URL);
+ }
+ currentSearch = name;
+ }
+
+ private void turnNameLabelIntoField() {
+ String name = currentSearch;
+ patternNameField.setText(name);
+ patternNameField.setVisible(true);
+ patternNameLabel.setVisible(false);
+ patternNameField.setFocus(true);
+ }
+
+ private String elipse(String data) {
+ if (data.length() > 14) {
+ return data.substring(0, 14) + "...";
+ }
+ return data;
+ }
+
+ /*
+ * Event Handlers
+ */
+
+ class AutoCompletePatternFieldEventHandler implements KeyPressHandler, ClickHandler {
+ @Override
+ public void onKeyPress(KeyPressEvent event) {
+ // hide pattern field/label, turn off star
+ patternNameLabel.setText("");
+ patternNameLabel.setVisible(false);
+ patternNameField.setValue("", true);
+ patternNameField.setVisible(false);
+ currentSearch = "";
+ starImage.setUrl(STAR_OFF_URL);
+
+ // enter submits a search result under certain conditions, escape hides the suggestions drop-down
+ if (event.getCharCode() == KeyCodes.KEY_ENTER) {
+ boolean suggestionsHidden = !autoCompletePatternField.isSuggestionListShowing();
+ boolean suggestionSelected = !suggestionsHidden && autoCompletePatternField.isItemSelected();
+ if (suggestionsHidden || !suggestionSelected) {
+ executeSearch();
+ autoCompletePatternField.hidePopup();
+ }
+ } else if (event.getCharCode() == KeyCodes.KEY_ESCAPE) {
+ autoCompletePatternField.hidePopup();
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ }
+
+ @Override
+ public void onClick(ClickEvent event) {
+ // clear default search text if necessary
+ if (autoCompletePatternField.getText().equals(DEFAULT_SEARCH_TEXT)) {
+ autoCompletePatternField.setValue("", true);
+ }
+ savedSearchesPanel.hide();
+ }
+ }
+
+ class PatternNameFieldEventHandler implements KeyPressHandler, ClickHandler, BlurHandler {
+ @Override
+ public void onKeyPress(KeyPressEvent event) {
+ if (event.getCharCode() == 13) {
+ SearchLogger.debug("key press pattern name field");
+ turnNameFieldIntoLabel();
+ }
+ }
+
+ @Override
+ public void onClick(ClickEvent event) {
+ if (patternNameField.getText().equals(DEFAULT_PATTERN_NAME)) {
+ patternNameField.setValue("", false);
+ }
+ }
+
+ @Override
+ public void onBlur(BlurEvent event) {
+ lastNameFieldBlurTime = System.currentTimeMillis();
+ turnNameFieldIntoLabel();
+ }
+ }
+
+ class PatternNameLabelEventHandler implements ClickHandler {
+ @Override
+ public void onClick(ClickEvent event) {
+ turnNameLabelIntoField();
+ }
+ }
+
+ class StarImageEventHandler implements ClickHandler, MouseOverHandler, MouseOutHandler {
+ @Override
+ public void onClick(ClickEvent event) {
+ long diff = System.currentTimeMillis() - lastNameFieldBlurTime;
+ if (Math.abs(diff) < 750) {
+ /*
+ * This event propagation is annoying. If the threshold is set too low, then both
+ * the name field blur event and this star image click event fire...but the blur
+ * event fires first, which turns the star white. Then a click on a white star
+ * triggers edit mode, re-enabling the name field. However, setting the threshold
+ * too high will prevent the click event from being handled when the user naturally
+ * wants to click on the star in rapid succession within the threshold time frame.
+ * It is hoped that 750ms will strike a nice balance, and that most users will never
+ * experienced any oddities from this trade-off.
+ */
+ return;
+ }
+
+ if (starImage.getUrl().endsWith(STAR_ACTIVE_URL)) {
+ patternNameField.setText(DEFAULT_PATTERN_NAME);
+ patternNameField.setVisible(true);
+ patternNameField.selectAll();
+ patternNameField.setFocus(true);
+ patternNameLabel.setVisible(false);
+ } else if (starImage.getUrl().endsWith(STAR_ON_URL)) {
+ starImage.setUrl(STAR_ACTIVE_URL);
+ patternNameField.setVisible(false);
+ patternNameLabel.setVisible(false);
+ savedSearchManager.removePatternByName(currentSearch);
+ }
+ }
+
+ @Override
+ public void onMouseOver(MouseOverEvent event) {
+ if (starImage.getUrl().endsWith(STAR_OFF_URL)) {
+ starImage.setUrl(STAR_ACTIVE_URL);
+
+ }
+ }
+
+ @Override
+ public void onMouseOut(MouseOutEvent event) {
+ if (starImage.getUrl().endsWith(STAR_ACTIVE_URL) && !patternNameField.isVisible()) {
+ starImage.setUrl(STAR_OFF_URL);
+ }
+ }
+ }
+
+ class ArrowImageEventHandler implements ClickHandler {
+ @Override
+ public void onClick(ClickEvent event) {
+ savedSearches.updateModel();
+ int left = autoCompletePatternField.getAbsoluteLeft();
+ int top = autoCompletePatternField.getAbsoluteTop() + autoCompletePatternField.getOffsetHeight();
+ savedSearchesPanel.setPopupPosition(left, top + 5);
+ savedSearchesPanel.show();
+ arrowImage.setUrl(ARROW_GRAY_URL);
+ }
+ }
+
+ class SavedSearchesEventHandler implements CloseHandler<PopupPanel>, PatternSelectionHandler {
+ @Override
+ public void onClose(CloseEvent<PopupPanel> event) {
+ arrowImage.setUrl(ARROW_WHITE_URL);
+ }
+
+ @Override
+ public void handleSelection(int rowIndex, int columnIndex, String patternName) {
+ if (columnIndex == 1) {
+ savedSearchManager.removePatternByName(patternName);
+
+ if (currentSearch.equals(patternName)) {
+ currentSearch = "";
+ patternNameField.setValue("", true);
+ patternNameField.setVisible(false);
+ patternNameLabel.setText("");
+ patternNameLabel.setVisible(false);
+ autoCompletePatternField.setFocus(true);
+ starImage.setUrl(STAR_OFF_URL);
+ savedSearchesPanel.hide();
+ }
+
+ if (savedSearchManager.getSavedSearchCount() == 0) {
+ savedSearchesPanel.hide();
+ }
+
+ savedSearches.removeRow(rowIndex);
+ } else {
+ currentSearch = "";
+ String patternValue = savedSearchManager.getPatternByName(patternName);
+ autoCompletePatternField.setValue(patternValue, true);
+ patternNameField.setValue(patternName, true);
+ SearchLogger.debug("search results change: [" + patternName + "," + patternValue + "]");
+ turnNameFieldIntoLabel();
+ savedSearchesPanel.hide();
+ executeSearch();
+ }
+ }
+ }
+
+ class SearchButtonEventHandler implements ClickHandler {
+ @Override
+ public void onClick(ClickEvent event) {
+ executeSearch();
+ }
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java
new file mode 100644
index 0000000..f15dcc9
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java
@@ -0,0 +1,7 @@
+package org.rhq.enterprise.gui.coregui.client.search;
+
+public class SearchLogger {
+ public static void debug(String message) {
+ System.out.println(message);
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
new file mode 100644
index 0000000..76c4ad6
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
@@ -0,0 +1,154 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.search.favorites;
+
+import java.util.List;
+
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.ui.Grid;
+
+import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
+
+/**
+ * @author Joseph Marques
+ */
+public class SavedSearchGrid extends Grid {
+
+ private PatternSelectionHandler patternSelectionHandler;
+
+ public interface PatternSelectionHandler {
+ public void handleSelection(int rowIndex, int columnIndex, String patternName);
+ }
+
+ public void setPatternSelectionHandler(PatternSelectionHandler handler) {
+ this.patternSelectionHandler = handler;
+ }
+
+ class SavedSearchRowFormatter extends RowFormatter {
+ @Override
+ public String getStyleName(int row) {
+ if (row < count()) {
+ return " savedSearchesPanel-row";
+ }
+ return "";
+ }
+
+ @Override
+ public String getStylePrimaryName(int row) {
+ return getStyleName(row);
+ }
+ }
+
+ private static SavedSearchManager manager = SavedSearchManager.get();
+
+ public SavedSearchGrid() {
+ super(count(), 2);
+ setRowFormatter(new SavedSearchRowFormatter());
+ sinkEvents(Event.ONMOUSEOVER | Event.ONMOUSEOUT | Event.ONCLICK);
+ setCellSpacing(0);
+ setCellPadding(5);
+ setStyleName("savedSearchesGrid");
+ }
+
+ @Override
+ public void onBrowserEvent(Event event) {
+ Element td = getEventTargetCell(event);
+ if (td == null) {
+ return;
+ }
+ Element tr = DOM.getParent(td);
+ Element table = DOM.getParent(tr);
+ switch (DOM.eventGetType(event)) {
+ case Event.ONCLICK: {
+ int columnIndex = DOM.getChildIndex(tr, td);
+ int rowIndex = DOM.getChildIndex(table, tr);
+ String text = getHTML(rowIndex, 0);
+ int startIndex = text.indexOf('>') + 1;
+ int endIndex = text.indexOf("</span>", startIndex);
+ String patternName = text.substring(startIndex, endIndex);
+ patternSelectionHandler.handleSelection(rowIndex, columnIndex, patternName);
+ if (columnIndex == 0) {
+ onRowOut(tr);
+ }
+ break;
+ }
+ case Event.ONMOUSEOVER: {
+ onRowOver(tr);
+ break;
+ }
+ case Event.ONMOUSEOUT: {
+ onRowOut(tr);
+ break;
+ }
+ }
+ }
+
+ protected void onRowOut(Element row) {
+ Element actionCell = DOM.getChild(row, 1);
+ actionCell.setAttribute("style", "");
+ row.setAttribute("style", "background-color: white;");
+ }
+
+ protected void onRowOver(Element row) {
+ Element actionCell = DOM.getChild(row, 1);
+ actionCell.setAttribute("style", "width: 24px; height: 24px; background: url(" + SearchBar.TRASH
+ + ") no-repeat center;");
+ row.setAttribute("style", "background-color: #eeeeee;");
+ }
+
+ public void updateModel() {
+ List<String> names = manager.getPatternNamesMRU();
+
+ clear(true);
+ resizeRows(names.size());
+
+ for (int i = 0; i < names.size(); i++) {
+ String name = names.get(i);
+ String pattern = manager.getPatternByName(name);
+ setHTML(i, 0, stylize(name, pattern));
+ setHTML(i, 1, trashify());
+ }
+ setRowFormatter(new SavedSearchRowFormatter());
+ }
+
+ private static String stylize(String name, String pattern) {
+ return "<span class=\"savedSearchesPanel-top\">" + name + "</span>" + "<br/>"
+ + "<span class=\"savedSearchesPanel-bottom\">" + pattern + "</span>";
+ }
+
+ private static String trashify() {
+ return "<div name=\"action\"> </div>";
+ }
+
+ private static int count() {
+ return manager.getSavedSearchCount();
+ }
+
+ public String getSelectedItem() {
+ return "";
+ }
+
+ public static void main(String[] args) {
+ Grid grid = new Grid();
+ grid.clear(true);
+
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
new file mode 100644
index 0000000..3365be7
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
@@ -0,0 +1,180 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.search.favorites;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.SavedSearchCriteria;
+import org.rhq.core.domain.search.SavedSearch;
+import org.rhq.core.domain.search.SearchSubsystem;
+import org.rhq.enterprise.gui.coregui.client.SearchGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
+
+/**
+ * @author Joseph Marques
+ */
+public class SavedSearchManager {
+
+ private final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
+
+ private LinkedHashMap<String, SavedSearch> savedSearches = new LinkedHashMap<String, SavedSearch>();
+ private static SavedSearchManager singleton = new SavedSearchManager();
+
+ public SavedSearchManager() {
+ load();
+ }
+
+ public synchronized static SavedSearchManager get() {
+ return singleton;
+ }
+
+ public synchronized String getPatternByName(String name) {
+ SavedSearch savedSearch = savedSearches.get(name);
+ if (savedSearch == null) {
+ return null;
+ }
+ return savedSearch.getPattern();
+ }
+
+ public synchronized void updatePatternByName(final String name, final String pattern) {
+ SavedSearch savedSearch = savedSearches.get(name);
+ if (savedSearch == null) { // created case
+ final SavedSearch newSavedSearch = new SavedSearch(SearchSubsystem.RESOURCE, name, pattern, SearchGUI
+ .getSessionSubject());
+ searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ SearchLogger.debug("Error: created saved search [" + name + "] with pattern [" + pattern + "]: "
+ + caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(Integer result) {
+ newSavedSearch.setId(result);
+ savedSearches.put(name, newSavedSearch);
+ }
+ });
+
+ } else { // update case
+ searchService.updateSavedSearch(savedSearch, new AsyncCallback<Void>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ SearchLogger.debug("Error: updating saved search [" + name + "] with pattern [" + pattern + "]: "
+ + caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(Void result) {
+ SavedSearch savedSearch = savedSearches.remove(name);
+ savedSearch.setPattern(pattern);
+ savedSearches.put(name, savedSearch);
+ }
+ });
+ }
+ }
+
+ public synchronized List<String> getPatternNamesMRU() {
+ List<String> results = new LinkedList<String>();
+ for (String name : savedSearches.keySet()) {
+ results.add(0, name);
+ }
+ return results;
+ }
+
+ public synchronized void removePatternByName(final String name) {
+ SavedSearch savedSearch = savedSearches.get(name);
+ if (savedSearch == null) {
+ return;
+ }
+ searchService.deleteSavedSearch(savedSearch.getId(), new AsyncCallback<Void>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ SearchLogger.debug("Error: removing saved search [" + name + "]: " + caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(Void result) {
+ savedSearches.remove(name);
+ }
+ });
+ }
+
+ public synchronized void renamePattern(final String oldName, final String newName) {
+ SavedSearch savedSearch = savedSearches.get(oldName);
+ searchService.updateSavedSearch(savedSearch, new AsyncCallback<Void>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ SearchLogger.debug("Error: renaming saved search from [" + oldName + "] to [" + newName + "]: "
+ + caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(Void result) {
+ SavedSearch savedSearch = savedSearches.remove(oldName);
+ savedSearches.put(newName, savedSearch);
+ }
+ });
+ }
+
+ public synchronized int getSavedSearchCount() {
+ return savedSearches.size();
+ }
+
+ private synchronized void load() {
+ Subject currentUser = SearchGUI.getSessionSubject();
+ SavedSearchCriteria criteria = new SavedSearchCriteria();
+ criteria.addFilterSubjectId(currentUser.getId());
+ searchService.findSavedSearchesByCriteria(criteria, new AsyncCallback<List<SavedSearch>>() {
+
+ @Override
+ public void onSuccess(List<SavedSearch> result) {
+ savedSearches.clear();
+ Collections.sort(result, new Comparator<SavedSearch>() {
+
+ @Override
+ public int compare(SavedSearch first, SavedSearch second) {
+ return first.getName().compareTo(second.getName());
+ }
+ });
+ for (SavedSearch next : result) {
+ savedSearches.put(next.getName(), next);
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ SearchLogger.debug("Error: loading saved searches: " + caught.getMessage());
+ }
+ });
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java
new file mode 100644
index 0000000..d010b30
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java
@@ -0,0 +1,182 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.search.suggest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.OptionElement;
+import com.google.gwt.dom.client.SelectElement;
+import com.google.gwt.user.client.ui.ListBox;
+
+import org.rhq.core.domain.search.SearchSuggestion;
+import org.rhq.core.domain.search.SearchSuggestion.Kind;
+import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
+
+public class SuggestResultsListBox extends ListBox {
+ public static final String FOOTER_MESSAGE = "Start typing for more simple text matches";
+
+ private List<SearchSuggestion> searchSuggestions;
+ private SuggestionItemComparator suggestionItemComparator;
+
+ private final List<String> OPERATORS = Arrays.asList("!==", "!=", "==", "=");
+
+ public SuggestResultsListBox() {
+ this.searchSuggestions = new ArrayList<SearchSuggestion>();
+
+ this.suggestionItemComparator = new SuggestionItemComparator();
+ }
+
+ class SuggestionItemComparator implements Comparator<SearchSuggestion> {
+ public int compare(SearchSuggestion first, SearchSuggestion second) {
+ try {
+ return first.getValue().toLowerCase().compareTo(second.getValue().toLowerCase());
+ } catch (Throwable t) {
+ SearchLogger.debug("Error sorting suggestions '" + first.getValue() + "' '" + second.getValue() + "': "
+ + t.getMessage());
+ }
+ return 0;
+ }
+ };
+
+ public void setErrorMessage(String error) {
+ this.searchSuggestions.clear();
+ this.searchSuggestions.add(new SearchSuggestion(Kind.InstructionalTextComment, error));
+ }
+
+ public void setSearchSuggestions(List<SearchSuggestion> searchSuggestions) {
+ this.searchSuggestions.clear();
+ this.searchSuggestions.addAll(searchSuggestions);
+ }
+
+ public int render(int maxSuggestions, int maxResultsShown) {
+ // sorting is done on the server-side
+ //Collections.sort(searchSuggestions, suggestionItemComparator);
+
+ clear();
+ int addedResults = 0;
+
+ if (searchSuggestions.size() == 0) {
+ appendFooter(FOOTER_MESSAGE);
+ addedResults++;
+ }
+
+ for (SearchSuggestion next : searchSuggestions) {
+ if (addedResults == maxSuggestions) {
+ break;
+ }
+
+ appendSuggestItem(next);
+ //appendSuggestItem(next.getLabel(), prefix, className, next.getStartIndex(), next.getEndIndex());
+ addedResults++;
+ }
+
+ setVisibleItemCount(Math.max(2, Math.min(maxResultsShown, addedResults)));
+
+ return addedResults;
+ }
+
+ private void appendFooter(String message) {
+ SelectElement select = getElement().cast();
+ OptionElement option = Document.get().createOptionElement();
+
+ String style = "float: left; margin-left: 2px; font-style: italic; color: gray;";
+ String footer = "<span style=\"" + style + "\">" + message + "</span>";
+
+ style = "clear: both;";
+ String floatClear = "<br style=\"" + style + "\" />";
+
+ option.setDisabled(true);
+ option.setValue(FOOTER_MESSAGE);
+ option.setInnerHTML(footer + floatClear);
+ select.add(option, null);
+ }
+
+ private void appendSuggestItem(SearchSuggestion item) {
+ String className = "suggestData ";
+ String prefix = "";
+
+ if (item.getKind() == SearchSuggestion.Kind.Simple) {
+ className += "suggestDataSimple";
+ prefix = "text";
+ } else if (item.getKind() == SearchSuggestion.Kind.Advanced) {
+ className += "suggestDataAdvanced";
+ prefix = "query";
+ } else if (item.getKind() == SearchSuggestion.Kind.GlobalSavedSearch
+ || item.getKind() == SearchSuggestion.Kind.UserSavedSearch) {
+ className += "suggestDataSavedSearch";
+ prefix = "saved";
+ } else {
+ }
+
+ SelectElement select = getElement().cast();
+ OptionElement option = Document.get().createOptionElement();
+ option.setValue(item.getValue());
+ String style = "font-variant: small-caps; font-weight: bold; font-size: 11px; float: left; margin-left: 2px;";
+ int marginOffset = 20;
+ if (className.endsWith("suggestDataSavedSearch")) {
+ style += " color: green;";
+ marginOffset += 2;
+ } else {
+ style += " color: gray;";
+ if (className.endsWith("suggestDataSimple")) {
+ marginOffset += 8;
+ }
+ }
+ String decoratedPrefix = decorate(prefix, style);
+ String highlightedSuggestion = colorOperator(decorate(item.getLabel(), "background-color: yellow;", item
+ .getStartIndex(), item.getEndIndex()));
+ String decoratedSuffix = decorate(highlightedSuggestion, "float: left; margin-left: " + marginOffset + "px;");
+ String floatClear = "<br style=\"clear: both;\" />";
+
+ String innerHTML = decoratedPrefix + decoratedSuffix + floatClear;
+ option.setInnerHTML(innerHTML);
+ select.add(option, null);
+ }
+
+ // TODO: fixing coloring strategy
+ private String colorOperator(String data) {
+ for (String operator : OPERATORS) {
+ int index = -1;
+ while ((index = data.indexOf(operator, index + 1)) != -1) {
+ if ((index - 5 >= 0) && data.substring(index - 5, index).equals("style") == false) {
+ break;
+ }
+ }
+ if (index != -1) {
+ return decorate(data, "color: blue;", index, index + operator.length());
+ }
+ }
+ return data;
+ }
+
+ private String decorate(String data, String style) {
+ return decorate(data, style, 0, data.length());
+ }
+
+ private String decorate(String data, String style, int startIndex, int endIndex) {
+ String before = data.substring(0, startIndex);
+ String highlight = data.substring(startIndex, endIndex);
+ String after = data.substring(endIndex);
+ return before + "<span style=\"" + style + "\">" + highlight + "</span>" + after;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
new file mode 100644
index 0000000..438c163
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java
@@ -0,0 +1,302 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.search.suggest;
+
+import java.util.List;
+
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.FocusEvent;
+import com.google.gwt.event.dom.client.FocusHandler;
+import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.dom.client.KeyUpEvent;
+import com.google.gwt.event.dom.client.KeyUpHandler;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.PopupPanel;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.user.client.ui.TextBox;
+
+import org.rhq.core.domain.search.SearchSubsystem;
+import org.rhq.core.domain.search.SearchSuggestion;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
+import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchManager;
+
+public class SuggestTextBox extends TextBox {
+
+ protected PopupPanel choicesPopup = new PopupPanel(true);
+ protected ScrollPanel choicesScrollPanel = new ScrollPanel();
+ protected SuggestResultsListBox choices = new SuggestResultsListBox();
+
+ private SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
+
+ public SuggestTextBox(String rootPanelID) {
+ super();
+ setupTextBox();
+ setupChoicesPopup(rootPanelID);
+ setupChoicesListBox();
+ }
+
+ public void setupTextBox() {
+ getElement().setAttribute("autocomplete", "off"); // we're producing completion suggestions, not the browser
+ SuggestTextBoxEventHandler handler = new SuggestTextBoxEventHandler();
+ this.addKeyUpHandler(handler);
+ this.addFocusHandler(handler);
+ }
+
+ public void setupChoicesPopup(String rootPanelID) {
+ choicesPopup.removeStyleName("gwt-PopupPanel");
+ choicesPopup.addStyleName("suggestPanel");
+ choicesPopup.add(choices);
+
+ RootPanel.get(rootPanelID).add(choicesPopup);
+ show();
+ hide();
+ }
+
+ public void setupChoicesListBox() {
+ choices.addStyleName("suggestPanel");
+
+ SuggestionResultsListBoxEventHandler handler = new SuggestionResultsListBoxEventHandler();
+ choices.addChangeHandler(handler);
+ choices.addClickHandler(handler);
+ }
+
+ public boolean isSuggestionListShowing() {
+ return isDisplayed();
+ }
+
+ public boolean isItemSelected() {
+ return (choices.getSelectedIndex() != -1);
+ }
+
+ protected void complete() {
+ if (choices.getItemCount() > 0 && choices.getSelectedIndex() != -1) {
+ String currentText = this.getText().toLowerCase();
+ String completion = choices.getValue(choices.getSelectedIndex());
+
+ int cursorPosition = this.getCursorPos();
+ int previousWhitespaceIndex = cursorPosition;
+ if (cursorPosition != 0) {
+ while (--previousWhitespaceIndex > 0) {
+ if (this.getText().charAt(previousWhitespaceIndex) == ' ') {
+ previousWhitespaceIndex++; // put index right after found whitespace
+ break;
+ }
+ }
+ }
+ String before = this.getText().substring(0, previousWhitespaceIndex);
+ String after = this.getText().substring(cursorPosition);
+ this.setValue(before + completion + after);
+
+ // TODO: this algo screws up when it does the indexOf search on just a single char from currentText
+ // use case is "availability=dow<enter>" -- is this still true, now that we're completing longer things for advanced search?
+
+ if (currentText.equals(this.getText().toLowerCase())) {
+ this.setValue(currentText + completion, true);
+ }
+ }
+
+ choices.clear();
+ hide();
+
+ // if this is a saved search pattern completion, execute that search immediately
+ System.out.println("just completed to '" + this.getValue() + "'");
+ String patternValue = SavedSearchManager.get().getPatternByName(this.getValue());
+ if (patternValue != null) {
+ SearchBar.get().executeSearch(this.getValue());
+ } else {
+ // send a 'fake' key, this will rerender PopupPanel with the new completion list
+ handleKeyCode(0);
+ }
+ }
+
+ private void hide() {
+ choicesPopup.hide();
+ }
+
+ private void show() {
+ choicesPopup.show();
+ }
+
+ private boolean isDisplayed() {
+ return choicesPopup.isShowing();
+ }
+
+ public void hidePopup() {
+ handleKeyCode(KeyCodes.KEY_ESCAPE);
+ }
+
+ class SuggestTextBoxEventHandler implements KeyUpHandler, FocusHandler {
+ @Override
+ public void onKeyUp(KeyUpEvent event) {
+ int keyCode = event.getNativeKeyCode();
+ handleKeyCode(keyCode);
+
+ if (keyCode == KeyCodes.KEY_TAB) {
+ event.stopPropagation();
+ event.preventDefault();
+ }
+ }
+
+ @Override
+ public void onFocus(FocusEvent event) {
+ if (getText().equals(SearchBar.DEFAULT_SEARCH_TEXT)) {
+ setText("");
+ }
+ // send a 'fake' key, this will rerender PopupPanel with the new completion list
+ handleKeyCode(1);
+ }
+ }
+
+ class SuggestionResultsListBoxEventHandler implements ChangeHandler, ClickHandler {
+ @Override
+ public void onChange(ChangeEvent event) {
+ complete();
+ }
+
+ @Override
+ public void onClick(ClickEvent event) {
+ complete();
+ }
+ }
+
+ protected void handleKeyCode(int keyCode) {
+ if (keyCode == KeyCodes.KEY_TAB) {
+ this.setValue(this.getValue() + " ");
+ this.setCursorPos(this.getValue().length());
+ this.setFocus(true);
+ return;
+ }
+
+ if (keyCode == KeyCodes.KEY_DOWN) {
+ int selectedIndex = choices.getSelectedIndex();
+ selectedIndex++;
+ if (selectedIndex >= choices.getItemCount()) {
+ selectedIndex = 0;
+ }
+ String value = choices.getValue(selectedIndex);
+ if (value.equals(SuggestResultsListBox.FOOTER_MESSAGE)) {
+ if (choices.getItemCount() == 1) {
+ selectedIndex = -1; // do not allow the disabled row to be selected via KEY_DOWN
+ } else {
+ selectedIndex++;
+ }
+ }
+ choices.setSelectedIndex(selectedIndex);
+ return;
+ }
+
+ if (keyCode == KeyCodes.KEY_UP) {
+ int selectedIndex = choices.getSelectedIndex();
+ selectedIndex--;
+ if (selectedIndex < 0) {
+ selectedIndex = choices.getItemCount() - 1;
+ }
+ String value = choices.getValue(selectedIndex);
+ if (value.equals(SuggestResultsListBox.FOOTER_MESSAGE)) {
+ if (choices.getItemCount() == 1) {
+ selectedIndex = -1; // do not allow the disabled row to be selected via KEY_UP
+ } else {
+ selectedIndex = choices.getItemCount() - 1;
+ }
+ }
+ choices.setSelectedIndex(selectedIndex);
+ return;
+ }
+
+ if (keyCode == KeyCodes.KEY_ENTER) {
+ int selectedIndex = choices.getSelectedIndex();
+ if (selectedIndex != -1) {
+ complete();
+ }
+ return;
+ }
+
+ if (keyCode == KeyCodes.KEY_ESCAPE) {
+ choices.clear();
+ hide();
+ return;
+ }
+
+ hide();
+ String text = this.getText();
+
+ searchService.getSuggestions( //
+ SearchSubsystem.RESOURCE, // replace with appropriate subsystem somehow extracted from the context
+ text, //
+ this.getCursorPos(), //
+ new SearchSuggestionCallback(keyCode));
+ }
+
+ class SearchSuggestionCallback implements AsyncCallback<List<SearchSuggestion>> {
+
+ private int keyCode;
+
+ public SearchSuggestionCallback(int keyCode) {
+ this.keyCode = keyCode;
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ choices.setErrorMessage(caught.getMessage());
+ commonHandler();
+ }
+
+ @Override
+ public void onSuccess(List<SearchSuggestion> result) {
+ choices.setSearchSuggestions(result);
+ commonHandler();
+ }
+
+ private void commonHandler() {
+ int suggestionCount = choices.render(100, 15);
+ if (suggestionCount == 0) {
+ return;
+ }
+
+ choicesPopup.setPopupPosition(getAbsoluteLeft(), getAbsoluteTop() + getOffsetHeight() + 5);
+ show();
+
+ if (keyCode == 0) {
+ /*
+ if (choices.getItemCount() > 0) {
+ String value = choices.getValue(0);
+ if (value.equals(SuggestResultsListBox.FOOTER_MESSAGE)) {
+ if (choices.getItemCount() > 1) {
+ choices.setSelectedIndex(1);
+ } else {
+ choices.setSelectedIndex(-1); // nothing is selected if FOOTER_MESSAGE is the only suggestion
+ }
+ } else {
+ choices.setSelectedIndex(0);
+ }
+ }
+ */
+
+ setFocus(true);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
index b2d5009..6da2f0b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
@@ -30,11 +30,13 @@ public class ErrorHandler {
private ArrayList<String> errors = new ArrayList<String>();
- public void handleError(String message, Throwable t) {
-
-// SC.say(message);
+ public void handleError(String message) {
+ handleError(message, null);
+ }
- CoreGUI.getMessageCenter().notify(new Message(message, t.toString(), Message.Severity.Error));
+ public void handleError(String message, Throwable t) {
+ Message errorMessage = new Message(message, (t == null) ? null : t.toString(), Message.Severity.Error);
+ CoreGUI.getMessageCenter().notify(errorMessage);
t.printStackTrace();
this.errors.add(message);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
index db3af54..6aaafdd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
@@ -18,19 +18,19 @@
*/
package org.rhq.enterprise.gui.coregui.server.gwt;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
+import org.rhq.enterprise.server.util.LookupUtil;
/**
* @author Greg Hinkle
@@ -39,7 +39,6 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
private ThreadLocal<Subject> sessionSubject = new ThreadLocal<Subject>();
-
protected Subject getSessionSubject() {
return sessionSubject.get();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java
new file mode 100644
index 0000000..b896698
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java
@@ -0,0 +1,68 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.server.gwt;
+
+import java.util.List;
+
+import org.rhq.core.domain.criteria.SavedSearchCriteria;
+import org.rhq.core.domain.search.SavedSearch;
+import org.rhq.core.domain.search.SearchSubsystem;
+import org.rhq.core.domain.search.SearchSuggestion;
+import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTService;
+import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
+import org.rhq.enterprise.server.search.SavedSearchManagerLocal;
+import org.rhq.enterprise.server.search.execution.SearchAssistManager;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+/**
+ * @author Joseph Marques
+ */
+public class SearchGWTServiceImpl extends AbstractGWTServiceImpl implements SearchGWTService {
+
+ private SavedSearchManagerLocal savedSearchManager = LookupUtil.getSavedSearchManager();
+
+ @Override
+ public List<SearchSuggestion> getSuggestions(SearchSubsystem searchSubsystem, String expression, int caretPosition) {
+ SearchAssistManager searchAssistManager = new SearchAssistManager(getSessionSubject(), searchSubsystem);
+ List<SearchSuggestion> results = searchAssistManager.getSuggestions(expression, caretPosition);
+ return results;
+ }
+
+ @Override
+ public int createSavedSearch(SavedSearch savedSearch) {
+ return savedSearchManager.createSavedSearch(getSessionSubject(), savedSearch);
+ }
+
+ @Override
+ public void updateSavedSearch(SavedSearch savedSearch) {
+ savedSearchManager.updateSavedSearch(getSessionSubject(), savedSearch);
+ }
+
+ @Override
+ public void deleteSavedSearch(int savedSearchId) {
+ savedSearchManager.deleteSavedSearch(getSessionSubject(), savedSearchId);
+ }
+
+ @Override
+ public List<SavedSearch> findSavedSearchesByCriteria(SavedSearchCriteria criteria) {
+ return SerialUtility.prepare(savedSearchManager.findSavedSearchesByCriteria(getSessionSubject(), criteria),
+ "SearchService.findRolesByCriteria");
+ }
+
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index 87b0f0e..45b8fc2 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -48,13 +48,10 @@
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI BundleGWTService</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.BundleGWTServiceImpl</servlet-class>
</servlet>
-
-
<servlet>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI FileUploadServlet</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.FileUploadServlet</servlet-class>
</servlet>
-
<servlet>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI BundleFileUploadServlet</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.BundleFileUploadServlet</servlet-class>
@@ -63,26 +60,29 @@
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI UberBundleFileUploadServlet</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.UberBundleFileUploadServlet</servlet-class>
</servlet>
-
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceBossGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ResourceBossGWTServiceImpl</servlet-class>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceBossGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.ResourceBossGWTServiceImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI AuthorizationGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl</servlet-class>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI AuthorizationGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.AuthorizationGWTServiceImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI AvailabilityGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl</servlet-class>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI AvailabilityGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.AvailabilityGWTServiceImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI TagGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.TagGWTServiceImpl</servlet-class>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SearchGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.SearchGWTServiceImpl</servlet-class>
</servlet>
<servlet>
- <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RemoteInstallGWTService</servlet-name>
- <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl</servlet-class>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI TagGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.TagGWTServiceImpl</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RemoteInstallGWTService</servlet-name>
+ <servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.RemoteInstallGWTServiceImpl</servlet-class>
</servlet>
<servlet-mapping>
@@ -137,12 +137,10 @@
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI UberBundleFileUploadServlet</servlet-name>
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/UberBundleFileUploadServlet</url-pattern>
</servlet-mapping>
-
<servlet-mapping>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI ResourceBossGWTService</servlet-name>
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/ResourceBossGWTService</url-pattern>
</servlet-mapping>
-
<servlet-mapping>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI AuthorizationGWTService</servlet-name>
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/AuthorizationGWTService</url-pattern>
@@ -152,6 +150,10 @@
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/AvailabilityGWTService</url-pattern>
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI SearchGWTService</servlet-name>
+ <url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/SearchGWTService</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI TagGWTService</servlet-name>
<url-pattern>/org.rhq.enterprise.gui.coregui.CoreGUI/TagGWTService</url-pattern>
</servlet-mapping>
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
new file mode 100644
index 0000000..e91c4d3
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
@@ -0,0 +1,218 @@
+
+input {
+ white-space: no-wrap;
+}
+
+div {
+ margin-right: auto;
+ margin-left: auto;
+}
+
+.searchButton {
+ display: block;
+ font-size: 13px;
+ white-space: nowrap;
+}
+
+
+/*
+ *
+ * pattern field items
+ *
+ */
+
+.patternField {
+ font-size: 13px;
+ font-family: arial, sans-serif;
+ /*width: 785px;*/
+ width: 675px;
+ padding: 0;
+ margin: 0;
+ border-style: none;
+}
+
+.patternNameLabel {
+ background-color: rgb(192, 236, 207);
+ color: rgb(51, 106, 63);
+ font-weight: bold;
+ white-space: nowrap;
+ text-align: center;
+ border-style: none;
+ font-size:
+}
+
+.patternNameField {
+ font-size: 11px;
+ color: green;
+ width: 125px;
+ white-space: no-wrap;
+ border-color: gray;
+ border-style: dotted;
+ border-width: thin;
+}
+
+
+/*
+ *
+ * search container elements
+ *
+ */
+
+.searchBarContainer {
+ width: 800px;
+ position: relative;
+ background-color: rgb(233, 230, 225);
+ height: 34px;
+ vertical-align: bottom;
+}
+
+.searchBarBackgroundContainer {
+ position: absolute;
+ top: 5px;
+ left: 5px;
+ background-color: white;
+ border-style: inset;
+ border-top-color: rgb(250, 250, 250);
+ border-left-color: rgb(250, 250, 250);
+ border-bottom-color: white;
+ border-right-color: white;
+ border-width: 2px;
+ padding: 0;
+ width: 785px;
+ height: 20px;
+}
+
+.searchBarComponentsContainer {
+ width: 100%;
+ margin: 0;
+ padding: 0;
+}
+
+.searchBarComponentLHS {
+ background-color: white;
+ float: left;
+ width: 200px;
+}
+
+.searchBarComponentRHS {
+ background-color: white;
+ float: right;
+ padding-right: 5px;
+ padding-top: 2px;
+}
+
+.searchBarButtonContainer {
+ float: right;
+ padding: 5px 5px 0 0;
+ margin: 0;
+}
+
+/*
+ *
+ * saved search items
+ *
+ */
+
+.savedSearchesPanel {
+ background-color: white;
+ border-style: none;
+ padding: 0;
+ margin: 0;
+ width: 785px;
+}
+
+.savedSearchesPanel-row {
+ background-color: white;
+ border-style: none;
+ border-bottom-width: thin;
+ border-bottom-style: solid;
+ border-bottom-color: gray;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 5px 0px 5px;
+ width: 785px;
+}
+
+.savedSearchesGrid {
+ background-color: white;
+ border-style: solid;
+ border-width: thin;
+ border-color: buttonshadow;
+ padding: 0;
+ margin: 0;
+}
+
+.savedSearchesPanel-top {
+ color: green;
+ position: relative;
+ padding: 0;
+ margin: 0;
+ top: 1px;
+}
+
+.savedSearchesPanel-bottom {
+ font-size: 16px;
+ position: relative;
+ padding: 0;
+ margin: 0;
+ bottom: 1px;
+}
+
+.x-grid3-row-over {
+ background-color: rgb(245, 245, 245);
+ color: white;
+}
+
+
+/*
+ *
+ * suggest items
+ *
+ */
+
+.suggestPanel {
+ width: 785px;
+}
+
+.suggestData {
+ background-color: white;
+}
+
+.suggestDataSimple {
+ color: black;
+}
+
+.suggestDataAdvanced {
+ color: blue;
+}
+
+.suggestDataSavedSearch {
+ color: green;
+}
+
+
+/*
+ *
+ * Rounded Corners
+ *
+ */
+
+div.rounded {
+ /* just a container for rounded2 div replacement algorithm */
+}
+div.rounded2 {
+ width: 125px;
+ background: rgb(192, 236, 207) url(images/corner-upper-right-8.png) no-repeat top right;
+}
+div.rounded2 div {
+ background: url(images/corner-upper-left-8.png) no-repeat top left;
+}
+div.rounded2 div div {
+ background: url(images/corner-lower-right-8.png) no-repeat bottom right;
+}
+div.rounded2 div div div {
+ background: url(images/corner-lower-left-8.png) no-repeat bottom left;
+}
+
+div.rounded2 div div div div {
+ background-image: none;
+}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-gray-no-border.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-gray-no-border.png
new file mode 100644
index 0000000..15233e3
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-gray-no-border.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-white-no-border.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-white-no-border.png
new file mode 100644
index 0000000..325dc24
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-white-no-border.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-left-8.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-left-8.png
new file mode 100644
index 0000000..cc5b85d
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-left-8.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-right-8.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-right-8.png
new file mode 100644
index 0000000..ecc8537
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-right-8.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-left-8.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-left-8.png
new file mode 100644
index 0000000..191e27d
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-left-8.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-right-8.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-right-8.png
new file mode 100644
index 0000000..64eaaf6
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-right-8.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow.png
new file mode 100644
index 0000000..3254ecf
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow_down.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow_down.png
new file mode 100644
index 0000000..f50c07f
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow_down.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/star1.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/star1.png
new file mode 100644
index 0000000..9ac1f4f
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/star1.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/star2.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/star2.png
new file mode 100644
index 0000000..d6684b2
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/star2.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/star3.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/star3.png
new file mode 100644
index 0000000..0753f62
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/star3.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/search/trash.png b/modules/enterprise/gui/coregui/src/main/webapp/images/search/trash.png
new file mode 100644
index 0000000..7ed5245
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/search/trash.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/search.js b/modules/enterprise/gui/coregui/src/main/webapp/js/search.js
new file mode 100644
index 0000000..3f912f2
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/search.js
@@ -0,0 +1,35 @@
+function roundedCorners() {
+ var divs = document.getElementsByTagName('div');
+ var rounded_divs = [];
+ for (var i = 0; i < divs.length; i++) {
+ if (/\brounded\b/.exec(divs[i].className)) {
+ rounded_divs[rounded_divs.length] = divs[i];
+ }
+ }
+ for (var i = 0; i < rounded_divs.length; i++) {
+ var original = rounded_divs[i];
+
+ /* Make it the inner div of the four */
+ original.className = original.className.replace('rounded', '');
+ //var originalId = original.id;
+ //original.id = null;
+
+ /* Now create the outer-most div */
+ var tr = document.createElement('div');
+ //tr.id = originalId;
+ tr.className = 'rounded2';
+
+ /* Swap out the original (we'll put it back later) */
+ original.parentNode.replaceChild(tr, original);
+
+ /* Create the two other inner nodes */
+ var tl = document.createElement('div');
+ var br = document.createElement('div');
+
+ /* Now glue the nodes back in to the document */
+ tr.appendChild(tl);
+ tl.appendChild(br);
+ br.appendChild(original);
+ }
+}
+window.onload = roundedCorners;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java
index e01a8f2..dabf0a5 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java
@@ -13,7 +13,6 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.composite.ResourceComposite;
-import org.rhq.core.domain.search.SavedSearch;
import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.core.domain.util.PageControl;
@@ -26,7 +25,6 @@ import org.rhq.enterprise.gui.common.paging.PageControlView;
import org.rhq.enterprise.gui.common.paging.ResourceNameDisambiguatingPagedListDataModel;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
-import org.rhq.enterprise.server.search.SavedSearchManagerLocal;
import org.rhq.enterprise.server.search.execution.SearchAssistManager;
import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -41,7 +39,6 @@ public class BrowseResourcesUIBean extends PagedDataTableUIBean {
private ResourceCategory category;
private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
- private SavedSearchManagerLocal savedSearchManager = LookupUtil.getSavedSearchManager();
private static final IntExtractor<ResourceComposite> RESOURCE_ID_EXTRATOR = new IntExtractor<ResourceComposite>() {
public int extract(ResourceComposite object) {
@@ -59,6 +56,7 @@ public class BrowseResourcesUIBean extends PagedDataTableUIBean {
category = ResourceCategory.SERVICE;
}
+ /*
String searchId = FacesContextUtility.getOptionalRequestParameter("searchId");
if (searchId != null) {
SavedSearch savedSearch = savedSearchManager.getSavedSearchById(getSubject(), Integer.valueOf(searchId));
@@ -66,6 +64,7 @@ public class BrowseResourcesUIBean extends PagedDataTableUIBean {
} else {
search = FacesContextUtility.getOptionalRequestParameter("search");
}
+ */
}
public String getSearch() {
@@ -155,5 +154,4 @@ public class BrowseResourcesUIBean extends PagedDataTableUIBean {
public void setSearchInput(HtmlInputText searchInput) {
this.searchInput = searchInput;
}
-
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
new file mode 100644
index 0000000..98a35b1
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml
@@ -0,0 +1,32 @@
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:onc="http://jboss.org/on/component"
+ xmlns:onf="http://jboss.org/on/function"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:a4j="https://ajax4jsf.dev.java.net/ajax"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+ <div class="searchBarContainer" id="searchBar">
+ <div class="searchBarBackgroundContainer">
+ <div class="searchBarComponentsContainer">
+ <div class="searchBarComponentLHS" id="patternFieldContainer"></div>
+
+ <div class="searchBarComponentRHS" id="arrowImageContainer"></div>
+ <div class="searchBarComponentRHS" id="starImageContainer"></div>
+ <div class="searchBarComponentRHS" id="patternNameFieldContainer"></div>
+ <div class="searchBarComponentRHS">
+ <div id="patternNameLabelContainer" class="rounded"></div>
+ </div>
+ </div>
+ </div>
+ <div class="#{searchButtonId} searchBarButtonContainer" id="searchButtonContainer"></div>
+ <div style="position: absolute;" id="patternFieldSuggestionsContainer"></div>
+ <div style="position: absolute; width: 800px;" id="savedSearchesContainer"></div>
+ <br style="clear: both;" />
+ </div>
+
+</ui:composition>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
index 3a4c7ea..4972201 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml
@@ -30,6 +30,11 @@
<a4j:keepAlive beanName="BrowseResourcesUIBean"/>
+ <a4j:form>
+ <a4j:jsFunction name="extractSearchFilter">
+ <a4j:actionparam name="param1" assignTo="#{BrowseResourcesUIBean.search}" />
+ </a4j:jsFunction>
+ </a4j:form>
<h:form id="browseResourcesForm">
<input type="hidden" name="subtab" value="${param.subtab}" />
@@ -61,7 +66,7 @@
usingSuggestObjects="true"
eventsQueue="resourceSearchSuggestions"
ignoreDupResponses="true"
- rendered="true"> <!-- disable until auto-completer is added -->
+ rendered="true">
<h:column width="10%">
<h:outputText value="#{suggestItem.kind.displayName}" style="font-variant: small-caps; color: gray;"
rendered="#{suggestItem.kind.name eq 'Simple'}" />
@@ -87,6 +92,23 @@
<s:defaultAction/>
</a4j:commandButton>
</h:panelGroup>
+ <ui:remove>
+ <h:panelGrid columns="3">
+ <h:outputText value="Search: " />
+ <ui:include src="/rhq/common/searchInterface.xhtml">
+ <ui:param name="searchButtonId" value="browseResourcesForm:searchButtonJSF" />
+ </ui:include>
+
+ <a4j:commandButton id="searchButtonJSF" value="GO"
+ reRender="browseResourcesDataTable, browseResourcesDataTableScroller"
+ status="commonStatus"
+ actionListener="#{BrowseResourcesUIBean.clearDataModel}"
+ styleClass="buttonmed"
+ onclick="extractSearchFilter(getElementCrossBrowser('patternField').value)">
+ <s:defaultAction/>
+ </a4j:commandButton>
+ </h:panelGrid>
+ </ui:remove>
<p/>
<h:panelGrid columns="1" width="100%">
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml
index 6ad9393..24c4a72 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml
@@ -18,15 +18,24 @@
<ui:param name="defaultPageTitle" value="Inventory Browser"/>
+ <ui:define name="metaHeaders">
+ <script type="text/javascript" language="javascript"
+ src="/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/org.rhq.enterprise.gui.coregui.CoreGUI.nocache.js"></script>
+ <script type="text/javascript" src="/coregui/js/search.js"></script>
+ <link href="/coregui/css/search.css" rel="stylesheet" type="text/css"/>
+ </ui:define>
+
<ui:define name="summary"></ui:define>
<ui:define name="tabBar">
+ <ui:remove>
<a4j:region>
<h:form>
<a4j:poll interval="60000" timeout="5000"
reRender="browserTabBarPanel" status="commonStatus" />
</h:form>
</a4j:region>
+ </ui:remove>
<onc:tabBar id="browserTabBarPanel" selectedTabName="#{selectedTabName}" >
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/facelet.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/facelet.xhtml
new file mode 100644
index 0000000..fb4b602
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/facelet.xhtml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:onc="http://jboss.org/on/component"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+<ui:composition template="/rhq/layout/main.xhtml">
+
+ <ui:define name="metaHeaders">
+ <script type="text/javascript" language="javascript"
+ src="/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/org.rhq.enterprise.gui.coregui.CoreGUI.nocache.js"></script>
+ </ui:define>
+
+ <ui:param name="pageTitle" value="Facelets-based inclusion of GWT functionality defined in CoreGUI WAR"/>
+
+ <ui:define name="breadcrumbs">
+ <h:outputText value="No Breadcrumbs"/>
+ </ui:define>
+
+ <ui:define name="body">
+ <form>
+ <ui:remove>
+ In the target GWT module, in this case CoreGUI, add code in a new EntryPoint which does:
+
+ RootPanel testInputTextBox = RootPanel.get("testInputTextBox");
+ if (testInputTextBox == null) {
+ return; // user isn't accessing the page where this element is located
+ }
+ testInputTextBox.add( ... ); // add whatever widgets you want
+ </ui:remove>
+ <div id="testInputTextBox" />
+ </form>
+ </ui:define>
+
+</ui:composition>
+
+</html>
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/simple.html b/modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/simple.html
new file mode 100644
index 0000000..bf06028
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/simple.html
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:onc="http://jboss.org/on/component"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+<head>
+ <script type="text/javascript" language="javascript"
+ src="/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/org.rhq.enterprise.gui.coregui.CoreGUI.nocache.js"></script>
+</head>
+
+<body>
+ <form>
+ <!--
+ In the target GWT module, in this case CoreGUI, add code in a new EntryPoint which does:
+
+ RootPanel testInputTextBox = RootPanel.get("testInputTextBox");
+ if (testInputTextBox == null) {
+ return; // user isn't accessing the page where this element is located
+ }
+ testInputTextBox.add( ... ); // add whatever widgets you want
+ -->
+ <div id="testInputTextBox" />
+ </form>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/inner.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/inner.xhtml
new file mode 100644
index 0000000..0d324ad
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/inner.xhtml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:onc="http://jboss.org/on/component"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+<head>
+</head>
+
+<body>
+ <form>
+ <select>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ <option>Cruel</option>
+ </select>
+ </form>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/outer.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/outer.xhtml
new file mode 100644
index 0000000..cffbf14
--- /dev/null
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/outer.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:onc="http://jboss.org/on/component"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich">
+
+<head>
+</head>
+
+<body>
+
+ Hello
+ <iframe src="/test/iframe/inner.xhtml"
+ style="border: solid; width: 100px; height: 50px;" />
+ World
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java
index db826de..91676d0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java
@@ -80,7 +80,8 @@ public class SavedSearchResultCountRecalculationJob extends AbstractStatefulJob
// TODO: mark this saved search as "broken" so that future computation is suppressed for it
errors++;
LOG.error("Could not calculate result count for SavedSearch[name=" + next.getName() + ", pattern='"
- + next.getPattern() + "']");
+ + next.getPattern() + "']: " + t.getMessage());
+ LOG.debug(t);
}
}
if (updated > 0) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java
index 1485197..32aa7cd 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java
@@ -50,16 +50,17 @@ public class SavedSearchManagerBean implements SavedSearchManagerLocal /* local
/**
* @see SavedSearchManagerRemote#createSavedSearch(Subject, SavedSearch)
*/
- public void createSavedSearch(Subject subject, SavedSearch savedSearch) {
+ public int createSavedSearch(Subject subject, SavedSearch savedSearch) {
validateManipulatePermission(subject, savedSearch);
entityManager.persist(savedSearch);
- return;
+ return savedSearch.getId();
}
/**
* @see SavedSearchManagerRemote#updateSavedSearch(Subject, SavedSearch)
*/
public void updateSavedSearch(Subject subject, SavedSearch savedSearch) {
+ // this needs to prevent certains types of updates, be more sophisticated, etc
validateManipulatePermission(subject, savedSearch);
entityManager.merge(savedSearch);
return;
@@ -102,7 +103,7 @@ public class SavedSearchManagerBean implements SavedSearchManagerLocal /* local
}
// note: inventory managers can modify any saved search pattern, not just their own
} else {
- if (subject.equals(savedSearch.getSubject())) {
+ if (subject.getId() != savedSearch.getSubjectId() && !authorizationManager.isInventoryManager(subject)) {
throw new PermissionException("Users without inventory manager permission "
+ "can only manipulate their own saved searches");
}
@@ -111,7 +112,7 @@ public class SavedSearchManagerBean implements SavedSearchManagerLocal /* local
private void validateReadPermission(Subject subject, SavedSearch savedSearch) {
if (!savedSearch.isGlobal()) {
- if (subject.equals(savedSearch.getSubject())) {
+ if (subject.getId() != savedSearch.getSubjectId() && !authorizationManager.isInventoryManager(subject)) {
throw new PermissionException("Users without inventory manager permission "
+ "can only view their own or global saved saved searches");
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
index 6585739..64d4824 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
@@ -52,7 +52,7 @@ public interface SavedSearchManagerRemote {
* their own accounts.
*/
@WebMethod
- public void createSavedSearch( //
+ public int createSavedSearch( //
@WebParam(name = "subject") Subject subject, //
@WebParam(name = "savedSearch") SavedSearch savedSearch);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
index 8603946..a459d87 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
@@ -8,10 +8,15 @@ import java.util.Map;
import javax.persistence.Query;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.rhq.enterprise.server.util.LookupUtil;
public abstract class AbstractSearchAssistant implements SearchAssistant {
+ private final Log log = LogFactory.getLog(SearchAssistant.class);
+
private int maxResultCount = 20;
public int getMaxResultCount() {
@@ -51,6 +56,7 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
@SuppressWarnings("unchecked")
protected final List<String> execute(String jpql) {
+ log.debug("Executing JPQL: " + jpql);
Query query = LookupUtil.getEntityManager().createQuery(jpql);
query.setMaxResults(maxResultCount);
List<String> results = query.getResultList();
@@ -59,6 +65,7 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
@SuppressWarnings("unchecked")
protected final Map<String, List<String>> executeMap(String jpql) {
+ log.debug("Executing Map JPQL: " + jpql);
Query query = LookupUtil.getEntityManager().createQuery(jpql);
List<Object[]> rawResults = query.getResultList();
Map<String, List<String>> results = new HashMap<String, List<String>>();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
index 4deaa01..d0721eb 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
@@ -41,7 +41,7 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
+ " FROM ResourceType type " //
+ " JOIN type.pluginConfigurationDefinition.propertyDefinitions definition " //
+ add(" WHERE LOWER(definition.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY definition.name ");
+ + " ORDER BY definition.name ");
} else if (context.equals("configuration")) {
return execute("" //
@@ -49,7 +49,7 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
+ " FROM ResourceType type " //
+ " JOIN type.resourceConfigurationDefinition.propertyDefinitions definition " //
+ add(" WHERE LOWER(definition.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY definition.name ");
+ + " ORDER BY definition.name ");
} else if (context.equals("trait")) {
return execute("" //
@@ -57,7 +57,7 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
+ " FROM MeasurementDefinition definition " //
+ " WHERE definition.dataType = 1 " //
+ add(" AND LOWER(definition.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY definition.name ");
+ + " ORDER BY definition.name ");
} else {
return Collections.emptyList();
@@ -77,21 +77,21 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
+ "SELECT DISTINCT type.name " //
+ " FROM ResourceType type " //
+ add(" WHERE LOWER(type.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY type.name ");
+ + " ORDER BY type.name ");
} else if (context.equals("plugin")) {
return execute("" //
+ "SELECT DISTINCT type.plugin " //
+ " FROM ResourceType type " //
+ add(" WHERE LOWER(type.plugin) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY type.plugin ");
+ + " ORDER BY type.plugin ");
} else if (context.equals("name")) {
return execute("" //
+ "SELECT DISTINCT res.name " //
+ " FROM Resource res " //
+ add(" WHERE LOWER(res.name) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY res.name ");
+ + " ORDER BY res.name ");
} else if (context.equals("connection")) {
return execute("" //
@@ -99,9 +99,9 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
+ " FROM Resource res, PropertySimple simple " //
+ " JOIN res.pluginConfiguration.properties property " //
+ " WHERE simple.id = property.id " //
- + " AND property.name = '" + param + "'" //
+ + " AND LOWER(property.name) LIKE '%" + param + "%'" //
+ add(" AND LOWER(property.stringValue) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY simple.stringValue ");
+ + " ORDER BY simple.stringValue ");
} else if (context.equals("configuration")) {
return execute("" //
@@ -109,18 +109,18 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
+ " FROM Resource res, PropertySimple simple " //
+ " JOIN res.resourceConfiguration.properties property " //
+ " WHERE simple.id = property.id " //
- + " AND property.name = '" + param + "'" //
+ + " AND LOWER(property.name) LIKE '%" + param + "%'" //
+ add(" AND LOWER(property.stringValue) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY simple.stringValue ");
+ + " ORDER BY simple.stringValue ");
} else if (context.equals("trait")) {
return execute("" //
+ "SELECT trait.value " //
+ " FROM MeasurementDataTrait trait " //
+ " WHERE trait.schedule.definition.dataType = 1 " //
- + " AND trait.schedule.definition.name = '" + param + "'" //
+ + " AND LOWER(trait.schedule.definition.name) LIKE '%" + param + "%'" //
+ add(" AND LOWER(trait.value) LIKE '%" + filter.toLowerCase() + "%'", filter) //
- + "ORDER BY trait.value ");
+ + " ORDER BY trait.value ");
} else {
return Collections.emptyList();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
index 97f44dd..3d5393b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
@@ -19,7 +19,6 @@ import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.server.search.SavedSearchManagerLocal;
import org.rhq.enterprise.server.search.assist.AbstractSearchAssistant;
import org.rhq.enterprise.server.search.assist.ResourceSearchAssistant;
-import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
import org.rhq.enterprise.server.util.LookupUtil;
public class SearchAssistManager {
@@ -182,6 +181,19 @@ public class SearchAssistManager {
public String toString() {
return null;
}
+
+ public String getExpressionWithReplacement(String replacement) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < terms.size(); i++) {
+ if (i == currentTermIndex) {
+ builder.append(replacement);
+ } else {
+ builder.append(terms.get(i));
+ }
+ builder.append(' ');
+ }
+ return builder.toString();
+ }
}
static class ParsedContext {
@@ -264,6 +276,24 @@ public class SearchAssistManager {
return new ParsedContext(context, param, operator, value);
}
+ public boolean isSimple() {
+ if (operator != null) {
+ return false; // non-null operator implies an incomplete, advanced term
+ }
+
+ if (param != null) {
+ return false; // non-null operator implies an incomplete, advanced term
+ }
+
+ /*
+ * otherwise it's still possible that the user wants a simple text completion.
+ *
+ * note: it should not be necessary to check for non-null 'value' because operation/param would have
+ * had to be non-null first, which we've already verified by getting to here.
+ */
+ return true;
+ }
+
public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append(getClass().getSimpleName()).append("[");
@@ -290,7 +320,7 @@ public class SearchAssistManager {
}
}
- public List<String> getAllContexts() {
+ private List<String> getAllContexts() {
List<String> results = new ArrayList<String>(getSearchAssistant().getSimpleContexts());
for (String parameterized : getSearchAssistant().getParameterizedContexts()) {
results.add(parameterized + "[");
@@ -299,27 +329,50 @@ public class SearchAssistManager {
}
public List<SearchSuggestion> getSuggestions(String expression, int caretPos) {
- //List<SearchSuggestion> simple = getSimpleSuggestions(expression, caretPos);
+ if (expression == null) {
+ expression = "";
+ }
+
+ List<SearchSuggestion> simple = getSimpleSuggestions(expression, caretPos);
List<SearchSuggestion> advanced = getAdvancedSuggestions(expression, caretPos);
List<SearchSuggestion> userSavedSearches = getUserSavedSearchSuggestions(expression);
- List<SearchSuggestion> globalSavedSearches = getGlobalSavedSearchSuggestions(expression);
+ //List<SearchSuggestion> globalSavedSearches = getGlobalSavedSearchSuggestions(expression);
List<SearchSuggestion> results = new ArrayList<SearchSuggestion>();
- //results.addAll(simple);
+ results.addAll(simple);
results.addAll(advanced);
results.addAll(userSavedSearches);
- results.addAll(globalSavedSearches);
+ //results.addAll(globalSavedSearches);
Collections.sort(results);
+
return results;
}
public List<SearchSuggestion> getSimpleSuggestions(String expression, int caretPos) {
AbstractSearchAssistant completor = getSearchAssistant();
+ debug("getSimpleSuggestions: START");
+
+ SearchTermAssistant assistant = new SearchTermAssistant(expression, caretPos);
+ String beforeCaret = assistant.getFragmentBeforeCaret();
+ ParsedContext parsed = ParsedContext.get(beforeCaret);
+
+ if (parsed.isSimple() == false) {
+ return Collections.emptyList();
+ }
+
+ /*
+ * if we know the ParsedContext object may represent a simple search term, then the 'context' attribute
+ * would hold it's current value, which in this case we'll extract and use as the simple value match
+ */
+ String parsedTerm = parsed.context;
List<SearchSuggestion> results = new ArrayList<SearchSuggestion>();
for (String nextContext : completor.getSimpleContexts()) {
- String intermediateExpression = nextContext + "=" + expression;
- List<SearchSuggestion> suggestions = getAdvancedSuggestions(intermediateExpression, caretPos);
+
+ debug("getSimpleSuggestions: suggesting value completions for a simple context [" + nextContext + "]");
+ List<String> valueSuggestions = pad("\"", completor.getValues(nextContext, null, parsedTerm), "\"");
+
+ List<SearchSuggestion> suggestions = convert(valueSuggestions, parsed, parsedTerm, Kind.Simple);
results.addAll(suggestions);
}
Collections.sort(results);
@@ -334,9 +387,7 @@ public class SearchAssistManager {
AbstractSearchAssistant completor = getSearchAssistant();
debug("getAdvancedSuggestions: START");
- long id = HibernatePerformanceMonitor.get().start();
SearchTermAssistant assistant = new SearchTermAssistant(expression, caretPos);
- HibernatePerformanceMonitor.get().stop(id, "SearchAssistant");
String[] tokens = assistant.getTerms().toArray(new String[0]);
debug("" + tokens.length + " tokens are " + Arrays.asList(tokens));
@@ -370,30 +421,32 @@ public class SearchAssistManager {
// check if this context is complete or not
if (completor.getSimpleContexts().contains(parsed.context)) {
debug("getAdvancedSuggestions: search term is simple context, wants operator");
- return convert(pad(parsed.context, comparisonOperators, ""));
+ return convert(pad(parsed.context, comparisonOperators, ""), parsed, parsed.context);
}
if (completor.getParameterizedContexts().contains(parsed.context)) {
debug("getAdvancedSuggestions: search term is parameterized context, wants open bracket");
- return convert(Arrays.asList(parsed.context + "["));
+ return convert(Arrays.asList(parsed.context + "["), parsed, parsed.context);
}
debug("getAdvancedSuggestions: search term wants context completion");
List<String> startsWithContexts = new ArrayList<String>();
+ String lowerCaseParsedContext = parsed.context.toLowerCase(); // contexts should already be lower-cased
for (String context : completor.getSimpleContexts()) {
- if (context.indexOf(parsed.context) != -1) {
+ if (context.indexOf(lowerCaseParsedContext) != -1) {
startsWithContexts.add(context);
}
}
for (String context : completor.getParameterizedContexts()) {
- if (context.indexOf(parsed.context) != -1) {
+ if (context.indexOf(lowerCaseParsedContext) != -1) {
startsWithContexts.add(context + "[");
}
}
- return convert(startsWithContexts);
+ return convert(startsWithContexts, parsed, parsed.context);
}
case PARAM:
debug("getAdvancedSuggestions: param state");
- return convert(pad(parsed.context + "[", completor.getParameters(parsed.context, parsed.param), "]"));
+ return convert(pad(parsed.context + "[", completor.getParameters(parsed.context, parsed.param), "]"),
+ parsed, parsed.param);
case OPERATOR:
debug("getAdvancedSuggestions: operator state");
if (comparisonOperators.contains(parsed.operator)) {
@@ -428,10 +481,11 @@ public class SearchAssistManager {
"\"");
if (completor.getSimpleContexts().contains(parsed.context)) {
debug("getAdvancedSuggestions: suggesting value completions for a simple context");
- return convert(pad(parsed.context + parsed.operator, valueSuggestions, ""));
+ return convert(pad(parsed.context + parsed.operator, valueSuggestions, ""), parsed, parsed.value);
} else {
debug("getAdvancedSuggestions: suggesting value completions for a parameterized context");
- return convert(pad(parsed.context + "[" + parsed.param + "]" + parsed.operator, valueSuggestions, ""));
+ return convert(pad(parsed.context + "[" + parsed.param + "]" + parsed.operator, valueSuggestions, ""),
+ parsed, parsed.value);
}
default:
return Collections.emptyList();
@@ -439,10 +493,12 @@ public class SearchAssistManager {
}
public List<SearchSuggestion> getUserSavedSearchSuggestions(String expression) {
+ expression = expression.trim().toLowerCase().replaceAll("\\s+", " ");
+
SavedSearchCriteria criteria = new SavedSearchCriteria();
criteria.addFilterSubjectId(subject.getId());
criteria.addFilterSearchContext(searchSubsystem);
- if (expression != null && expression.trim().equals("")) {
+ if (expression.equals("") == false) {
criteria.addFilterName(expression);
}
@@ -464,9 +520,12 @@ public class SearchAssistManager {
}
public List<SearchSuggestion> getGlobalSavedSearchSuggestions(String expression) {
+ expression = expression.trim().toLowerCase().replaceAll("\\s+", " ");
+
SavedSearchCriteria criteria = new SavedSearchCriteria();
criteria.addFilterGlobal(true);
- if (expression != null && expression.trim().equals("")) {
+ criteria.addFilterSearchContext(searchSubsystem);
+ if (expression.equals("") == false) {
criteria.addFilterName(expression);
}
@@ -497,13 +556,40 @@ public class SearchAssistManager {
}
private List<SearchSuggestion> convert(List<String> suggestions) {
+ return convert(suggestions, null, "", Kind.Advanced);
+ }
+
+ private List<SearchSuggestion> convert(List<String> suggestions, ParsedContext parsed, String term) {
+ return convert(suggestions, parsed, term, Kind.Advanced);
+ }
+
+ private List<SearchSuggestion> convert(List<String> suggestions, ParsedContext parsed, String term, Kind kind) {
+ int startIndex = getStartIndex(parsed);
+ term = term.toLowerCase();
List<SearchSuggestion> results = new ArrayList<SearchSuggestion>(suggestions.size());
for (String suggestion : suggestions) {
- results.add(new SearchSuggestion(Kind.Advanced, suggestion));
+ int index = suggestion.toLowerCase().indexOf(term, startIndex);
+ results.add(new SearchSuggestion(kind, suggestion, index, term.length()));
}
return results;
}
+ private int getStartIndex(ParsedContext parsed) {
+ if (parsed == null) {
+ return 0;
+ }
+ switch (parsed.state) {
+ case PARAM:
+ return parsed.context.length();
+ case OPERATOR:
+ return parsed.context.length() + (parsed.param != null ? parsed.param.length() : 0);
+ case VALUE:
+ return parsed.context.length() + (parsed.param != null ? parsed.param.length() : 0)
+ + parsed.operator.length();
+ }
+ return 0; // case CONTEXT
+ }
+
private List<String> pad(String leftPad, List<String> data, String rightPad) {
List<String> results = new ArrayList<String>();
for (String next : data) {
commit 9ddd31c129230f1c6a0a86dad741387beb0bf955
Merge: bf62e18... 395aa1d...
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 21 09:38:51 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit bf62e186bc652d673d06e50df0f9cc03a61b3f94
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 21 09:37:34 2010 -0400
[BZ 581818] Updating javascript so that db connection properties are updated for oracle selection
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
index 3735dcd..c9aee8f 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/start.jsp
@@ -75,7 +75,7 @@
document.getElementById('propForm:databasedriverclass').value = 'org.postgresql.Driver';
document.getElementById('propForm:databasexadatasourceclass').value = 'org.postgresql.xa.PGXADataSource';
hideDiv('experimentalDbMsg');
- } else if (this.options[this.selectedIndex].value == 'Oracle10g') {
+ } else if (this.options[this.selectedIndex].value == 'Oracle') {
document.getElementById('propForm:databaseconnectionurl').value = 'jdbc:oracle:thin:@127.0.0.1:1521:rhq';
document.getElementById('propForm:databasedriverclass').value = 'oracle.jdbc.driver.OracleDriver';
document.getElementById('propForm:databasexadatasourceclass').value = 'oracle.jdbc.xa.client.OracleXADataSource';
commit 395aa1d971576a1ca526a71da6a58c3c58253256
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri May 21 09:09:10 2010 -0400
BZ 536173 - there is now a backdoor system property you can set to override the 5s availability timeout - rhq.agent.plugins.availability-scan.timeout
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
index eac2016..d916bbc 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
@@ -51,7 +51,25 @@ import org.rhq.core.pluginapi.availability.AvailabilityFacet;
* @author John Mazzitelli
*/
public class AvailabilityExecutor implements Runnable, Callable<AvailabilityReport> {
- private static final int GET_AVAILABILITY_TIMEOUT = 5 * 1000; // 5 seconds
+ // the get-availability-timeout will rarely, if ever, want to be overridden. It will default to be 5 seconds
+ // and that's what it probably should always be. However, there may be a rare instance where someone wants
+ // to give this availability executor a bit more time to wait for the resource's availability response
+ // and is willing to live with the possible consequences (that being, delayed avail reports and possibly
+ // false-down alerts getting triggered). Rather than changing this timeout, people should be using
+ // the asynchronous-availability-check capabilities that are exposed to the plugins. Because we do not
+ // want to encourage people from changing this, we do not expose this "backdoor" system property as a
+ // standard plugin configuration setting/agent preference - if someone wants to do this, they must
+ // explicitly pass in -D to the JVM running the plugin container.
+ private static final int GET_AVAILABILITY_TIMEOUT;
+ static {
+ int timeout;
+ try {
+ timeout = Integer.parseInt(System.getProperty("rhq.agent.plugins.availability-scan.timeout", "5000"));
+ } catch (Throwable t) {
+ timeout = 5000;
+ }
+ GET_AVAILABILITY_TIMEOUT = timeout;
+ }
private final Log log = LogFactory.getLog(AvailabilityExecutor.class);
commit 49e72b33dbb715fb390cdcfe6c64ed727addaa8b
Author: Simeon Pinder <spinder(a)cacaphonix.conchfritter.com>
Date: Fri May 21 08:32:52 2010 -0400
BZ 586079: spelling changes.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
index d659c56..96a7e65 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java
@@ -77,10 +77,10 @@ public class RepoAssociationsUIBean extends PagedDataTableUIBean {
manager.removeContentSourcesFromRepo(subject, repoId, contentSourceIds);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disassociated [" + contentSourceIds.length
- + "] content sources from repo");
+ + "] content sources from repository");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to disassociate one or more content sources from repo", e);
+ "Failed to disassociate one or more content sources from repository", e);
}
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
index 2f3b989..4c93698 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java
@@ -55,10 +55,10 @@ public class RepoContentSourcesUIBean extends PagedDataTableUIBean {
manager.removeContentSourcesFromRepo(subject, repoId, contentSourceIds);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disassociated [" + contentSourceIds.length
- + "] content sources from repo");
+ + "] content sources from repository");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to disassociate one or more content sources from repo", e);
+ "Failed to disassociate one or more content sources from repository", e);
}
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
index 517da56..d42e19d 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java
@@ -55,10 +55,10 @@ public class RepoDisassociationsUIBean extends PagedDataTableUIBean {
manager.addContentSourcesToRepo(subject, repoId, contentSourceIds);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Associated [" + contentSourceIds.length
- + "] content sources with repo");
+ + "] content sources with repository");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to associate one or more content sources with repo", e);
+ "Failed to associate one or more content sources with repository", e);
}
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoResourcesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoResourcesUIBean.java
index 5521445..9c4093e 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoResourcesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoResourcesUIBean.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.content;
import javax.faces.application.FacesMessage;
import javax.faces.model.DataModel;
+
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
@@ -28,7 +29,6 @@ import org.rhq.core.gui.util.FacesContextUtility;
import org.rhq.core.util.IntExtractor;
import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean;
import org.rhq.enterprise.gui.common.paging.PageControlView;
-import org.rhq.enterprise.gui.common.paging.PagedListDataModel;
import org.rhq.enterprise.gui.common.paging.ResourceNameDisambiguatingPagedListDataModel;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.content.RepoManagerLocal;
@@ -42,7 +42,7 @@ public class RepoResourcesUIBean extends PagedDataTableUIBean {
return r.getId();
}
};
-
+
public RepoResourcesUIBean() {
}
@@ -64,10 +64,10 @@ public class RepoResourcesUIBean extends PagedDataTableUIBean {
}
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Unsubscribed [" + resourceIds.length
- + "] resources from repo");
+ + "] resources from repository");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to unsubscribe one or more resources from repo", e);
+ "Failed to unsubscribe one or more resources from repository", e);
}
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoSubscriptionsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoSubscriptionsUIBean.java
index 025d5f9..a628ed8 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoSubscriptionsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoSubscriptionsUIBean.java
@@ -48,7 +48,7 @@ public class RepoSubscriptionsUIBean extends PagedDataTableUIBean {
return r.getId();
}
};
-
+
public String deleteSelectedRepoSubscriptions() {
Subject subject = EnterpriseFacesContextUtility.getSubject();
String[] selected = getSelectedRepoSubscriptions();
@@ -65,10 +65,10 @@ public class RepoSubscriptionsUIBean extends PagedDataTableUIBean {
}
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Unsubscribed [" + resourceIds.length
- + "] resources from repo");
+ + "] resources from repository");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to unsubscribe one or more resources from repo", e);
+ "Failed to unsubscribe one or more resources from repository", e);
}
}
@@ -97,7 +97,7 @@ public class RepoSubscriptionsUIBean extends PagedDataTableUIBean {
PageList<Resource> results = manager.findSubscribedResources(subject, id, pc);
return results;
}
-
+
protected IntExtractor<Resource> getResourceIdExtractor() {
return RESOURCE_ID_EXTRACTOR;
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoUnsubscriptionsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoUnsubscriptionsUIBean.java
index 59b5a0a..a865a6e 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoUnsubscriptionsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoUnsubscriptionsUIBean.java
@@ -18,7 +18,6 @@
*/
package org.rhq.enterprise.gui.content;
-
import javax.faces.application.FacesMessage;
import javax.faces.model.DataModel;
@@ -48,7 +47,7 @@ public class RepoUnsubscriptionsUIBean extends PagedDataTableUIBean {
return r.getId();
}
};
-
+
public RepoUnsubscriptionsUIBean() {
}
@@ -87,10 +86,10 @@ public class RepoUnsubscriptionsUIBean extends PagedDataTableUIBean {
}
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Subscribed [" + resourceIds.length
- + "] resources with repo");
+ + "] resources with repository");
} catch (Exception e) {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
- "Failed to subscribe one or more resources with repo", e);
+ "Failed to subscribe one or more resources with repository", e);
}
}
@@ -100,8 +99,7 @@ public class RepoUnsubscriptionsUIBean extends PagedDataTableUIBean {
@Override
public DataModel getDataModel() {
if (dataModel == null) {
- dataModel = new RepoUnsubscriptionsDataModel(PageControlView.RepoUnsubscriptionsList,
- MANAGED_BEAN_NAME);
+ dataModel = new RepoUnsubscriptionsDataModel(PageControlView.RepoUnsubscriptionsList, MANAGED_BEAN_NAME);
}
return dataModel;
@@ -130,14 +128,14 @@ public class RepoUnsubscriptionsUIBean extends PagedDataTableUIBean {
categoryEnum = ResourceCategory.valueOf(category);
}
- PageList<Resource> results = manager.findAvailableResourcesForRepo(subject, repoId, search,
- categoryEnum, pc);
+ PageList<Resource> results = manager.findAvailableResourcesForRepo(subject, repoId, search, categoryEnum,
+ pc);
//PageList<ResourceComposite> results = manager.findResourceComposites(subject, categoryEnum, null, null, search, pc);
return results;
}
-
+
protected IntExtractor<Resource> getResourceIdExtractor() {
return RESOURCE_ID_EXTRACTOR;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java
index e931267..c273793 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java
@@ -34,9 +34,9 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.content.Distribution;
+import org.rhq.core.domain.content.DistributionFile;
import org.rhq.core.domain.content.DistributionType;
import org.rhq.core.domain.content.RepoDistribution;
-import org.rhq.core.domain.content.DistributionFile;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
import org.rhq.enterprise.server.authz.RequiredPermission;
@@ -90,7 +90,7 @@ public class DistributionManagerBean implements DistributionManagerLocal, Distri
@RequiredPermission(Permission.MANAGE_INVENTORY)
public void deleteDistributionMappingsForRepo(Subject user, int repoId) {
- log.debug("User [" + user + "] is removing distribution tree mapping from repo [" + repoId + "]");
+ log.debug("User [" + user + "] is removing distribution tree mapping from repository [" + repoId + "]");
entityManager.createNamedQuery(RepoDistribution.DELETE_BY_REPO_ID).setParameter("repoId", repoId)
.executeUpdate();
@@ -170,8 +170,6 @@ public class DistributionManagerBean implements DistributionManagerLocal, Distri
}
-
-
/**
* Returns a list of available distribution files for requested distribution
* @param distId
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
index f78c7fc..9cd8584 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java
@@ -640,7 +640,7 @@ public class RepoManagerBean implements RepoManagerLocal, RepoManagerRemote {
public void removeContentSourcesFromRepo(Subject subject, int repoId, int[] contentSourceIds) throws RepoException {
Repo repo = getRepo(subject, repoId);
- log.debug("User [" + subject + "] is removing content sources from repo [" + repo + "]");
+ log.debug("User [" + subject + "] is removing content sources from repository [" + repo + "]");
Set<RepoContentSource> currentSet = repo.getRepoContentSources();
@@ -715,7 +715,7 @@ public class RepoManagerBean implements RepoManagerLocal, RepoManagerRemote {
// make sure the user has permissions to unsubscribe this resource
if (!authzManager.hasResourcePermission(subject, Permission.MANAGE_CONTENT, resourceId)) {
throw new PermissionException("[" + subject
- + "] does not have permission to unsubscribe this resource from repos");
+ + "] does not have permission to unsubscribe this resource from repositories");
}
// find the resource - abort if it does not exist
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java
index bfad1a1..03e7ba6 100644
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java
+++ b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java
@@ -220,7 +220,7 @@ public class RHNProvider implements ContentProvider, PackageSource, RepoSource,
//helper.disconnect();
summary.markEnded();
report.setSummary(summary.toString());
- log.info("synchronizing with repo: " + helper + " finished\n" + summary);
+ log.info("synchronizing with repository: " + helper + " finished\n" + summary);
}
}
diff --git a/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoProvider.java b/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoProvider.java
index 40c6656..f065ba7 100644
--- a/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoProvider.java
+++ b/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoProvider.java
@@ -134,7 +134,7 @@ public class RepoProvider implements ContentProvider, PackageSource {
public void synchronizePackages(String repoName, PackageSyncReport report,
Collection<ContentProviderPackageDetails> existingPackages) throws SyncException, InterruptedException {
Summary summary = new Summary(reader);
- log.info("synchronizing with repo: " + reader + " started");
+ log.info("synchronizing with repository: " + reader + " started");
try {
summary.markStarted();
repo = new Repo(reader);
@@ -163,7 +163,7 @@ public class RepoProvider implements ContentProvider, PackageSource {
repo.disconnect();
summary.markEnded();
report.setSummary(summary.toString());
- log.info("synchronizing with repo: " + reader + " finished\n" + summary);
+ log.info("synchronizing with repository: " + reader + " finished\n" + summary);
}
}
commit 740206d91112013b0c87a0d7c453b73f414db43a
Merge: 2be8ee3... f9f46db...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri May 21 10:12:15 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit f9f46db69bea5813d8ca98b1951a8176c4ec15c6
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu May 20 20:59:22 2010 +0200
BZ 566235 - fixed the problem with timeouts on streaming.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
index 8601b51..d1e8dad 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.server.content;
import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -51,8 +52,6 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.lob.BlobImpl;
-import org.hibernate.lob.SerializableBlob;
import org.jboss.annotation.ejb.TransactionTimeout;
import org.jboss.util.StringPropertyReplacer;
import org.rhq.core.domain.auth.Subject;
@@ -789,7 +788,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
throw new RuntimeException(t);
}
}
-
+
@RequiredPermission(Permission.MANAGE_INVENTORY)
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@TransactionTimeout(90 * 60)
@@ -948,6 +947,184 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return packageBits;
}
+ private InputStream preloadPackageBits(PackageVersionContentSource pvcs) throws Exception{
+ PackageVersionContentSourcePK pk = pvcs.getPackageVersionContentSourcePK();
+ int contentSourceId = pk.getContentSource().getId();
+ int packageVersionId = pk.getPackageVersion().getId();
+ String packageVersionLocation = pvcs.getLocation();
+
+ ContentServerPluginContainer pc = ContentManagerHelper.getPluginContainer();
+ InputStream bitsStream = pc.getAdapterManager().loadPackageBits(contentSourceId, packageVersionLocation);
+
+ PackageVersion pv = entityManager.find(PackageVersion.class, packageVersionId);
+
+ switch (pk.getContentSource().getDownloadMode()) {
+ case NEVER: {
+ return null; // no-op, our content source was told to never download package bits
+ }
+
+ case DATABASE: {
+ log.debug("Downloading package bits to DB for package located at [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ File tempFile = File.createTempFile("JonContent", "");
+ tempFile.deleteOnExit();
+ OutputStream tempStream = new BufferedOutputStream(new FileOutputStream(tempFile));
+ StreamUtil.copy(bitsStream, tempStream, true);
+ InputStream inp = new BufferedInputStream(new FileInputStream(tempFile));
+ return inp;
+ }
+
+ case FILESYSTEM: {
+ log.debug("Downloading package bits to filesystem for package located at [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ File outputFile = getPackageBitsLocalFileAndCreateParentDir(pv.getId(), pv.getFileName());
+ log.info("OutPutFile is located at: " + outputFile);
+ boolean download = false;
+
+ if (outputFile.exists()) {
+ // hmmm... it already exists, maybe we already have it?
+ // if the MD5's match, just ignore this download request and continue on
+ // If they are different we re-download
+ String expectedMD5 = (pv.getMD5() != null) ? pv.getMD5() : "<unspecified MD5>";
+ String actualMD5 = MessageDigestGenerator.getDigestString(outputFile);
+ if (!expectedMD5.trim().toLowerCase().equals(actualMD5.toLowerCase())) {
+ log.error("Already have package bits for [" + pv + "] located at [" + outputFile
+ + "] but the MD5 hashcodes do not match. Expected MD5=[" + expectedMD5
+ + "], Actual MD5=[" + actualMD5 + "] - redownloading package");
+ download = true;
+ } else {
+ log.info("Asked to download package bits but we already have it at [" + outputFile
+ + "] with matching MD5 of [" + actualMD5 + "]");
+ download = false;
+ }
+ } else {
+ download = true;
+ }
+ if (download) {
+ StreamUtil.copy(bitsStream, new FileOutputStream(outputFile), true);
+ bitsStream = null;
+ }
+ break;
+ }
+
+ default: {
+ throw new IllegalStateException(" Unknown download mode - this is a bug, please report it: " + pvcs);
+ }
+ }
+
+ return null;
+ }
+
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ @TransactionTimeout(40 * 60)
+ private PackageBits preparePackageBits(Subject subject,InputStream bitsStream, PackageVersionContentSource pvcs) {
+ PackageVersionContentSourcePK pk = pvcs.getPackageVersionContentSourcePK();
+ int contentSourceId = pk.getContentSource().getId();
+ int packageVersionId = pk.getPackageVersion().getId();
+ String packageVersionLocation = pvcs.getLocation();
+
+ PackageBits packageBits = null;
+
+ try {
+
+ Connection conn = null;
+ PreparedStatement ps = null;
+ PreparedStatement ps2 = null;
+ try {
+ packageBits = new PackageBits();
+
+ entityManager.persist(packageBits);
+
+ PackageVersion pv = entityManager.find(PackageVersion.class, packageVersionId);
+ pv.setPackageBits(packageBits);
+
+ entityManager.flush(); // push the new package bits row to the DB
+
+ if (pk.getContentSource().getDownloadMode() == DownloadMode.DATABASE) {
+ packageBits = entityManager.find(PackageBits.class, packageBits.getId());
+ //we need to save not null value so that we can in next step load the value as a Blob
+ // packageBits.setBits(new String("a").getBytes());
+ packageBits.setBits(new String("a").getBytes());
+ entityManager.merge(packageBits);
+ entityManager.flush();
+
+ conn = dataSource.getConnection();
+ //we are loading the PackageBits saved in the previous step
+ //we need to lock the row which will be updated so we are using FOR UPDATE
+ ps = conn.prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ? FOR UPDATE");
+ ps.setInt(1, packageBits.getId());
+ ResultSet rs = ps.executeQuery();
+ if (rs != null) {
+ while (rs.next()) {
+
+ //We can not create a blob directly because BlobImpl from Hibernate is not acceptable
+ //for oracle and Connection.createBlob is not working on postgres.
+ //This blob will be not empty because we saved there a bytes from String("a").
+ Blob blb = rs.getBlob(1);
+
+ StreamUtil.copy(bitsStream, blb.setBinaryStream(1), false);
+ bitsStream.close();
+ ps2 = conn.prepareStatement("UPDATE " + PackageBits.TABLE_NAME + " SET bits = ? where id = ?");
+ ps2.setBlob(1, blb);
+ ps2.setInt(2, packageBits.getId());
+ if (ps2.execute()) {
+ throw new Exception("Did not download the package bits to the DB for ");
+ }
+ ps2.close();
+ }
+ }
+ ps.close();
+ conn.close();
+
+ } else {
+ //CONTENT IS ALLREADY LOADED
+ }
+ } finally {
+ if (ps != null) {
+ try {
+ ps.close();
+ } catch (Exception e) {
+ log.warn("Failed to close prepared statement for package bits [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ }
+ }
+
+ if (ps2 != null) {
+ try {
+ ps2.close();
+ } catch (Exception e) {
+ log.warn("Failed to close prepared statement for package bits [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ }
+ }
+
+ if (conn != null) {
+ try {
+ conn.close();
+ } catch (Exception e) {
+ log.warn("Failed to close connection for package bits [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ }
+ }
+ }
+ } catch (Throwable t) {
+ // put the cause in here using ThrowableUtil because it'll dump SQL nextException messages too
+ throw new RuntimeException("Did not download the package bits for [" + pvcs + "]. Cause: "
+ + ThrowableUtil.getAllMessages(t), t);
+ } finally {
+ if (bitsStream != null) {
+ try {
+ bitsStream.close();
+ } catch (Exception e) {
+ log.warn("Failed to close stream to package bits located at [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ }
+ }
+ }
+
+ return packageBits;
+ }
+
@TransactionAttribute(TransactionAttributeType.NEVER)
public boolean internalSynchronizeContentSource(int contentSourceId) throws Exception {
ContentServerPluginContainer pc = ContentManagerHelper.getPluginContainer();
@@ -1817,8 +1994,6 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
packageVersion.getId());
}
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- @TransactionTimeout(90 * 60)
public boolean downloadPackageBits(int resourceId, PackageDetailsKey packageDetailsKey){
Query query = entityManager.createNamedQuery(PackageVersion.QUERY_FIND_ID_BY_PACKAGE_DETAILS_KEY_AND_RES_ID);
query.setParameter("packageName", packageDetailsKey.getName());
@@ -1887,8 +2062,9 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
// won't affect the time we are in in this method's tx (I hope that's how it works).
// This is because this method itself may take a long time to send the data to the output stream
// and we don't want out tx timing out due to the time it takes downloading.
+ InputStream stream = preloadPackageBits(pvcs);
PackageBits bits = null;
- bits = contentSourceManager.downloadPackageBits(subjectManager.getOverlord(), pvcs);
+ bits = preparePackageBits(subjectManager.getOverlord(),stream, pvcs);
}catch(Exception e){
return false;
}
commit 2be8ee3abce7d92aa5fc1f7f5801487c67175942
Merge: 29edb81... d5dca83...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri May 21 09:31:01 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit d5dca8319beb0f93ed1bf1679b6c05dc33dad01c
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Fri May 14 11:57:46 2010 +0200
BZ 555098 - new metrics for AS-4 ConnectionFactory.
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index 5902c06..b49112f 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -558,7 +558,37 @@
<c:simple-property name="descriptionTemplate" default="A JCA Connection Factory"/>
<c:simple-property name="name" type="string" description="The name of this Connection Factory"/>
</plugin-configuration>
+
+ <metric property="AvailableConnectionCount" measurementType="dynamic" displayType="summary"
+ displayName="Available Connection Count" description="Number of available connections."
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="ConnectionCount" measurementType="dynamic" displayType="summary"
+ displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
+ category="performance"/>
+
+ <metric property="ConnectionCreatedCount" measurementType="dynamic" displayType="detail"
+ displayName="Connection Created Count" defaultOn="true" defaultInterval="60000"
+ dataType="measurement" category="performance"/>
+
+ <metric property="ConnectionDestroyedCount" measurementType="dynamic" displayType="detail"
+ displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000"
+ dataType="measurement" category="performance"/>
+
+ <metric property="InUseConnectionCount" measurementType="dynamic" displayType="detail"
+ displayName="In Use Connection Count" description="Mumber of connections currently in use."
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+ <metric property="MaxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
+ displayName="Max Connections In Use Count" description="Maximum number of maximum connections that have been in use."
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="MaxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
+ <metric property="MinSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
+ defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+
<resource-configuration>
<c:group name="connection" displayName="Connection Information">
@@ -883,7 +913,7 @@
</c:group>
</resource-configuration>
-
+
</service>
<service name="JBossMQ"
commit c7b4c35dfbd7158b4ec4bd3c795cd311acf6a987
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue May 18 17:10:58 2010 +0200
BZ 576617 - [apache] ServerName is now readOnly.
diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
index 94ee5d3..8aa4489 100644
--- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
@@ -125,7 +125,7 @@
'>
<!ENTITY ServerName '
- <c:simple-property name="ServerName" required="false">
+ <c:simple-property name="ServerName" required="false" readOnly="true">
<c:description>
Sets the request scheme, hostname and port that the server uses to identify itself. This is used when creating redirection URLs.
If no ServerName is specified, then the server attempts to deduce the hostname by performing a reverse lookup on the IP address. If no port is specified in the ServerName, then the server will use the port from the incoming request. For optimal reliability and predictability, you should specify an explicit hostname and port using the ServerName directive.
commit 29edb819002efe3840645ff2badfd4aa35196459
Merge: 66f5dff... f5f1c42...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 20 18:08:42 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 66f5dffe94a0124c5d0288834858a3297ffc9ff0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 20 18:07:57 2010 +0200
BZ 594417 - catch an error in the Pluralizer if the TypeName is all in CAPS
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListChildResourcesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListChildResourcesUIBean.java
index ebc58b7..73d72f9 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListChildResourcesUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListChildResourcesUIBean.java
@@ -120,7 +120,7 @@ public class ListChildResourcesUIBean extends PagedDataTableUIBean {
FacesContextUtility.removeSessionScopedBean(CreateNewPackageChildResourceUIBean.class);
FacesContextUtility.removeSessionScopedBean(UploadNewChildPackageUIBean.class);
} catch (Throwable t) {
- // if any error happens whatsoever, continue processing as if this code didn't exist
+ // if any error happens whatsoever, continue processing as if this code didn't exist
}
return null;
}
@@ -297,9 +297,18 @@ public class ListChildResourcesUIBean extends PagedDataTableUIBean {
Pluralizer customPluralizer = new CustomEnglishPluralizer();
Set<String> dupResourceTypeNames = getDuplicateResourceTypeNames(resourceTypes);
for (ResourceType resourceType : resourceTypes) {
+ String resourceTypeName = resourceType.getName();
+ String pluralizedName = resourceTypeName;
+ try {
+ if (pluralize)
+ pluralizedName = customPluralizer.pluralize(resourceTypeName);
+ }
+ catch (StringIndexOutOfBoundsException oobe) { // Work around a bug in the pluralizer, BZ 594417
+ // Just ignore it and take the plain resource type name
+ }
String label = NBSP + " - "
- + ((pluralize) ? customPluralizer.pluralize(resourceType.getName()) : resourceType.getName());
- if (dupResourceTypeNames.contains(resourceType.getName())) {
+ + ((pluralize) ? pluralizedName : resourceTypeName);
+ if (dupResourceTypeNames.contains(resourceTypeName)) {
label += " (" + resourceType.getPlugin() + " plugin)";
}
SelectItem selectItem = new SelectItem(resourceType.getId(), label);
@@ -312,7 +321,7 @@ public class ListChildResourcesUIBean extends PagedDataTableUIBean {
private static Set<String> getDuplicateResourceTypeNames(List<ResourceType> resourceTypes) {
Set<String> resourceTypeNames = new HashSet();
Set<String> dupResourceTypeNames = new HashSet();
- for (ResourceType resourceType : resourceTypes) {
+ for (ResourceType resourceType : resourceTypes) {
String resourceTypeName = resourceType.getName();
if (resourceTypeNames.contains(resourceTypeName)) {
dupResourceTypeNames.add(resourceTypeName);
commit f5f1c423ba01093412815848b0e7f8d1b1e9f7db
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu May 20 11:25:04 2010 -0400
Removing oracle version numbers from database type dropdown to be consistent with other dbs in list
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
index 9335814..471c1d9 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
@@ -151,7 +151,7 @@ public class ServerProperties {
static {
DATABASE_TYPES = new ArrayList<SelectItem>();
DATABASE_TYPES.add(new SelectItem("PostgreSQL", "PostgreSQL"));
- DATABASE_TYPES.add(new SelectItem("Oracle10/11", "Oracle 10/11"));
+ DATABASE_TYPES.add(new SelectItem("Oracle", "Oracle"));
DATABASE_TYPES.add(new SelectItem("sqlserver", "MS SQL Server"));
DATABASE_TYPES.add(new SelectItem("H2", "H2 (embedded)"));
//DATABASE_TYPES.add(new SelectItem("MySQL", "MySQL"));
commit c74e03dfeac5dfdb6ea6e868ac645144e6cf0b64
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu May 20 11:05:48 2010 -0400
[BZ 581818] Changing oracle label to 10/11 since we don't have implementation differences for the versions
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
index 564fa00..9335814 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
@@ -151,8 +151,7 @@ public class ServerProperties {
static {
DATABASE_TYPES = new ArrayList<SelectItem>();
DATABASE_TYPES.add(new SelectItem("PostgreSQL", "PostgreSQL"));
- DATABASE_TYPES.add(new SelectItem("Oracle10g", "Oracle 10g"));
- DATABASE_TYPES.add(new SelectItem("Oracle11g", "Oracle 11g"));
+ DATABASE_TYPES.add(new SelectItem("Oracle10/11", "Oracle 10/11"));
DATABASE_TYPES.add(new SelectItem("sqlserver", "MS SQL Server"));
DATABASE_TYPES.add(new SelectItem("H2", "H2 (embedded)"));
//DATABASE_TYPES.add(new SelectItem("MySQL", "MySQL"));
commit 6acdd6946364329324d1e9c6468e4382455e54fb
Merge: 8df8d76... 70bf45d...
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu May 20 11:02:52 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 8df8d763d2f2a2f22a92659b75ab1d2c105eba45
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu May 20 11:00:22 2010 -0400
[BZ 581818] Adding option to select oracle 11g as database type
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
index dbd4940..564fa00 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java
@@ -152,6 +152,7 @@ public class ServerProperties {
DATABASE_TYPES = new ArrayList<SelectItem>();
DATABASE_TYPES.add(new SelectItem("PostgreSQL", "PostgreSQL"));
DATABASE_TYPES.add(new SelectItem("Oracle10g", "Oracle 10g"));
+ DATABASE_TYPES.add(new SelectItem("Oracle11g", "Oracle 11g"));
DATABASE_TYPES.add(new SelectItem("sqlserver", "MS SQL Server"));
DATABASE_TYPES.add(new SelectItem("H2", "H2 (embedded)"));
//DATABASE_TYPES.add(new SelectItem("MySQL", "MySQL"));
commit 70bf45ddde4498b40e67f54ebe410c71156944b0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 20 10:19:16 2010 -0400
provide the agenet with a new command line option: --purgeplugins
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index 73064b1..ce49fc4 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -2014,14 +2014,31 @@ public class AgentMain {
}
/**
+ * This will purge all plugins in the agent's plugin directory.
+ */
+ private void cleanPluginsDirectory() {
+ try {
+ File plugins_dir = m_configuration.getPluginContainerConfiguration().getPluginDirectory();
+ if (plugins_dir.exists()) {
+ LOG.info(AgentI18NResourceKeys.CLEANING_PLUGINS_DIRECTORY, plugins_dir.getAbsolutePath());
+ cleanFile(plugins_dir);
+ }
+ } catch (Exception e) {
+ LOG.warn(AgentI18NResourceKeys.CLEAN_PLUGINS_FAILURE, e);
+ }
+
+ return;
+ }
+
+ /**
* This will purge all files in the agent's data directory.
*/
private void cleanDataDirectory() {
try {
File data_dir = m_configuration.getDataDirectory();
if (data_dir.exists()) {
- LOG.info(AgentI18NResourceKeys.CLEANING_DATA_DIRECTORY, data_dir);
- cleanDataFile(data_dir);
+ LOG.info(AgentI18NResourceKeys.CLEANING_DATA_DIRECTORY, data_dir.getAbsolutePath());
+ cleanFile(data_dir);
}
// it is concievable the comm services data directory was configured in a different
@@ -2029,8 +2046,8 @@ public class AgentMain {
File comm_data_dir = m_configuration.getServiceContainerPreferences().getDataDirectory();
if (!comm_data_dir.getAbsolutePath().equals(data_dir.getAbsolutePath())) {
if (comm_data_dir.exists()) {
- LOG.info(AgentI18NResourceKeys.CLEANING_DATA_DIRECTORY, comm_data_dir);
- cleanDataFile(comm_data_dir);
+ LOG.info(AgentI18NResourceKeys.CLEANING_DATA_DIRECTORY, comm_data_dir.getAbsolutePath());
+ cleanFile(comm_data_dir);
}
}
} catch (Exception e) {
@@ -2046,18 +2063,18 @@ public class AgentMain {
*
* @param file the file/directory to delete
*/
- private void cleanDataFile(File file) {
+ private void cleanFile(File file) {
boolean deleted;
File[] doomed_files = file.listFiles();
if (doomed_files != null) {
for (File doomed_file : doomed_files) {
- cleanDataFile(doomed_file); // call this method recursively
+ cleanFile(doomed_file); // call this method recursively
}
}
deleted = file.delete();
- LOG.debug(AgentI18NResourceKeys.CLEANING_DATA_FILE, file, deleted);
+ LOG.debug(AgentI18NResourceKeys.CLEANING_FILE, file, deleted);
return;
}
@@ -2717,11 +2734,13 @@ public class AgentMain {
new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'),
new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'),
new LongOpt("nonative", LongOpt.NO_ARGUMENT, null, 't'),
+ new LongOpt("purgeplugins", LongOpt.NO_ARGUMENT, null, 'g'),
new LongOpt("purgedata", LongOpt.NO_ARGUMENT, null, 'u') };
String config_file_name = null;
boolean clean_config = false;
boolean purge_data = false;
+ boolean purge_plugins = false;
AgentInputReaderFactory.ConsoleType console_type = null;
Getopt getopt = new Getopt("agent", args, sopts, lopts);
@@ -2784,6 +2803,11 @@ public class AgentMain {
break;
}
+ case 'g': {
+ purge_plugins = true;
+ break;
+ }
+
case 'a': {
m_advancedSetup = true;
break;
@@ -2876,6 +2900,9 @@ public class AgentMain {
if (purge_data) {
cleanDataDirectory();
}
+ if (purge_plugins) {
+ cleanPluginsDirectory();
+ }
LOG.debug(AgentI18NResourceKeys.ARGS_PROCESSED, Arrays.asList(m_commandLineArgs));
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index 08d4311..364e060 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -257,12 +257,18 @@ public interface AgentI18NResourceKeys {
@I18NMessage("Agent has been asked to start up clean - cleaning out the data directory: {0}")
String CLEANING_DATA_DIRECTORY = "AgentMain.clean-data-dir";
- @I18NMessage("Deleting data file [{0}]. deleted successfully=[{1}]")
- String CLEANING_DATA_FILE = "AgentMain.clean-data-file";
+ @I18NMessage("Agent has been asked to purge all plugins - cleaning out the plugins directory: {0}")
+ String CLEANING_PLUGINS_DIRECTORY = "AgentMain.clean-plugins-dir";
+
+ @I18NMessage("Purging file [{0}]. deleted successfully=[{1}]")
+ String CLEANING_FILE = "AgentMain.clean-file";
@I18NMessage("A failure occurred while trying to clean the data directory. Cause: {0}")
String CLEAN_DATA_DIR_FAILURE = "AgentMain.clean-data-dir-failure";
+ @I18NMessage("A failure occurred while trying to purge the plugins. Cause: {0}")
+ String CLEAN_PLUGINS_FAILURE = "AgentMain.clean-plugins-failure";
+
@I18NMessage("Failed to delete a data file [{0}]")
String CLEAN_DATA_FILE_FAILURE = "AgentMain.clean-data-file-failure";
@@ -519,13 +525,13 @@ public interface AgentI18NResourceKeys {
@I18NMessage("Neither server auto-detection nor polling is enabled - the client will be allowed to start sending commands immediately, but when the server is offline, be prepared for alot of errors to be logged")
String NO_AUTO_DETECT = "AgentMain.no-auto-detect";
- @I18NMessage("Native system info is enabled, but the system info API is not accessible on this platform " +
- "(sigar.jar not found in classpath or SIGAR shared library not found in shared library path). " +
- "Enable DEBUG logging for more details.")
+ @I18NMessage("Native system info is enabled, but the system info API is not accessible on this platform "
+ + "(sigar.jar not found in classpath or SIGAR shared library not found in shared library path). "
+ + "Enable DEBUG logging for more details.")
String NATIVE_SYSINFO_UNAVAILABLE = "AgentMain.native-sysinfo-unavailable";
- @I18NMessage("Native system info is enabled, but the system info API is not accessible on this platform " +
- "(sigar.jar not found in classpath or SIGAR shared library not found in shared library path).")
+ @I18NMessage("Native system info is enabled, but the system info API is not accessible on this platform "
+ + "(sigar.jar not found in classpath or SIGAR shared library not found in shared library path).")
String NATIVE_SYSINFO_UNAVAILABLE_DEBUG = "AgentMain.native-sysinfo-unavailable-debug";
@I18NMessage("The agent encountered an error during startup and must abort")
@@ -586,6 +592,7 @@ public interface AgentI18NResourceKeys {
+ "\\ -d, --daemon Agent runs in daemon mode - will not read from stdin for commands\\n\\\n"
+ "\\ -D<name>[=<value>] Overrides an agent configuration preference and sets a system property\\n\\\n"
+ "\\ -e, --console=<type> Specifies the implementation to use when reading console input: jline, sigar, java\\n\\\n"
+ + "\\ -g, --purgeplugins Deletes all plugins, forcing the agent to re-download all of them\\n\\\n"
+ "\\ -h, --help Shows this help message (default)\\n\\\n"
+ "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n"
+ "\\ -l, --cleanconfig Clears out any existing configuration and data files so the agent starts with a totally clean slate\\n\\\n"
commit 0cd562bbad7d94b33a7f92aa3e083b50ceb0ba1c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 20 10:07:21 2010 +0200
Disable jdk6 needing plugins
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index e373421..bf15866 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -320,11 +320,13 @@
<version>${project.version}</version>
</artifactItem>
+<!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
<artifactItem>
<groupId>org.rhq</groupId>
<artifactId>alert-scriptlang</artifactId>
<version>${project.version}</version>
</artifactItem>
+-->
<artifactItem>
<groupId>org.rhq</groupId>
@@ -383,7 +385,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
-
+
<outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
</configuration>
</execution>
@@ -408,7 +410,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
-
+
<outputDirectory>${earDirectory}/rhq-serverplugins</outputDirectory>
</configuration>
</execution>
@@ -547,11 +549,13 @@
<version>${project.version}</version>
</artifactItem>
+<!-- TODO:jdk6 temporarily disabled because of jdk6 requirement
<artifactItem>
<groupId>org.rhq</groupId>
<artifactId>rhq-script2-plugin</artifactId>
<version>${project.version}</version>
</artifactItem>
+-->
<artifactItem>
<groupId>org.rhq</groupId>
@@ -606,6 +610,7 @@
<artifactId>rhq-sshd-plugin</artifactId>
<version>${project.version}</version>
</artifactItem>
+<!-- TODO:jdk6 - temporarily disabled because of jdk6 requirement
<artifactItem>
<groupId>org.rhq</groupId>
@@ -619,6 +624,7 @@
<version>${project.version}</version>
</artifactItem>
+-->
</artifactItems>
<outputDirectory>${earDirectory}/rhq-downloads/rhq-plugins</outputDirectory>
</configuration>
commit a4b4b451c9c31ad933f2230293929b309e4a049a
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 20 09:33:39 2010 +0200
Disable the scriptlang sender for now as it requires jdk6
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 06f91cf..1e17ce8 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -76,7 +76,7 @@
<module>alert-microblog</module>
<module>alert-operations</module>
<module>alert-roles</module>
- <module>alert-scriptlang</module>
+<!-- <module>alert-scriptlang</module> disabled foe the moment because of jdk6 requirements -->
<!-- Seeing strange issues with corrupt jar dependencies...
<module>alert-sms</module>
-->
commit e610db209d351fa8ee598bf2c6e8feabe86201a3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 20:22:50 2010 +0200
Use jdk5 api.
diff --git a/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java b/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java
index 45b03d6..a3081c4 100644
--- a/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java
+++ b/modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java
@@ -163,7 +163,7 @@ public class TokenReplacementTest {
String result = PrintTokens.createTokenDescription();
assert result != null;
- assert !result.isEmpty();
+ assert !result.equals("");
assert result.contains("<token ");
}
commit 22fb10f7d01e84829e43d02dbf719e5be94c9d64
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 18:35:14 2010 +0200
Add missing dependency for jdk15
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 91a5440..ad30bfb 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -20,14 +20,14 @@
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/base-…</developerConnection>
</scm>
- <properties>
- <jsf.version>1.2_14</jsf.version>
- <facelets.version>1.1.15.B1</facelets.version>
- <!-- NOTE: Seam 2.1.2 and 2.2.0 can't be used in webapps deployed to the RHQ Server
+ <properties>
+ <jsf.version>1.2_14</jsf.version>
+ <facelets.version>1.1.15.B1</facelets.version>
+ <!-- NOTE: Seam 2.1.2 and 2.2.0 can't be used in webapps deployed to the RHQ Server
due to https://jira.jboss.org/jira/browse/JBSEAM-4029. Seam 2.2.1 can be
used once it's released. -->
- <seam.version>2.1.0.SP1</seam.version>
- <jboss-el.version>1.0_02.CR5</jboss-el.version>
+ <seam.version>2.1.0.SP1</seam.version>
+ <jboss-el.version>1.0_02.CR5</jboss-el.version>
<richfaces.version>3.3.2.SR1</richfaces.version>
<rhq.version>3.0.0-SNAPSHOT</rhq.version>
</properties>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-remoting-client-api</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<artifactId>jsf-facelets</artifactId>
<version>${facelets.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
@@ -56,11 +56,11 @@
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
@@ -78,7 +78,7 @@
<exclusion>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
@@ -105,13 +105,13 @@
<artifactId>jsf-api</artifactId>
<version>${jsf.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-gui</artifactId>
<version>${rhq.version}</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
@@ -123,12 +123,12 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-remoting-client-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
@@ -158,7 +158,7 @@
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
@@ -173,18 +173,26 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-gui</artifactId>
</dependency>
-
+
+ <dependency>
+ <!-- TODO only load in for jdk5 builds -->
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+
</dependencies>
<repositories>
@@ -198,5 +206,5 @@
</snapshots>
</repository>
</repositories>
-
+
</project>
commit b78f470901ba0ccbbc0d1ed84791c19e95b49a76
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 17:00:37 2010 +0200
Disable the jdk6 plugins completely for the moment.
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 1813d1c..85d6105 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -153,6 +153,7 @@
</modules>
</profile>
+<!--
<profile>
<id>jdk6-only-plugins</id>
<activation>
@@ -167,11 +168,6 @@
<id>jdk6-linux-plugins</id>
<activation>
<jdk>[1.6,)</jdk>
-<!--
- <property>
- <name>java.home</name>
- </property>
--->
</activation>
<modules>
<module>virt</module>
@@ -180,6 +176,7 @@
</modules>
</profile>
+-->
<profile>
<id>misc-plugins</id>
commit 028a70678e4b53ae55afc07616e03bef0befa0de
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 16:28:44 2010 +0200
Fix a typo *sigh*
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 568fe04..3ca3e1d 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -69,32 +69,33 @@
</build>
<profiles>
- <profile>
- <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). -->
- <profile>
- <id>check-java-api</id>
+ <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). -->
+ <profile>
+ <id>check-java-api</id>
+
+ <activation>
+ <property>
+ <name>java5.home</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <activation>
- <property>
- <name>java5.home</name>
- </property>
- </activation>
+ </profile>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
- </compilerArguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
+ <profile>
<id>dev</id>
<properties>
commit ab32e795b9e76153d6292b11f0ab77e6dc69b240
Merge: 4cd12d1... 643b2cb...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 16:16:50 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 4cd12d13e7463b198f6ab95f2848148ac32571ea
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 19 16:16:09 2010 +0200
Check for jdk5 in the script2 module and disable its build then.
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 038ce5c..568fe04 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -70,6 +70,31 @@
<profiles>
<profile>
+
+ <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). -->
+ <profile>
+ <id>check-java-api</id>
+
+ <activation>
+ <property>
+ <name>java5.home</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArguments>
+ <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<id>dev</id>
<properties>
commit 643b2cbf99961da02f69337e2d489d0fdb933934
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed May 19 09:08:47 2010 -0400
BZ 587026: use Iterator.remove API to avoid concurrent modification exceptions during the loop over the keyset of the cache
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
index ab94c0a..9b6b93b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.server.perspective;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -228,16 +229,18 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
Subject subject;
synchronized (CACHE) {
- for (Integer sessionId : CACHE.keySet()) {
+ Iterator<Integer> iterator = CACHE.keySet().iterator(); // so we can use iterator.remove and avoid concurrent-mod-exception
+ while (iterator.hasNext()) {
+ Integer sessionId = iterator.next();
try {
subject = subjectManager.getSubjectBySessionId(sessionId);
if (null == subject) {
- log.debug("Removing perspective cache entry for session " + sessionId);
- CACHE.remove(sessionId);
+ log.debug("Removing perspective cache entry for session. " + sessionId);
+ iterator.remove();
}
} catch (Exception e) {
- log.debug("Removing perspective cache entry for session " + sessionId);
- CACHE.remove(sessionId);
+ log.debug("Removing perspective cache entry for session: " + sessionId);
+ iterator.remove();
}
}
}
commit 8d1c051fbb07765ea3e746754ae61aabe2257a12
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 19 08:08:45 2010 -0400
[BZ 591485] Removing calls to delete alert templates when they are enabled/disabled
Fixing some alert property name references in alertHistory.xhtml.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
index 2e8d49c..41cc2fa 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
@@ -205,8 +205,6 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
// then delete templates and group alert defs, which are both tolerant of missing child definitions
groupAlertDefinitionManager.disableGroupAlertDefinitions(subject, groupDefinitions
.toArray(new Integer[groupDefinitions.size()]));
- alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
- .size()]));
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disable selected alert definitions.");
} catch (Exception e) {
@@ -244,8 +242,6 @@ public class SubsystemAlertDefinitionUIBean extends SubsystemView {
// then delete templates and group alert defs, which are both tolerant of missing child definitions
groupAlertDefinitionManager.enableGroupAlertDefinitions(subject, groupDefinitions
.toArray(new Integer[groupDefinitions.size()]));
- alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
- .size()]));
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enable selected alert definitions.");
} catch (Exception e) {
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml
index 1f81df9..f2ca8fd 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml
@@ -168,7 +168,7 @@
<f:facet name="header">
<h:outputText styleClass="headerText" value="Ack by" />
</f:facet>
- <h:outputText value="#{item.original.alert.ackBy.name}" title="#{item.original.alert.ackBy.firstName} #{item.original.alert.ackBy.lastName}"/>
+ <h:outputText value="#{item.original.alert.acknowledgingSubject}" title="#{item.original.alert.acknowledgingSubject}"/>
</rich:column>
<rich:column>
@@ -177,7 +177,7 @@
<h:outputText styleClass="headerText" value="Ack date" />
</onc:sortableColumnHeader>
</f:facet>
- <h:outputText value="#{item.original.alert.ackTime}">
+ <h:outputText value="#{item.original.alert.acknowledgeTime}">
<f:converter converterId="RelativeDurationConverter" />
</h:outputText>
</rich:column>
commit 5e431bd864c35b6f1917b7edf2d8ba78b13b2faf
Merge: d6a1bdf... 1bf7956...
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 18 14:52:22 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit d6a1bdf05d4a688f11781ed270b1cf5109db27d2
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 18 14:48:42 2010 -0400
[BZ 593000] Adding logic to check for different client jars based on JBoss AS version
There are a couple additional jars specific to AS 6 that that discovery component looks for
in its impl of ClassLoaderFacet.getAdditionalClasspathUrls. Those jars are not found on an
EAP 5 server, which results in an exception being thrown and the plugin components are never
properly initialized.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
index 4174283..c5eb7a9 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
@@ -84,14 +84,8 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
private static final String JAVA_HOME_ENV_VAR = "JAVA_HOME";
private static final Map<JBossProductType, ComparableVersion> MINIMUM_PRODUCT_VERSIONS = new HashMap(3);
- static {
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1"));
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta"));
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EWP, new ComparableVersion("5.0.0.CR1"));
- MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta"));
- }
- private static final String[] CLIENT_JARS = new String[] {
+ private static final List<String> CLIENT_JARS = Arrays.asList(
// NOTE: The jbossall-client.jar aggregates a whole bunch of other jars from the client dir via its
// MANIFEST.MF Class-Path.
"client/jbossall-client.jar",
@@ -100,11 +94,21 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
"common/lib/jboss-security-aspects.jar",
"lib/jboss-managed.jar",
"lib/jboss-metatype.jar",
- "lib/jboss-dependency.jar",
- // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
- "lib/jboss-classpool.jar",
- "lib/jboss-classpool-scoped.jar"
- };
+ "lib/jboss-dependency.jar"
+ );
+
+ private static final List<String> AS6_CLIENT_JARS = new ArrayList<String>(CLIENT_JARS);
+
+ static {
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.AS, new ComparableVersion("5.2.0.Beta1"));
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EAP, new ComparableVersion("5.0.0.Beta"));
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.EWP, new ComparableVersion("5.0.0.CR1"));
+ MINIMUM_PRODUCT_VERSIONS.put(JBossProductType.SOA, new ComparableVersion("5.0.0.Beta"));
+
+ // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
+ AS6_CLIENT_JARS.add("lib/jboss-classpool.jar");
+ AS6_CLIENT_JARS.add("lib/jboss-classpool-scoped.jar");
+ }
private final Log log = LogFactory.getLog(this.getClass());
@@ -151,7 +155,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
List<URL> clientJars = new ArrayList<URL>();
- for (String jarFileName : CLIENT_JARS) {
+ for (String jarFileName : getClientJars(pluginConfig)) {
File clientJar = new File(homeDir, jarFileName);
if (!clientJar.exists()) {
throw new FileNotFoundException("Cannot find [" + clientJar + "] - unable to manage server.");
@@ -165,6 +169,17 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
return clientJars;
}
+ private List<String> getClientJars(Configuration pluginConfig) throws IOException {
+ PropertySimple jbossHomeDir = pluginConfig.getSimple("homeDir");
+ JBossInstallationInfo installationInfo = new JBossInstallationInfo(new File(jbossHomeDir.getStringValue()));
+
+ if (installationInfo.getMajorVersion().equals("6")) {
+ return AS6_CLIENT_JARS;
+ }
+
+ return CLIENT_JARS;
+ }
+
private Set<DiscoveredResourceDetails> discoverExternalJBossAsProcesses(ResourceDiscoveryContext discoveryContext) {
Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>();
List<ProcessScanResult> autoDiscoveryResults = discoveryContext.getAutoDiscoveredProcesses();
commit 1bf79560371b4ff1901d32d33cec79d98195df8e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 17:04:20 2010 +0200
More jdk15 exclusions
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 8164624..1813d1c 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -167,13 +167,16 @@
<id>jdk6-linux-plugins</id>
<activation>
<jdk>[1.6,)</jdk>
+<!--
<property>
<name>java.home</name>
</property>
+-->
</activation>
<modules>
<module>virt</module>
<module>kickstart</module>
+ <module>byteman</module>
</modules>
</profile>
@@ -187,7 +190,6 @@
</activation>
<modules>
- <module>byteman</module>
<module>iis</module>
<module>database</module>
<module>postgres</module>
commit efe5b2749e53e9fa350a3b51aaed67e7ebcd588e
Merge: a6285e2... 5415086...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:56:00 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit a6285e2215e932a22cdbf19c8850022207909ed2
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:42:32 2010 +0200
Another dependency for jdk1.5
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 395a90f..605267f 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -20,7 +20,7 @@
<properties>
<scm.module.path>modules/enterprise/remoting/</scm.module.path>
-
+
<i18nlog.version>1.0.9</i18nlog.version>
<log4j.version>1.2.14</log4j.version>
<persistence-api.version>1.0</persistence-api.version>
@@ -57,43 +57,43 @@
<exclusion>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>gnu-getopt</groupId>
<artifactId>getopt</artifactId>
@@ -101,15 +101,15 @@
<exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-cache</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-client-api</artifactId>
@@ -133,20 +133,20 @@
<exclusion>
<groupId>org.snmp4j</groupId>
<artifactId>snmp4j</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
<groupId>rss4j</groupId>
<artifactId>rss4j</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -164,7 +164,7 @@
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -176,7 +176,7 @@
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
</dependency>
-
+
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -186,7 +186,7 @@
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -198,9 +198,16 @@
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
</dependencies>
-
+
<profiles>
<profile>
<id>javadoc</id>
@@ -232,7 +239,7 @@
<breakiterator>true</breakiterator>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>../remote-api</link>
+ <link>../remote-api</link>
</links>
</configuration>
<goals>
@@ -247,6 +254,6 @@
</profile>
- </profiles>
+ </profiles>
</project>
commit bbe6e85668779997882df550248002fc3205be46
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:39:36 2010 +0200
Another dependency for jdk1.5
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 1672828..783942c 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -28,7 +28,7 @@
<jsf-facelets.version>1.1.15.B1</jsf-facelets.version>
<seam.version>2.1.0.SP1</seam.version>
- <!-- plugin versions -->
+ <!-- plugin versions -->
<jetty-jspc-maven-plugin.version>7.0.1.v20091125</jetty-jspc-maven-plugin.version>
<product.shortName>RHQ</product.shortName>
@@ -366,6 +366,13 @@
</dependency>
<dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.5.1</version>
@@ -394,7 +401,7 @@
</dependencies>
-
+
<build>
<finalName>rhq-portal</finalName>
<plugins>
@@ -475,7 +482,7 @@
</build>
-
+
<profiles>
<profile>
@@ -585,7 +592,7 @@
</profiles>
-
+
<repositories>
<repository>
commit 3d1ebb7c6c3fb2c654baf999b6f28713ec9403d1
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:37:53 2010 +0200
Another dependency for jdk1.5
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 3c87ff0..c45e91f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -1,6 +1,6 @@
<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>
<parent>
@@ -68,7 +68,7 @@
<!-- =============== 3rd Party Deps =============== -->
-
+
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
@@ -183,6 +183,13 @@
<!-- by JBossAS -->
</dependency>
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ <scope>provided</scope> <!-- by JBossAS -->
+ </dependency>
+
</dependencies>
commit 071d1ea3e2ea6c6b68a0e650d0ded7d260ed7fa2
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 16:37:02 2010 +0200
Actually use 1.6+
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 2ac8f30..8164624 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -156,7 +156,7 @@
<profile>
<id>jdk6-only-plugins</id>
<activation>
- <jdk>1.6</jdk>
+ <jdk>[1.6,)</jdk>
</activation>
<modules>
<module>script2</module>
@@ -166,7 +166,7 @@
<profile>
<id>jdk6-linux-plugins</id>
<activation>
- <jdk>1.6</jdk>
+ <jdk>[1.6,)</jdk>
<property>
<name>java.home</name>
</property>
commit 541508681cfd995aec3da7757fbbd46d4e94e175
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue May 18 10:12:44 2010 -0400
BZ 587026 - fix concurrent mod exception by synchronizing access to the static cache
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
index e2ab6e4..ab94c0a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
@@ -188,7 +188,10 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
private CacheEntry getCacheEntry(Subject subject) {
Integer sessionId = subject.getSessionId();
- CacheEntry cacheEntry = CACHE.get(sessionId);
+ CacheEntry cacheEntry;
+ synchronized (CACHE) {
+ cacheEntry = CACHE.get(sessionId);
+ }
long metadataLastModifiedTime = getPluginMetadataManager().getLastModifiedTime();
if (cacheEntry == null || cacheEntry.getMetadataLastModifiedTime() < metadataLastModifiedTime) {
// Take this opportunity to clean expired sessions from the cache.
@@ -207,7 +210,9 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
List<PageLink> filteredPageLinks = applyActivatorsToPageLinks(context, scopes, basePageLinks);
cacheEntry = new CacheEntry(metadataLastModifiedTime, filteredMenu, filteredTabs, filteredPageLinks);
- CACHE.put(sessionId, cacheEntry);
+ synchronized (CACHE) {
+ CACHE.put(sessionId, cacheEntry);
+ }
}
return cacheEntry;
}
@@ -222,16 +227,18 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal, Perspect
private void cleanCache() {
Subject subject;
- for (Integer sessionId : CACHE.keySet()) {
- try {
- subject = subjectManager.getSubjectBySessionId(sessionId);
- if (null == subject) {
+ synchronized (CACHE) {
+ for (Integer sessionId : CACHE.keySet()) {
+ try {
+ subject = subjectManager.getSubjectBySessionId(sessionId);
+ if (null == subject) {
+ log.debug("Removing perspective cache entry for session " + sessionId);
+ CACHE.remove(sessionId);
+ }
+ } catch (Exception e) {
log.debug("Removing perspective cache entry for session " + sessionId);
CACHE.remove(sessionId);
}
- } catch (Exception e) {
- log.debug("Removing perspective cache entry for session " + sessionId);
- CACHE.remove(sessionId);
}
}
}
commit 8431fffb14edd3a4aba89e6b26bf1718099f3a6f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 15:55:51 2010 +0200
Move plugins that depend on jdk6 into their own profiles.
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index b1b9275..2ac8f30 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -80,8 +80,8 @@
<!-- !!! -->
<!-- These profile groupings need to also be mirrored in server/ear/pom.xml -->
- <!-- !!! -->
-
+ <!-- !!! -->
+
<modules>
<!-- core plugins -->
<module>platform</module>
@@ -101,7 +101,7 @@
<modules>
<!-- NOTE: Order is important. -->
- <module>augeas</module>
+ <module>augeas</module>
<module>apache</module>
<module>tomcat</module>
<module>jboss-as</module>
@@ -140,7 +140,6 @@
<module>augeas</module>
<module>cron</module>
<module>script</module>
- <module>script2</module>
<module>grub</module>
<!-- not behaving <module>hardware</module> -->
<module>hosts</module>
@@ -151,12 +150,35 @@
<module>postfix</module>
<module>aliases</module>
<module>sshd</module>
- <module>virt</module>
- <module>kickstart</module>
</modules>
</profile>
<profile>
+ <id>jdk6-only-plugins</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <modules>
+ <module>script2</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>jdk6-linux-plugins</id>
+ <activation>
+ <jdk>1.6</jdk>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+ <modules>
+ <module>virt</module>
+ <module>kickstart</module>
+ </modules>
+
+ </profile>
+
+ <profile>
<id>misc-plugins</id>
<activation>
<property>
commit 4c4ae4916be15b749af7744724fadc932131903b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 15:37:55 2010 +0200
Revert Ian's commit 804620f9314e4d2b80a980208244b75920b018e7 that
got accidently overwritten by my last commit
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
index 613500f..e877c7f 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
* if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
package org.rhq.core.clientapi.descriptor;
import org.rhq.core.domain.plugin.Plugin;
@@ -30,8 +29,7 @@ import org.rhq.core.util.MessageDigestGenerator;
import java.net.URL;
import java.io.IOException;
-import java.io.File;
-import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import java.util.jar.Attributes;
@@ -94,38 +92,33 @@ public class PluginTransformer {
}
private String getMd5(URL pluginURL) throws IOException {
- File jarFile = toFile(pluginURL);
- return MessageDigestGenerator.getDigestString(jarFile);
+ return MessageDigestGenerator.getDigestString(pluginURL);
}
String getVersion(PluginDescriptor pluginDescriptor, URL pluginURL) throws IOException {
- if (pluginDescriptor.getVersion() != null) {
- return pluginDescriptor.getVersion();
+ String version = pluginDescriptor.getVersion();
+ if (version == null) {
+ version = getVersionFromPluginJarManifest(pluginURL);
}
- File pluginJarFile = toFile(pluginURL);
-
- String version = getVersionFromPluginJarManifest(pluginJarFile);
-
if (version == null) {
- throw new PluginTransformException("No version is defined for plugin jar [" + pluginJarFile
- + "]. A version must be defined either via the MANIFEST.MF [" + Attributes.Name.IMPLEMENTATION_VERSION
- + "] attribute or via the plugin descriptor 'version' attribute.");
+ throw new PluginTransformException("No version is defined for plugin jar [" + pluginURL
+ + "]. A version must be defined either via the MANIFEST.MF '" + Attributes.Name.IMPLEMENTATION_VERSION
+ + "' attribute or via the plugin descriptor 'version' attribute.");
}
return version;
}
- private String getVersionFromPluginJarManifest(File pluginJarFile) throws IOException {
- JarFile jarFile = new JarFile(pluginJarFile);
- Manifest manifest = jarFile.getManifest();
- Attributes attributes = manifest.getMainAttributes();
-
- return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
- }
-
- private File toFile(URL url) {
- return new File(url.getPath());
+ private String getVersionFromPluginJarManifest(URL pluginJarUrl) throws IOException {
+ JarInputStream jarInputStream = new JarInputStream(pluginJarUrl.openStream());
+ jarInputStream.close();
+ Manifest manifest = jarInputStream.getManifest();
+ if (manifest != null) {
+ Attributes attributes = manifest.getMainAttributes();
+ return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+ } else {
+ return null;
+ }
}
-
}
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
index 9a20424..0ffbe96 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -35,7 +36,7 @@ import java.security.NoSuchAlgorithmException;
* An object that generates a message digest or hash for algorithms such as MD5 or SHA. This class is basically a
* wrapper around {@link java.security.MessageDigest} and provides convenience methods making it easier to generate
* hashes.
- *
+ *
* There are static methods in here that use MD5 as the default algorithm. If you want to use another
* algorithm, instantiate an instance of this object and use its instance methods.
*/
@@ -260,6 +261,18 @@ public class MessageDigestGenerator {
}
}
+ public byte[] calcDigest(URL url) throws IOException {
+ InputStream is = null;
+ try {
+ is = url.openStream();
+ return calcDigest(new BufferedInputStream(is, 1024 * 32));
+ } finally {
+ if (is != null) {
+ is.close();
+ }
+ }
+ }
+
/**
* Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
*
@@ -279,6 +292,24 @@ public class MessageDigestGenerator {
}
/**
+ * Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
+ *
+ * @param url the URL whose contents are to be used to calculate the digest.
+ *
+ * @return the URL content's digest as a String
+ *
+ * @throws IOException if the URL could not be read or accessed
+ */
+ public static String getDigestString(URL url) throws IOException {
+ MessageDigestGenerator md5 = new MessageDigestGenerator(MD5);
+ return md5.calcDigestString(url);
+ }
+
+ public String calcDigestString(URL url) throws IOException {
+ return calculateDigestStringFromBytes(calcDigest(url));
+ }
+
+ /**
* Given a digest byte array, this will return its String representation.
*
* @param bytes the digest whose String representation is to be returned
commit 24beba04a8b570d3dfbfcdc0d2b0410c06755e13
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 18 14:57:22 2010 +0200
First batch of changes from the jdk15 branch to be merged back.
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
index ecaa80b..613500f 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2008 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
* if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+
package org.rhq.core.clientapi.descriptor;
import org.rhq.core.domain.plugin.Plugin;
@@ -29,7 +30,8 @@ import org.rhq.core.util.MessageDigestGenerator;
import java.net.URL;
import java.io.IOException;
-import java.util.jar.JarInputStream;
+import java.io.File;
+import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.jar.Attributes;
@@ -92,33 +94,38 @@ public class PluginTransformer {
}
private String getMd5(URL pluginURL) throws IOException {
- return MessageDigestGenerator.getDigestString(pluginURL);
+ File jarFile = toFile(pluginURL);
+ return MessageDigestGenerator.getDigestString(jarFile);
}
String getVersion(PluginDescriptor pluginDescriptor, URL pluginURL) throws IOException {
- String version = pluginDescriptor.getVersion();
- if (version == null) {
- version = getVersionFromPluginJarManifest(pluginURL);
+ if (pluginDescriptor.getVersion() != null) {
+ return pluginDescriptor.getVersion();
}
-
+
+ File pluginJarFile = toFile(pluginURL);
+
+ String version = getVersionFromPluginJarManifest(pluginJarFile);
+
if (version == null) {
- throw new PluginTransformException("No version is defined for plugin jar [" + pluginURL
- + "]. A version must be defined either via the MANIFEST.MF '" + Attributes.Name.IMPLEMENTATION_VERSION
- + "' attribute or via the plugin descriptor 'version' attribute.");
+ throw new PluginTransformException("No version is defined for plugin jar [" + pluginJarFile
+ + "]. A version must be defined either via the MANIFEST.MF [" + Attributes.Name.IMPLEMENTATION_VERSION
+ + "] attribute or via the plugin descriptor 'version' attribute.");
}
return version;
}
- private String getVersionFromPluginJarManifest(URL pluginJarUrl) throws IOException {
- JarInputStream jarInputStream = new JarInputStream(pluginJarUrl.openStream());
- jarInputStream.close();
- Manifest manifest = jarInputStream.getManifest();
- if (manifest != null) {
- Attributes attributes = manifest.getMainAttributes();
- return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
- } else {
- return null;
- }
+ private String getVersionFromPluginJarManifest(File pluginJarFile) throws IOException {
+ JarFile jarFile = new JarFile(pluginJarFile);
+ Manifest manifest = jarFile.getManifest();
+ Attributes attributes = manifest.getMainAttributes();
+
+ return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
}
+
+ private File toFile(URL url) {
+ return new File(url.getPath());
+ }
+
}
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
index 8ff2ab5..bcd210c 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
@@ -28,22 +28,22 @@ import org.rhq.core.db.DatabaseType;
* The introduction of custom alert senders brought with it the denormalization of the AlertNotification schema.
* Instead of the AlertNotification entity storing the notification-related data itself (through referential integrity)
* it has been subsumed inside of configuration objects, which are then associated back to the entity.
- *
+ *
* Each custom alert sender has full control over the structure within that configuration object. This task represents
- * the work necessary to translate the first-class notification data (previously stored in the rhq_alert_notification
- * table itself) into appropriate configuration objects to be used by the custom senders that will be shipped with the
+ * the work necessary to translate the first-class notification data (previously stored in the rhq_alert_notification
+ * table itself) into appropriate configuration objects to be used by the custom senders that will be shipped with the
* product by default.
- *
+ *
* In particular, this task handles the upgrade tasks for alert notifications setup against the following types of data:
- *
+ *
* <ul>
* <li>RHQ Subjects</li>
* <li>RHQ Roles</li>
* <li>Direct Email Addresses</li>
* <li>SNMP Trap Receivers</li>
* <li>Resource Operations</li>
- * </ul>
- *
+ * </ul>
+ *
* @author Joseph Marques
*/
public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask {
@@ -53,7 +53,6 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask {
private final long NOW = System.currentTimeMillis();
- @Override
public void execute(DatabaseType databaseType, Connection connection) throws SQLException {
this.databaseType = databaseType;
this.connection = connection;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java
index c7d56f1..67d1df4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java
@@ -285,7 +285,7 @@ public class Property implements Serializable, DeepCopyable<Property>, Comparabl
// It's not clear to me why this class implements Externalizable. It seems to write out every field
// using standard serialization. Also, it's sub-classes seem to write out every field. To be safe I'm leaving
// it as is and also applying the new strategy logic, in case there are (future) differences between agent and
- // remoteAPI serialization.
+ // remoteAPI serialization.
public void writeExternal(ObjectOutput out) throws IOException {
ExternalizableStrategy.Subsystem strategy = ExternalizableStrategy.getStrategy();
out.writeChar(strategy.id());
@@ -367,7 +367,6 @@ public class Property implements Serializable, DeepCopyable<Property>, Comparabl
return;
}
- @Override
public int compareTo(Property other) {
return getName().compareTo(other.getName());
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
index 7e47275..bef8a2c 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
@@ -76,7 +76,6 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
return endIndex;
}
- @Override
public int compareTo(SearchSuggestion other) {
int kindComparision = (this.kind.ordinal() - other.kind.ordinal());
if (kindComparision != 0) {
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
index e96d86a..9a20424 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2008 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -261,18 +260,6 @@ public class MessageDigestGenerator {
}
}
- public byte[] calcDigest(URL url) throws IOException {
- InputStream is = null;
- try {
- is = url.openStream();
- return calcDigest(new BufferedInputStream(is, 1024 * 32));
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
-
/**
* Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
*
@@ -292,24 +279,6 @@ public class MessageDigestGenerator {
}
/**
- * Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
- *
- * @param url the URL whose contents are to be used to calculate the digest.
- *
- * @return the URL content's digest as a String
- *
- * @throws IOException if the URL could not be read or accessed
- */
- public static String getDigestString(URL url) throws IOException {
- MessageDigestGenerator md5 = new MessageDigestGenerator(MD5);
- return md5.calcDigestString(url);
- }
-
- public String calcDigestString(URL url) throws IOException {
- return calculateDigestStringFromBytes(calcDigest(url));
- }
-
- /**
* Given a digest byte array, this will return its String representation.
*
* @param bytes the digest whose String representation is to be returned
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java
index 93230ec..d7de282 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java
@@ -39,7 +39,7 @@ import org.rhq.core.util.stream.StreamUtil;
/**
* A visitor object that will extract each zip entry it visits, realizing files that
* need to have their replacement variables replaced.
- *
+ *
* @author John Mazzitelli
*/
public class ExtractorZipFileVisitor implements ZipUtil.ZipEntryVisitor {
@@ -59,7 +59,7 @@ public class ExtractorZipFileVisitor implements ZipUtil.ZipEntryVisitor {
* If you just want this visitor to walk a zip file without realizing any files, pass in
* a null pattern or pass in a null template engine. This will, in effect,
* have this visitor extract all file entries as-is.
- *
+ *
* @param rootDir the top level directory where all zip file entries will be extracted to.
* In other words, all zip file entries' paths are relative to this directory.
* @param filesToRealizeRegex pattern of files that are to be realized prior to hashcodes being computed
@@ -97,7 +97,6 @@ public class ExtractorZipFileVisitor implements ZipUtil.ZipEntryVisitor {
return fileHashcodeMap;
}
- @Override
public boolean visit(ZipEntry entry, ZipInputStream stream) throws Exception {
String pathname = entry.getName();
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java
index 9e85f18..3fae9bd 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java
@@ -35,7 +35,7 @@ import org.rhq.core.util.stream.StreamUtil;
/**
* A visitor object that will perform some in-memory work for each zip entry it visits.
- *
+ *
* @author John Mazzitelli
*/
public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
@@ -53,7 +53,7 @@ public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
* a null pattern or pass in a null template engine. This will, in effect,
* have this visitor collect all zip file entry names and calculate their hashcodes based on
* all content within the zip file.
- *
+ *
* @param filesToRealizeRegex pattern of files that are to be realized prior to hashcodes being computed
* @param templateEngine the template engine that replaces replacement variables in files to be realized
*/
@@ -75,7 +75,6 @@ public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
return fileHashcodeMap;
}
- @Override
public boolean visit(ZipEntry entry, ZipInputStream stream) throws Exception {
if (entry.isDirectory()) {
@@ -86,7 +85,7 @@ public class InMemoryZipFileVisitor implements ZipUtil.ZipEntryVisitor {
String hashcode;
if (this.filesToRealizeRegex != null && this.filesToRealizeRegex.matcher(pathname).matches()) {
- // this entry needs to be realized, do it now, then calc the hashcode
+ // this entry needs to be realized, do it now, then calc the hashcode
// note: tempateEngine will never be null if we got here
int contentSize = (int) entry.getSize();
ByteArrayOutputStream baos = new ByteArrayOutputStream((contentSize > 0) ? contentSize : 32768);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java
index d273596..3fd8517 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java
@@ -141,7 +141,6 @@ public class OperationCreateWizard implements Wizard {
view.closeDialog();
}
- @Override
public void cancel() {
// TODO: revert back to original state
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
index a46900c..32e1d2c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
@@ -27,9 +27,6 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.exception.LoginException;
import org.rhq.enterprise.server.util.LookupUtil;
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-import javax.jws.WebParam;
/**
* @author Greg Hinkle
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
index 1acc73b..a704fb1 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
@@ -19,14 +19,17 @@
package org.rhq.enterprise.gui.admin.role;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.NavigableSet;
import java.util.Properties;
import java.util.Set;
+import java.util.SortedSet;
import java.util.TreeMap;
+import java.util.TreeSet;
import javax.ejb.EJBException;
import javax.servlet.http.HttpServletRequest;
@@ -66,14 +69,12 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class AddLdapGroupsFormPrepareAction extends TilesAction {
final String LDAP_GROUP_CACHE = "ldapGroupCache";
- RoleManagerLocal roleManager = LookupUtil.getRoleManager();
LdapGroupManagerLocal ldapManager = LookupUtil.getLdapGroupManager();
public ActionForward execute(ComponentContext context, ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response) throws Exception {
Log log = LogFactory.getLog(AddLdapGroupsFormPrepareAction.class.getName());
- Subject whoami = RequestUtils.getSubject(request);
AddLdapGroupsForm addForm = (AddLdapGroupsForm) form;
Integer roleId = addForm.getR();
@@ -95,7 +96,7 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
PageControl pca = WebUtility.getPageControl(request, "a");
PageControl pcp = WebUtility.getPageControl(request, "p");
- //BZ-580127 Refactor so that all lists are initialized regardless of ldap server
+ //BZ-580127 Refactor so that all lists are initialized regardless of ldap server
// availability or state of filter params
List<String> pendingGroupIds = new ArrayList<String>();
Set<Map<String, String>> allGroups = new HashSet<Map<String, String>>();
@@ -247,7 +248,7 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
/** Method duplicates pageControl/pagination mechanism for LdapGroup data. This data has not been moved into the
* database yet so the PageList and PageControl mechanism does not yet work properly.
* There are only two columns so the pagination code uses Maps and Sorted Lists for efficient sorting.
- *
+ *
* @param pagedGroupData Pagelist of Maps to be populated.
* @param fullGroupData Full list of Maps available for paging
* @param pc the pagination control from the web session reflecting user selections.
@@ -306,15 +307,21 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
//detect sort order
boolean descending = false;
- if (sortOrder.DESC == sortOrder) {
+ if (PageOrdering.DESC == sortOrder) {
descending = true;
}
//use sort column to determine which list to use
if (sortColumn.equalsIgnoreCase("lg.name")) {
int i = 0;
- NavigableSet<String> keyList = groupNames.navigableKeySet();
+ List<String> keyList;
+
if (descending) {
- keyList = groupNames.descendingKeySet();
+ keyList = new ArrayList<String>(groupNames.keySet());
+ Collections.reverse(keyList);
+ }
+ else {
+ keyList = new ArrayList<String>(groupNames.keySet());
+ Collections.sort(keyList);
}
for (String key : keyList) {
if ((i >= start) && (i < end)) {
@@ -324,9 +331,14 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
}
} else {
int i = 0;
- NavigableSet<String> keyList = groupDescriptions.navigableKeySet();
+ List<String> keyList;
if (descending) {
- keyList = groupDescriptions.descendingKeySet();
+ keyList = new ArrayList<String>(groupDescriptions.keySet());
+ Collections.reverse(keyList);
+ }
+ else {
+ keyList = new ArrayList<String>( groupDescriptions.keySet());
+ Collections.sort(keyList);
}
for (String key : keyList) {
if ((i >= start) && (i < end)) {
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
index 92d584c..3db7ce6 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
@@ -25,8 +25,6 @@ import java.util.List;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -46,10 +44,8 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.gui.util.FacesContextUtility;
-import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
-import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.content.ContentException;
import org.rhq.enterprise.server.content.ContentManagerLocal;
import org.rhq.enterprise.server.content.ContentUIManagerLocal;
@@ -63,9 +59,6 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public class CreateNewPackageUIBean {
- @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
- private EntityManager entityManager;
-
/**
* Option value for deploying the package to a repo the resource is already subscribed to.
*/
@@ -83,12 +76,6 @@ public class CreateNewPackageUIBean {
*/
private static final String REPO_OPTION_NEW = "new";
- /**
- * Option value for no repo. This is a standalone war that may not be related to any repo.
- *
- */
- private static final String REPO_OPTION_NONE = "none";
-
private String packageName;
private String version;
private int selectedArchitectureId;
@@ -162,7 +149,6 @@ public class CreateNewPackageUIBean {
String repoOption = request.getParameter("repoOption");
UploadItem fileItem = uploadUIBean.getFileItem();
- boolean usingARepo = true;
// Validate
if (packageName == null || packageName.trim().equals("")) {
@@ -191,21 +177,16 @@ public class CreateNewPackageUIBean {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "A package file must be uploaded");
return null;
}
- if (repoOption.equalsIgnoreCase(REPO_OPTION_NONE)) {
- usingARepo = false;
- }
// Determine which repo the package will go into
String repoId = null;
- if (usingARepo) {
- try {
- repoId = determineRepo(repoOption, subject, resource.getId());
- } catch (ContentException ce) {
- String errorMessages = ThrowableUtil.getAllMessages(ce);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
- + errorMessages);
- return "failure";
- }
+ try {
+ repoId = determineRepo(repoOption, subject, resource.getId());
+ } catch (ContentException ce) {
+ String errorMessages = ThrowableUtil.getAllMessages(ce);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
+ + errorMessages);
+ return "failure";
}
try {
@@ -235,20 +216,6 @@ public class CreateNewPackageUIBean {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
packageVersion = contentManager.createPackageVersion(packageName, packageTypeId, version,
architectureId, packageStream);
-
- //locate the file upload UI bean and populate installedPackage, then persist.
- InstalledPackage installed = new InstalledPackage();
- UploadItem fileItemForPackage = uploadUIBean.getFileItem();
- packageVersion.setFileSize(Long.valueOf(fileItemForPackage.getFileSize()));
- //Calculate SHA256
- String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
- .calcDigestString(packageStream);
- packageVersion.setSHA256(sha256);
- installed.setInstallationDate(fileItemForPackage.getFile().lastModified());
- installed.setUser(subject);
- installed.setPackageVersion(packageVersion);
- entityManager.persist(installed);
-
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package [" + packageName
@@ -259,18 +226,16 @@ public class CreateNewPackageUIBean {
int[] packageVersionList = new int[] { packageVersion.getId() };
// Add the package to the repo
- if (usingARepo) {
- try {
- int iRepoId = Integer.parseInt(repoId);
-
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
- } catch (Exception e) {
- String errorMessages = ThrowableUtil.getAllMessages(e);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
- + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
- return "failure";
- }
+ try {
+ int iRepoId = Integer.parseInt(repoId);
+
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
+ } catch (Exception e) {
+ String errorMessages = ThrowableUtil.getAllMessages(e);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
+ + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
+ return "failure";
}
// Put the package ID in the session so it can fit into the deploy existing package workflow
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
index 28edad0..55fdd56 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
@@ -333,6 +333,7 @@
<rich:column colspan="#{param.debug ? 8 : 7}"
width="100%">
+ <ui:remove>
<!-- The ability to associate/disassociate repos with content sources is not needed for JON. -->
<h:commandButton
action="#{RepoContentSourcesUIBean.associateWithContentProviders}"
@@ -343,6 +344,7 @@
value="DISASSOCIATE SELECTED"
target="selectedRepoContentProviders"
styleClass="on-pager-button buttonsmall" />
+ </ui:remove>
<ui:param name="paginationDataTableName"
value="repoContentProvidersDataTable" />
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
index 755a88f..8601b51 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
@@ -857,7 +857,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
//for oracle and Connection.createBlob is not working on postgres.
//This blob will be not empty because we saved there a bytes from String("a").
Blob blb = rs.getBlob(1);
-
+
StreamUtil.copy(bitsStream, blb.setBinaryStream(1), true);
ps2 = conn.prepareStatement("UPDATE " + PackageBits.TABLE_NAME + " SET bits = ? where id = ?");
ps2.setBlob(1, blb);
@@ -911,7 +911,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
+ "] on content source [" + contentSourceId + "]");
}
}
-
+
if (ps2 != null) {
try {
ps2.close();
@@ -1816,7 +1816,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return outputPackageVersionBitsRangeHelper(resourceId, packageDetailsKey, outputStream, startByte, endByte,
packageVersion.getId());
}
-
+
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
@TransactionTimeout(90 * 60)
public boolean downloadPackageBits(int resourceId, PackageDetailsKey packageDetailsKey){
@@ -1827,10 +1827,10 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
query.setParameter("version", packageDetailsKey.getVersion());
query.setParameter("resourceId", resourceId);
int packageVersionId = ((Integer) query.getSingleResult()).intValue();
-
+
Query queryA = entityManager.createNamedQuery(PackageBits.QUERY_PACKAGE_BITS_LOADED_STATUS_PACKAGE_VERSION_ID);
queryA.setParameter("id", packageVersionId);
-
+
LoadedPackageBitsComposite composite = (LoadedPackageBitsComposite) queryA.getSingleResult();
boolean packageBitsAreAvailable = composite.isPackageBitsAvailable();
@@ -1890,7 +1890,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
PackageBits bits = null;
bits = contentSourceManager.downloadPackageBits(subjectManager.getOverlord(), pvcs);
}catch(Exception e){
- return false;
+ return false;
}
}
return true;
@@ -1993,31 +1993,33 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
bitsStream = adapterMgr.loadPackageBits(contentSourceId, pvcs.getLocation());
} else {
if (composite.isPackageBitsInDatabase()) {
- // this is DownloadMode.DATABASE - put the bits in the database
+ // this is DownloadMode.DATABASE - put the bits in the database
conn = dataSource.getConnection();
ps = conn.prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ?");
-
+
ps.setInt(1, composite.getPackageBitsId());
results = ps.executeQuery();
results.next();
Blob blob = results.getBlob(1);
-
+
long bytesRetrieved=0;
if (endByte < 0) {
if (startByte == 0) {
bytesRetrieved = StreamUtil.copy(blob.getBinaryStream(), outputStream, false);
}
- } else {
- long length = (endByte - startByte) + 1;
- InputStream stream = blob.getBinaryStream(startByte, length);
- bytesRetrieved = StreamUtil.copy(stream, outputStream, false);
+ } else {
+ long length = (endByte - startByte) + 1;
+// InputStream stream = blob.getBinaryStream(startByte, length); // JDK 6 api
+ InputStream stream = blob.getBinaryStream();
+
+ bytesRetrieved = StreamUtil.copy(stream, outputStream, startByte , length);
}
log.debug("Retrieved and sent [" + bytesRetrieved + "] bytes for [" + packageDetailsKey + "]");
ps.close();
conn.close();
return bytesRetrieved;
-
+
} else {
// this is DownloadMode.FILESYSTEM - put the bits on the filesystem
File bitsFile = getPackageBitsLocalFileAndCreateParentDir(composite.getPackageVersionId(),
@@ -2252,4 +2254,4 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return numBytes;
}
}
-
+
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
index b857325..bb29a47 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
@@ -207,13 +207,13 @@ public class LdapLoginModule extends UsernamePasswordLoginModule {
//if successful then verified that user and pw are valid ldap credentials
ctx.reconnect(null);
- //if group auth enabled and user acct already exists then insert authorization check
+ //if group auth enabled and user acct already exists then insert authorization check
String groupFilter = (String) options.get("GroupFilter");
String groupMember = (String) options.get("GroupMemberFilter");
SubjectManagerLocal sManager = LookupUtil.getSubjectManager();
Subject ldapSubject = sManager.getSubjectByName(getUsername());
- if (ldapSubject != null && ((groupFilter != null) && !groupFilter.trim().isEmpty())
- && ((groupMember != null) && !groupMember.trim().isEmpty())) {
+ if (ldapSubject != null && ((groupFilter != null) && !groupFilter.trim().equals(""))
+ && ((groupMember != null) && !groupMember.trim().equals(""))) {
//check authorized groups to see if this user is authorized via ldap
//BUT still must always return true as authz is handled by RHQ if roles/groups correct
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
index 63e36db..409d64e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
@@ -61,7 +61,7 @@ import org.rhq.enterprise.server.system.SystemManagerLocal;
import org.rhq.enterprise.server.util.security.UntrustedSSLSocketFactory;
/**
- * This bean provides functionality to manipulate the ldap auth/authz funcitonality.
+ * This bean provides functionality to manipulate the ldap auth/authz funcitonality.
* That is, adding/modifying/deleting ldap group/users and their
* associated subjects and permissions are performed by this manager.
* @author paji
@@ -189,7 +189,6 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
}
}
- @Override
public PageList<LdapGroup> findLdapGroupsByRole(int roleId, PageControl pageControl) {
Role role = entityManager.find(Role.class, roleId);
if (role == null) {
@@ -280,7 +279,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
}
/**
- * @throws NamingException
+ * @throws NamingException
* @see org.jboss.security.auth.spi.UsernamePasswordLoginModule#validatePassword(java.lang.String,java.lang.String)
*/
protected Set<Map<String, String>> buildGroup(Properties options, String filter) {
@@ -347,7 +346,7 @@ public class LdapGroupManagerBean implements LdapGroupManagerLocal {
log.error(message, fException);
throw new LdapFilterException(message + " " + fException.getMessage());
}
- //TODO: check for ldap connection/unavailable/etc. exceptions.
+ //TODO: check for ldap connection/unavailable/etc. exceptions.
else {
log.error("LDAP communication error: " + e.getMessage(), e);
throw new LdapCommunicationException(e);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
index 231167e..6585739 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java
@@ -33,7 +33,7 @@ import org.rhq.enterprise.server.system.ServerVersion;
/**
* The remote interface to the SavedSearchManager.
- *
+ *
* @author Joseph Marques
*/
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
@@ -45,11 +45,11 @@ public interface SavedSearchManagerRemote {
* Persisted a new {@link SavedSearch} with the given primary key
*
* @param subject the logged in user requesting the {@link SavedSearch} deletion
- * @param savedSearchId the primary key of the {@link SavedSearch} to be deleted
+ * @param savedSearch the primary key of the {@link SavedSearch} to be deleted
*
* @throws PermissionException if the user is not authorized to create the {@link SavedSearch}. Only inventory
* managers can create global saved searches. Regular users can only create {@link SavedSearch}es against
- * their own accounts.
+ * their own accounts.
*/
@WebMethod
public void createSavedSearch( //
@@ -57,11 +57,11 @@ public interface SavedSearchManagerRemote {
@WebParam(name = "savedSearch") SavedSearch savedSearch);
/**
- * Saves all changes to the passed {@link SavedSearch} database, correlating it to the record already
+ * Saves all changes to the passed {@link SavedSearch} database, correlating it to the record already
* persisted with the same primary key
*
* @param subject the logged in user requesting the {@link SavedSearch} persisted modification
- * @param savedSearchId the {@link SavedSearch} which will have its modifications persisted
+ * @param savedSearch the {@link SavedSearch} which will have its modifications persisted
*.
* @throws PermissionException if the user is not authorized to modify the {@link SavedSearch}. Only inventory
* managers can update global saved searches. Regular users can only update {@link SavedSearch}es from
@@ -94,7 +94,7 @@ public interface SavedSearchManagerRemote {
* @param savedSearchId the primary key of the {@link SavedSearch} to be loaded
*
* @return the {@link SavedSearch} or <code>null</code> if it wasn't found
- * @throws PermissionException if the user is not authorized to view the {@link SavedSearch}. Regular users can
+ * @throws PermissionException if the user is not authorized to view the {@link SavedSearch}. Regular users can
* only view {@link SavedSearch}es from their own accounts.
*/
@WebMethod
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
index 05b39e1..8603946 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java
@@ -22,17 +22,14 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
this.maxResultCount = maxResultCount;
}
- @Override
public List<String> getSimpleContexts() {
return Collections.emptyList();
}
- @Override
public List<String> getParameterizedContexts() {
return Collections.emptyList();
}
- @Override
public List<String> getParameters(String context, String filter) {
if (getParameterizedContexts().contains(context) == false) {
throw new IllegalArgumentException("context[" + context
@@ -41,7 +38,6 @@ public abstract class AbstractSearchAssistant implements SearchAssistant {
return Collections.emptyList();
}
- @Override
public List<String> getValues(String context, String param, String filter) {
if (getSimpleContexts().contains(context) && param != null) {
throw new IllegalArgumentException("context[" + context + "] is simple, param[" + param
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
index 0e2b3df..4deaa01 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java
@@ -19,7 +19,6 @@ public class ResourceSearchAssistant extends AbstractSearchAssistant {
"name"));
}
- @Override
public SearchSubsystem getSearchSubsystem() {
return SearchSubsystem.RESOURCE;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
index dcd6c69..edb5059 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
@@ -473,7 +473,7 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
// we need to undeploy it first - on windows the files are locked and can't be renamed until undeployed
ObjectName name = ObjectNameFactory.create("jboss.system:service=MainDeployer");
MBeanServerConnection mbs = MBeanServerLocator.locateJBoss();
- MainDeployerMBean mbean = MBeanServerInvocationHandler.newProxyInstance(mbs, name,
+ MainDeployerMBean mbean = (MainDeployerMBean) MBeanServerInvocationHandler.newProxyInstance(mbs, name,
MainDeployerMBean.class, false);
URL url = deployedInstallWar.toURI().toURL();
String urlString = url.toString().replace("%20", " "); // bug in undeployer doesn't like %20 - it wants a real space
@@ -550,7 +550,7 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
* @return The License object
*/
public License getLicense() {
- // it's legal to return a null license, which then by-passes the check to
+ // it's legal to return a null license, which then by-passes the check to
// whether the expirationDate in the backing store has been fiddled with
License license = LicenseManager.instance().getLicense();
if (license == null) {
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
index 37ed7b0..a7f51a8 100644
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
+++ b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java
@@ -32,7 +32,7 @@ public class RhnHttpURLConnectionFactory {
{
e.printStackTrace();
log.error(e);
- throw new IOException(e);
+ throw new IOException(e.getMessage());
}
log.debug("SSLSocketFactory has been set with a custom version using certPath: " + sslCertPathIn);
}
diff --git a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
index c036ae6..5fa8a63 100644
--- a/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
+++ b/modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java
@@ -66,7 +66,7 @@ public class RhnSSLTransport extends XmlRpcSun15HttpTransport
{
e.printStackTrace();
log.error(e);
- throw new IOException(e);
+ throw new IOException(e.getMessage());
}
log.debug("SSLSocketFactory has been set with a custom version using cert path: " + sslCertPath);
}
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 5734463..9a781ba 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index a827e5a..f7cf265 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
diff --git a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
index 62652a1..0793831 100644
--- a/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
+++ b/modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java
@@ -256,7 +256,7 @@ public class LinuxPlatformComponent extends PlatformComponent implements Content
List<String> pkgs = new ArrayList<String>();
for (ResourcePackageDetails p : packages) {
String pkgInfo = p.getName();
- if ((p.getVersion() != null) && (!p.getVersion().isEmpty())) {
+ if ((p.getVersion() != null) && (!p.getVersion().equals(""))) {
pkgInfo = pkgInfo + "-" + p.getVersion();
}
log.info("Adding <" + pkgInfo + "> to list of packages to deploy, original package object was: " + p);
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 9f8f36b..3579496 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -28,7 +28,7 @@
<dependency>
<groupId>net.augeas</groupId>
<artifactId>augeas</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
commit 804620f9314e4d2b80a980208244b75920b018e7
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 17 11:21:14 2010 -0400
fix so plugin jar MD5 and plugin version are calculated by opening streams directly from the plugin jar URLs, rather than trying to convert the URLs to Files and opening the streams from the Files, which won't work when running inside the admin-console because the URLs will be jndi URLs, not file URLs (fix for https://jira.jboss.org/browse/EMBJOPR-274)
(cherry picked from commit 927194d360d4b47023fa9713d18365081457a1f6)
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
index 613500f..ecaa80b 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
* if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
package org.rhq.core.clientapi.descriptor;
import org.rhq.core.domain.plugin.Plugin;
@@ -30,8 +29,7 @@ import org.rhq.core.util.MessageDigestGenerator;
import java.net.URL;
import java.io.IOException;
-import java.io.File;
-import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import java.util.jar.Attributes;
@@ -94,38 +92,33 @@ public class PluginTransformer {
}
private String getMd5(URL pluginURL) throws IOException {
- File jarFile = toFile(pluginURL);
- return MessageDigestGenerator.getDigestString(jarFile);
+ return MessageDigestGenerator.getDigestString(pluginURL);
}
String getVersion(PluginDescriptor pluginDescriptor, URL pluginURL) throws IOException {
- if (pluginDescriptor.getVersion() != null) {
- return pluginDescriptor.getVersion();
+ String version = pluginDescriptor.getVersion();
+ if (version == null) {
+ version = getVersionFromPluginJarManifest(pluginURL);
}
-
- File pluginJarFile = toFile(pluginURL);
-
- String version = getVersionFromPluginJarManifest(pluginJarFile);
-
+
if (version == null) {
- throw new PluginTransformException("No version is defined for plugin jar [" + pluginJarFile
- + "]. A version must be defined either via the MANIFEST.MF [" + Attributes.Name.IMPLEMENTATION_VERSION
- + "] attribute or via the plugin descriptor 'version' attribute.");
+ throw new PluginTransformException("No version is defined for plugin jar [" + pluginURL
+ + "]. A version must be defined either via the MANIFEST.MF '" + Attributes.Name.IMPLEMENTATION_VERSION
+ + "' attribute or via the plugin descriptor 'version' attribute.");
}
return version;
}
- private String getVersionFromPluginJarManifest(File pluginJarFile) throws IOException {
- JarFile jarFile = new JarFile(pluginJarFile);
- Manifest manifest = jarFile.getManifest();
- Attributes attributes = manifest.getMainAttributes();
-
- return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
- }
-
- private File toFile(URL url) {
- return new File(url.getPath());
+ private String getVersionFromPluginJarManifest(URL pluginJarUrl) throws IOException {
+ JarInputStream jarInputStream = new JarInputStream(pluginJarUrl.openStream());
+ jarInputStream.close();
+ Manifest manifest = jarInputStream.getManifest();
+ if (manifest != null) {
+ Attributes attributes = manifest.getMainAttributes();
+ return attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+ } else {
+ return null;
+ }
}
-
}
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
index 9a20424..e96d86a 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -260,6 +261,18 @@ public class MessageDigestGenerator {
}
}
+ public byte[] calcDigest(URL url) throws IOException {
+ InputStream is = null;
+ try {
+ is = url.openStream();
+ return calcDigest(new BufferedInputStream(is, 1024 * 32));
+ } finally {
+ if (is != null) {
+ is.close();
+ }
+ }
+ }
+
/**
* Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
*
@@ -279,6 +292,24 @@ public class MessageDigestGenerator {
}
/**
+ * Calculates the digest for a given file. The file's contents will be used as the source data for the digest calculation.
+ *
+ * @param url the URL whose contents are to be used to calculate the digest.
+ *
+ * @return the URL content's digest as a String
+ *
+ * @throws IOException if the URL could not be read or accessed
+ */
+ public static String getDigestString(URL url) throws IOException {
+ MessageDigestGenerator md5 = new MessageDigestGenerator(MD5);
+ return md5.calcDigestString(url);
+ }
+
+ public String calcDigestString(URL url) throws IOException {
+ return calculateDigestStringFromBytes(calcDigest(url));
+ }
+
+ /**
* Given a digest byte array, this will return its String representation.
*
* @param bytes the digest whose String representation is to be returned
commit ce0d8ab908a52df1bc7826de06d848c8300a343f
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Mon May 17 20:59:31 2010 -0400
BZ-589231, BZ-586079: i)modified package flow to allow no repo to be defined ii)re-enabled associate/dissociate.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
index 3db7ce6..92d584c 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java
@@ -25,6 +25,8 @@ import java.util.List;
import javax.faces.application.FacesMessage;
import javax.faces.model.SelectItem;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -44,8 +46,10 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCreationDataType;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.gui.util.FacesContextUtility;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
+import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.content.ContentException;
import org.rhq.enterprise.server.content.ContentManagerLocal;
import org.rhq.enterprise.server.content.ContentUIManagerLocal;
@@ -59,6 +63,9 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public class CreateNewPackageUIBean {
+ @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
+ private EntityManager entityManager;
+
/**
* Option value for deploying the package to a repo the resource is already subscribed to.
*/
@@ -76,6 +83,12 @@ public class CreateNewPackageUIBean {
*/
private static final String REPO_OPTION_NEW = "new";
+ /**
+ * Option value for no repo. This is a standalone war that may not be related to any repo.
+ *
+ */
+ private static final String REPO_OPTION_NONE = "none";
+
private String packageName;
private String version;
private int selectedArchitectureId;
@@ -149,6 +162,7 @@ public class CreateNewPackageUIBean {
String repoOption = request.getParameter("repoOption");
UploadItem fileItem = uploadUIBean.getFileItem();
+ boolean usingARepo = true;
// Validate
if (packageName == null || packageName.trim().equals("")) {
@@ -177,16 +191,21 @@ public class CreateNewPackageUIBean {
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "A package file must be uploaded");
return null;
}
+ if (repoOption.equalsIgnoreCase(REPO_OPTION_NONE)) {
+ usingARepo = false;
+ }
// Determine which repo the package will go into
String repoId = null;
- try {
- repoId = determineRepo(repoOption, subject, resource.getId());
- } catch (ContentException ce) {
- String errorMessages = ThrowableUtil.getAllMessages(ce);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
- + errorMessages);
- return "failure";
+ if (usingARepo) {
+ try {
+ repoId = determineRepo(repoOption, subject, resource.getId());
+ } catch (ContentException ce) {
+ String errorMessages = ThrowableUtil.getAllMessages(ce);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to determine repository. Cause: "
+ + errorMessages);
+ return "failure";
+ }
}
try {
@@ -216,6 +235,20 @@ public class CreateNewPackageUIBean {
ContentManagerLocal contentManager = LookupUtil.getContentManager();
packageVersion = contentManager.createPackageVersion(packageName, packageTypeId, version,
architectureId, packageStream);
+
+ //locate the file upload UI bean and populate installedPackage, then persist.
+ InstalledPackage installed = new InstalledPackage();
+ UploadItem fileItemForPackage = uploadUIBean.getFileItem();
+ packageVersion.setFileSize(Long.valueOf(fileItemForPackage.getFileSize()));
+ //Calculate SHA256
+ String sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
+ .calcDigestString(packageStream);
+ packageVersion.setSHA256(sha256);
+ installed.setInstallationDate(fileItemForPackage.getFile().lastModified());
+ installed.setUser(subject);
+ installed.setPackageVersion(packageVersion);
+ entityManager.persist(installed);
+
} catch (Exception e) {
String errorMessages = ThrowableUtil.getAllMessages(e);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create package [" + packageName
@@ -226,16 +259,18 @@ public class CreateNewPackageUIBean {
int[] packageVersionList = new int[] { packageVersion.getId() };
// Add the package to the repo
- try {
- int iRepoId = Integer.parseInt(repoId);
-
- RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
- repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
- } catch (Exception e) {
- String errorMessages = ThrowableUtil.getAllMessages(e);
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
- + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
- return "failure";
+ if (usingARepo) {
+ try {
+ int iRepoId = Integer.parseInt(repoId);
+
+ RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal();
+ repoManager.addPackageVersionsToRepo(subject, iRepoId, packageVersionList);
+ } catch (Exception e) {
+ String errorMessages = ThrowableUtil.getAllMessages(e);
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to associate package ["
+ + packageName + "] with repository ID [" + repoId + "]. Cause: " + errorMessages);
+ return "failure";
+ }
}
// Put the package ID in the session so it can fit into the deploy existing package workflow
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
index 55fdd56..28edad0 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
@@ -333,7 +333,6 @@
<rich:column colspan="#{param.debug ? 8 : 7}"
width="100%">
- <ui:remove>
<!-- The ability to associate/disassociate repos with content sources is not needed for JON. -->
<h:commandButton
action="#{RepoContentSourcesUIBean.associateWithContentProviders}"
@@ -344,7 +343,6 @@
value="DISASSOCIATE SELECTED"
target="selectedRepoContentProviders"
styleClass="on-pager-button buttonsmall" />
- </ui:remove>
<ui:param name="paginationDataTableName"
value="repoContentProvidersDataTable" />
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml
index fd72919..53f8f4d 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml
@@ -100,6 +100,9 @@
<br/>
<input type="radio" name="repoOption" value="new">New Repository</input>
<rich:spacer width="5"/><h:inputText value="#{CreateNewPackageUIBean.newRepoName}"/>
+ <br/>
+ <input type="radio" name="repoOption" value="none" checked="true">None</input>
+ <br/>
</rich:panel>
commit 0f00f366738a360d38692401ac7a449e86f526d5
Author: Joseph Marques <joseph(a)redhat.com>
Date: Fri May 14 15:27:51 2010 -0400
fix Hibernate LazyInitException during creating of group-wise alert definition
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
index 992823c..d9ed9ee 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
@@ -124,7 +124,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create alertTemplate for " + type + " with data "
- + alertTemplate.toSimpleString());
+ + alertTemplate.toSimpleString(), t);
}
Subject overlord = subjectManager.getOverlord();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
index 0d5ed72..57701ce 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
@@ -32,6 +32,8 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.annotation.IgnoreDependency;
+
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.resource.InventoryStatus;
@@ -42,6 +44,7 @@ import org.rhq.core.domain.util.PageOrdering;
import org.rhq.core.server.PersistenceUtility;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
/**
* @author Joseph Marques
@@ -58,6 +61,9 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
@EJB
private AlertDefinitionManagerLocal alertDefinitionManager;
@EJB
+ @IgnoreDependency
+ private ResourceGroupManagerLocal resourceGroupManager;
+ @EJB
private SubjectManagerLocal subjectManager;
@SuppressWarnings("unchecked")
@@ -133,7 +139,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public int createGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
Integer resourceGroupId) throws InvalidAlertDefinitionException, AlertDefinitionCreationException {
- ResourceGroup group = entityManager.find(ResourceGroup.class, resourceGroupId);
+ ResourceGroup group = resourceGroupManager.getResourceGroupById(subject, resourceGroupId, null);
groupAlertDefinition.setResourceGroup(group);
int groupAlertDefinitionId = 0;
@@ -141,7 +147,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create groupAlertDefinitions for " + group
- + " with data " + groupAlertDefinition.toSimpleString());
+ + " with data " + groupAlertDefinition.toSimpleString(), t);
}
Subject overlord = subjectManager.getOverlord();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
index c5e46fe..44e6e45 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java
@@ -333,6 +333,8 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso
if (group.getModifiedBy() != null) {
group.getModifiedBy().getId();
}
+
+ group.getAlertDefinitions().size();
}
public int getResourceGroupCountByCategory(Subject subject, GroupCategory category) {
commit 2e00a770345e997ea3c835f2a131f8d7c32b9ed0
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 14 13:59:03 2010 -0400
[BZ 588467] Adding null check to prevent NPE
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/ResourceHubPortalAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/ResourceHubPortalAction.java
index 1c775c8..d11e8dc 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/ResourceHubPortalAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/ResourceHubPortalAction.java
@@ -87,7 +87,7 @@ public class ResourceHubPortalAction extends BaseAction {
ResourceHubForm hubForm = (ResourceHubForm) form;
String searchExpression = hubForm.getKeywords();
- if (searchExpression.equals("Resource Name")) {
+ if (searchExpression != null && searchExpression.equals("Resource Name")) {
searchExpression = null; // user didn't type a filter, just selected a category and clicked 'GO'
}
String category = hubForm.getResourceCategory();
commit b75773e304ac6a5fc6ac6f76fb7ab8301499d91b
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 14 07:30:17 2010 -0400
BZ 586943 - Adding work around for hibernate exception
Hibernate exceptions are occurring because the underlying collections in PropertyMap and
PropertyList which include a cascade style of delete_orphan, are getting derefenced. I
have not been able to determine when/where the PropertyMap.map and PropertyList.list
collections are getting derefenced. This commit works around the problem by creating
a deep copy of the Configuration object, stripped of any hibernate proxies.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 5b5bb96..32ac2c1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -1084,6 +1084,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public void executeResourceConfigurationUpdate(int updateId) {
ResourceConfigurationUpdate update = getResourceConfigurationUpdate(subjectManager.getOverlord(), updateId);
+ Configuration originalConfig = update.getConfiguration();
+ update.setConfiguration(originalConfig.deepCopy(false));
executeResourceConfigurationUpdate(update, true);
}
commit abc4d3ebd679a9d8e17e1759caa8f5991c314b7a
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu May 13 17:27:29 2010 -0400
BZ-590718: added missing dbupgrade sql.
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 4989546..fe8720c 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2732,6 +2732,31 @@
</schema-directSQL>
<schema-alterColumn table="RHQ_SUBJECT_ROLE_LDAP_MAP" column="SUBJECT_ID" nullable="FALSE" />
<schema-alterColumn table="RHQ_SUBJECT_ROLE_LDAP_MAP" column="ROLE_ID" nullable="FALSE" />
+
+ <!-- Fixing ldap group authz by adding remaining mapping elements left out(RHQ_ROLE_LDAP_GROUP) -->
+ <!-- RHQ_ROLE_LDAP_GROUP -->
+ <schema-createSequence name="RHQ_ROLE_LDAP_GROUP_ID_SEQ" initial="10001" />
+ <schema-directSQL>
+ <statement desc="Creating table RHQ_ROLE_LDAP_GROUP">
+ CREATE TABLE RHQ_ROLE_LDAP_GROUP ( ID INTEGER PRIMARY KEY, ROLE_ID INTEGER )
+ </statement>
+ </schema-directSQL>
+ <schema-alterColumn table="RHQ_ROLE_LDAP_GROUP" column="ID" nullable="FALSE" />
+ <schema-alterColumn table="RHQ_ROLE_LDAP_GROUP" column="ROLE_ID" nullable="FALSE" />
+ <schema-addColumn table="RHQ_ROLE_LDAP_GROUP" column="LDAP_GROUP_NAME" columnType="VARCHAR2" precision="128" />
+
+ <schema-directSQL>
+ <statement>
+ ALTER TABLE RHQ_ROLE_LDAP_GROUP
+ ADD CONSTRAINT RHQ_RLM_ROLE_ID_FK
+ FOREIGN KEY ( ROLE_ID )
+ REFERENCES RHQ_ROLE (ID)
+ </statement>
+ <statement>
+ CREATE UNIQUE INDEX RHQ_ROLE_LDAP_GROUP_IDX
+ ON RHQ_ROLE_LDAP_GROUP ( LDAP_GROUP_NAME, ROLE_ID )
+ </statement>
+ </schema-directSQL>
</schemaSpec>
<!-- Remove the old tagging system -->
commit 307b55dce66d639d7d405a309685b942fbe74815
Merge: 5680ddb... a822eef...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu May 13 16:40:26 2010 +0200
Merge branch 'master' into bugfixes
commit a822eeff883b951ed1064589cdf1cb96eca1a9ba
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Wed May 12 15:27:03 2010 +0200
[apache] new format of resource key in Directory,IfModule and IfModuleDirectory components.
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
index 0cf6e74..237e76d 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
@@ -54,23 +54,13 @@ import org.rhq.plugins.apache.util.AugeasNodeSearch;
public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtualHostServiceComponent>, ConfigurationFacet, DeleteResourceFacet {
private final Log log = LogFactory.getLog(this.getClass());
- public static final String DIRECTIVE_INDEX_PROP = "directiveIndex";
public static final String REGEXP_PROP = "regexp";
- public static final String PARAMS_PROPERTY_NAME = "ifmoduleParams";
public static final String DIRECTORY_DIRECTIVE = "<Directory";
- private List<String> position;
private ResourceContext<ApacheVirtualHostServiceComponent> resourceContext;
public void start(ResourceContext<ApacheVirtualHostServiceComponent> context) throws InvalidPluginConfigurationException, Exception {
- resourceContext = context;
- String key = context.getResourceKey();
- position = new ArrayList<String>();
- String param = key.substring(0,key.indexOf("|"));
- for (String pm :param.split(";")){
- position.add(pm);
- }
-
+ resourceContext = context;
}
@@ -146,16 +136,9 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
* @return
*/
public AugeasNode getNode(AugeasNode virtualHost) {
- List<AugeasNode> directories = AugeasNodeSearch.getNodeByParentParams(virtualHost, DIRECTORY_DIRECTIVE, position);
- int index = resourceContext.getPluginConfiguration().getSimple(DIRECTIVE_INDEX_PROP).getIntegerValue();
+ AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, resourceContext.getResourceKey());
- for(AugeasNode dir : directories) {
- if (dir.getSeq() == index) {
- return dir;
- }
- }
-
- return null;
+ return directory;
}
public AugeasNode getNode(){
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
index be707b9..81f5f93 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
@@ -77,12 +77,8 @@ public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryCompo
for (AugeasNode node : directories) {
Configuration pluginConfiguration = new Configuration();
-
- int idx = node.getSeq();
-
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, idx));
- String ifmoduleParams = AugeasNodeSearch.getParamsString(node, parentNode);
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.PARAMS_PROPERTY_NAME, ifmoduleParams));
+
+ String ifmoduleParams = AugeasNodeSearch.getNodeKey(node, parentNode);
List<AugeasNode> params = node.getChildByLabel("param");
String directoryParam;
@@ -98,7 +94,7 @@ public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryCompo
pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.REGEXP_PROP, isRegexp));
- String resourceKey = directoryParam + "|" + idx;
+ String resourceKey = ifmoduleParams;
String resourceName = AugeasNodeValueUtil.unescape(directoryParam);
discoveredResources.add(new DiscoveredResourceDetails(resourceType, resourceKey, resourceName, null, null,
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
index 537ccef..ddf0355 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
@@ -52,7 +52,6 @@ public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualH
private AugeasTree tree;
private ResourceContext<ApacheVirtualHostServiceComponent> context;
- private List<String> position;
private ApacheVirtualHostServiceComponent parentComponent;
private final Log log = LogFactory.getLog(this.getClass());
private static final String IFMODULE_DIRECTIVE_NAME="<IfModule";
@@ -62,12 +61,6 @@ public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualH
this.context = context;
parentComponent = context.getParentResourceComponent();
- String resourceKey = context.getResourceKey();
- position = new ArrayList<String>();
-
- for (String pm : resourceKey.split(";")){
- position.add(pm);
- }
}
public void stop(){
@@ -115,14 +108,8 @@ public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualH
}
private AugeasNode getNode(AugeasNode virtualHost) {
- List<AugeasNode> directories = AugeasNodeSearch.getNodeByParentParams(virtualHost, IFMODULE_DIRECTIVE_NAME, position);
- if (directories.isEmpty())
- {
- log.warn("Parent directive of ifmodule was probably deleted in configuration file.");
- throw new RuntimeException("Parent directive of ifmodule was probably deleted in configuration file.");
- }
-
- return directories.get(0);
+ AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, context.getResourceKey());
+ return directory;
}
private void prepareNode(AugeasNode node,AugeasNode parentNode,AugeasTree tree,Configuration configuration){
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
index 8f715ac..a20d180 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
@@ -22,7 +22,6 @@
*/
package org.rhq.plugins.apache;
-import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -35,7 +34,6 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
@@ -45,7 +43,6 @@ import org.rhq.plugins.apache.util.AugeasNodeSearch;
public class ApacheIfModuleDirectoryComponent implements ResourceComponent<ApacheDirectoryComponent>, ConfigurationFacet {
private ResourceContext<ApacheDirectoryComponent> context;
- private List<String> position;
private ApacheDirectoryComponent parentComponent;
private final Log log = LogFactory.getLog(this.getClass());
private static final String IFMODULE_DIRECTIVE_NAME="<IfModule";
@@ -55,12 +52,7 @@ public class ApacheIfModuleDirectoryComponent implements ResourceComponent<Apach
this.context = context;
parentComponent = context.getParentResourceComponent();
- String resourceKey = context.getResourceKey();
- position = new ArrayList<String>();
-
- for (String pm : resourceKey.split(";")){
- position.add(pm);
- }
+
}
public void stop() {
@@ -104,13 +96,8 @@ public class ApacheIfModuleDirectoryComponent implements ResourceComponent<Apach
}
private AugeasNode getNode(AugeasNode virtualHost) {
- List<AugeasNode> directories = AugeasNodeSearch.getNodeByParentParams(virtualHost, IFMODULE_DIRECTIVE_NAME, position);
- if (directories.isEmpty())
- {
- log.warn("Parent directive of ifmodule was probably deleted in configuration file.");
- throw new RuntimeException("Parent directive of ifmodule was probably deleted in configuration file.");
- }
- return directories.get(0);
+ AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, context.getResourceKey());
+ return directory;
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
index 3a04a34..6532b9d 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
@@ -57,15 +57,10 @@ public class ApacheIfModuleDirectoryDiscoveryComponent implements ResourceDiscov
for (AugeasNode node : ifModuleNodes) {
- String resourceKey = AugeasNodeSearch.getParamsString(node,parentNode);
- int separatorPosition = resourceKey.indexOf(";");
- String resourceName = null;
-
- if (separatorPosition!=-1)
- resourceName = resourceKey.substring(0,separatorPosition);
- else
- resourceName = resourceKey.toString();
+ String resourceKey = AugeasNodeSearch.getNodeKey(node,parentNode);
+ String [] paramArray = resourceKey.split("\\|");
+ String resourceName = paramArray[1];
discoveredResources.add(new DiscoveredResourceDetails(resourceType, resourceKey, resourceName, null, null,
null, null));
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
index ea53b87..bca1598 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
@@ -57,15 +57,9 @@ public class ApacheIfModuleDiscoveryComponent implements ResourceDiscoveryCompo
for (AugeasNode node : ifModuleNodes) {
- String resourceKey = AugeasNodeSearch.getParamsString(node,parentNode);
-
- int separatorPosition = resourceKey.indexOf(";");
- String resourceName = null;
-
- if (separatorPosition!=-1)
- resourceName = resourceKey.substring(0,separatorPosition);
- else
- resourceName = resourceKey.toString();
+ String resourceKey = AugeasNodeSearch.getNodeKey(node,parentNode);
+ String [] paramArray = resourceKey.split("\\|");
+ String resourceName = paramArray[1];
discoveredResources.add(new DiscoveredResourceDetails(resourceType, resourceKey, resourceName, null, null,
null, null));
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
index a91363d..afede02 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
@@ -60,6 +60,7 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.util.ResponseTimeConfiguration;
import org.rhq.core.pluginapi.util.ResponseTimeLogParser;
import org.rhq.plugins.apache.mapping.ApacheAugeasMapping;
+import org.rhq.plugins.apache.util.AugeasNodeSearch;
import org.rhq.plugins.apache.util.AugeasNodeValueUtil;
import org.rhq.plugins.apache.util.ConfigurationTimestamp;
import org.rhq.plugins.apache.util.HttpdAddressUtility;
@@ -253,23 +254,33 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
AugeasTree tree = getServerConfigurationTree();
AugeasNode myNode = getNode(tree);
List<AugeasNode> directories = myNode.getChildByLabel("<Directory");
- int seq = 0;
+ int seq = 1;
+ /*
+ * myNode will be parent node of the new Directory node.
+ * We need to create a new node for directory node which will contain child nodes.
+ * To create a node we can call method from AugeasTree which will create a node. In this method is
+ * parameter sequence, if we will leave this parameter empty and there will be more nodes with
+ * the same label, new node will be created but the method createNode will return node with index 0 resp 1.
+ * If that will happen we can not update the node anymore because we are updating wrong node.
+ * To avoid this situation we need to know what is the last sequence nr. of virtual host's child (directory) nodes.
+ * We can not just count child nodes with the same label because some of the child nodes
+ * could be stored in another file. So that in httpd configurationstructure they are child nodes of virtual host,
+ * but in augeas configuration structure they can be child nodes of node Include[];.
+ */
+
for (AugeasNode n : directories) {
- if (n.getSeq() > seq) {
- seq = n.getSeq();
+ String param = n.getFullPath();
+ int end = param.lastIndexOf(File.separatorChar);
+ if (end != -1)
+ if (myNode.getFullPath().equals(param.substring(0,end)))
+ seq++;
}
- }
- seq++;
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, seq));
+ //pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, seq));
//we don't support this yet... need to figure out how...
pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.REGEXP_PROP, false));
-
- //set the resource key and name
String dirNameToSet = AugeasNodeValueUtil.escape(directoryName);
- report.setResourceKey(dirNameToSet + "|" + seq);
- report.setResourceName(directoryName);
-
+
//now actually create the data in augeas
try {
ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
@@ -278,6 +289,12 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
mapping.updateAugeas(directoryNode, resourceConfiguration, resourceType.getResourceConfigurationDefinition());
tree.save();
+
+ tree = getServerConfigurationTree();
+ String key = AugeasNodeSearch.getNodeKey(myNode, directoryNode);
+ report.setResourceKey(key);
+ report.setResourceName(directoryName);
+
report.setStatus(CreateResourceStatus.SUCCESS);
resourceContext.getParentResourceComponent().finishChildResourceCreate(report);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java
index fb868c1..6c3a362 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java
@@ -8,6 +8,14 @@ import org.rhq.augeas.node.AugeasNode;
public class AugeasNodeSearch {
public static String [] NESTED_DIRECTIVES = {"<IfModule","<Directive","<VirtualHost","<Files"};
+ /**
+ * Searches for all nodes in parent nodes's subtree which matches specified criteria.
+ *
+ * @param parentNodeNames
+ * @param nodeName
+ * @param startNode
+ * @return
+ */
public static List<AugeasNode> searchNode(String [] parentNodeNames,String nodeName,AugeasNode startNode){
List<AugeasNode> nodes = new ArrayList<AugeasNode>();
search(nodes,parentNodeNames,startNode,nodeName);
@@ -67,23 +75,106 @@ public class AugeasNodeSearch {
pNode = pNode.getParentNode();
}
return res;
- }
+ }
+
+ /**
+ * Returns all params of node as one string.
+ * @param nd
+ * @return
+ */
+ public static String getNodeParamString(AugeasNode nd){
+ List<AugeasNode> childNodes = nd.getChildByLabel("param");
+ StringBuilder str = new StringBuilder();
+ for (AugeasNode paramNode : childNodes){
+ str.append(paramNode.getValue());
+ }
+ return str.toString();
+ }
- public static String getParamsString(AugeasNode node,AugeasNode parentNode){
- StringBuffer str = new StringBuffer();
+ /**
+ * If there is a more nodes which have the same node name and the same value of parameters than we need index
+ * for identification of Node.
+ *
+ * @param node
+ * @return
+ */
+ public static int getNodeIndex(AugeasNode node){
+ List<AugeasNode> nodes = node.getParentNode().getChildByLabel(node.getLabel());
+ String param = getNodeParamString(node);
+ int index = 1;
+
+ for(AugeasNode nd:nodes){
+ if (getNodeParamString(nd).equals(param)){
+ if (node.equals(nd))
+ return index;
+ else
+ index++;
+ }
+ }
+ return index;
+ }
+ /**
+ * Returns the unique identifier of node. By this string we can identify node from parentNode's child nodes.
+ * @param node
+ * @return
+ */
+ public static String getNodeKeyFromParent(AugeasNode node){
+
+ String param = getNodeParamString(node);
+ int index = getNodeIndex(node);
+ return (node.getLabel()+"|"+param+"|"+String.valueOf(index)+";");
+
+ }
+ /**
+ * Returns the unique identifier of node. By this string we can identify the node in parent node's subtree.
+ * @param node
+ * @param parentNode
+ * @return
+ */
+ public static String getNodeKey(AugeasNode node,AugeasNode parentNode){
AugeasNode pNode = node;
- while (!pNode.equals(parentNode))
- {
- List<AugeasNode> paramNodes = pNode.getChildByLabel("param");
- for (AugeasNode param : paramNodes){
- str.append(param.getValue()+";");
- }
+ StringBuilder str = new StringBuilder();
+ while (pNode!=null & !pNode.equals(parentNode))
+ {
+ str.append(getNodeKeyFromParent(pNode));
pNode = pNode.getParentNode();
- }
-
+ }
return str.toString();
- }
+ }
+ public static AugeasNode findNodeById(AugeasNode parentNode,String params){
+
+ AugeasNode tempNode=parentNode;
+ String [] ids = params.split(";");
+ for (int i=ids.length-1;i>=0;i--){
+ tempNode = getNodeFromParentById(tempNode,ids[i]);
+ }
+ return tempNode;
+ }
+ public static AugeasNode getNodeFromParentById(AugeasNode parentNode,String params){
+ String nodeName;
+ String parameters;
+ int index=1;
+
+ String [] paramsArray = params.split("\\|");
+ if (paramsArray.length != 3)
+ throw new RuntimeException("Node with id "+params +" was not found.");
+
+ nodeName = paramsArray[0];
+ parameters = paramsArray[1];
+
+ index = Integer.valueOf(paramsArray[2]);
+
+ for (AugeasNode nd : parentNode.getChildByLabel(nodeName)){
+ String ndParam = getNodeKeyFromParent(nd);
+ if (ndParam.equals(params+";")){
+ return nd;
+ }
+ }
+
+ throw new RuntimeException("Searched node with id " + params+ " was not found.");
+ }
}
+
commit d2fe37f25f80d48b0c86cfa0c12dd0206575e08c
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue May 11 20:35:42 2010 +0200
BZ 576230 - [apache] Saving Apache configuration from RHQ UI destroys all comments
I have changed the lens.
diff --git a/modules/plugins/apache/src/main/resources/httpd.aug b/modules/plugins/apache/src/main/resources/httpd.aug
index 668313b..0fddced 100644
--- a/modules/plugins/apache/src/main/resources/httpd.aug
+++ b/modules/plugins/apache/src/main/resources/httpd.aug
@@ -51,7 +51,7 @@ let sections (body:lens) = sec "Directory" body
(* FIXME: *)
(* - Nesting of sections *)
-let rec lns = ((directive | comment)* | sections lns)*
+let rec lns = (directive | comment | sections lns)*
let filter =
incl "/etc/httpd/conf/httpd.conf"
commit 5680ddb9fa3941fc2f1e99a48ae852258c7bf094
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Apr 23 17:56:57 2010 +0200
BZ 585292 - Fixing inconsistent node collapsing across redirects by actually moving the node state tracking to the advisor itself.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java
index 46af2db..f6c442b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java
@@ -159,4 +159,48 @@ public class AutoGroupCompositeFlyweight implements Serializable {
return "AutoGroupCompositeFlyweight[" + ((this.resourceType != null) ? "Resource: " : "Subcategory: ")
+ "name=" + this.name + ", members=" + this.memberCount + ", availability=" + this.availability + "]";
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+
+ if (!(o instanceof AutoGroupCompositeFlyweight)) {
+ return false;
+ }
+
+ AutoGroupCompositeFlyweight other = (AutoGroupCompositeFlyweight) o;
+
+ if (!parentResource.equals(other.parentResource)) {
+ return false;
+ }
+
+ if (resourceType != null) {
+ if (!resourceType.equals(other.resourceType)) {
+ return false;
+ }
+ }
+
+ if (subcategory != null) {
+ if (!subcategory.equals(other.subcategory)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = parentResource.hashCode();
+
+ if (resourceType != null) {
+ hash *= resourceType.hashCode();
+ }
+
+ if (subcategory != null) {
+ hash *= subcategory.hashCode();
+ }
+
+ return hash;
+ }
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java
index c6bbcb7..3a1e482 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java
@@ -137,4 +137,21 @@ public class ResourceGroupTreeNode implements Comparable<ResourceGroupTreeNode>
public void addChildren(Collection<ResourceGroupTreeNode> resourceGroupTreeNodes) {
this.children.addAll(resourceGroupTreeNodes);
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ ResourceGroupTreeNode that = (ResourceGroupTreeNode) o;
+
+ return level.equals(that.level);
+ }
+
+ @Override
+ public int hashCode() {
+ return level.hashCode();
+ }
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeStateAdvisor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeStateAdvisor.java
index 7c22be6..a803b9c 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeStateAdvisor.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeStateAdvisor.java
@@ -19,6 +19,9 @@
package org.rhq.enterprise.gui.navigation.group;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
@@ -35,6 +38,7 @@ import org.rhq.core.domain.resource.flyweight.AutoGroupCompositeFlyweight;
import org.rhq.core.domain.resource.group.composite.AutoGroupComposite;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.gui.util.FacesContextUtility;
+import org.rhq.enterprise.gui.navigation.resource.ResourceTreeNode;
import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
import org.rhq.enterprise.server.resource.cluster.ClusterKey;
import org.rhq.enterprise.server.resource.cluster.ClusterManagerLocal;
@@ -46,30 +50,31 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public class ResourceGroupTreeStateAdvisor implements TreeStateAdvisor {
- private Integer selectedId;
- private ClusterKey selectedClusterKey;
- private TreeState treeState = new TreeState();
-
- private ResourceGroup currentGroup;
-
- public TreeState getTreeState() {
- return treeState;
+ private static class CurrentSelection {
+ public ResourceGroup resourceGroup;
+ public ClusterKey clusterKey;
}
-
- private ResourceGroup getCurrentGroup() {
- if (currentGroup == null || currentGroup.getId() != getSelectedGroupId()) {
- this.selectedId = getSelectedGroupId();
+
+ private CurrentSelection currentSelection;
+
+ private Set<ResourceGroupTreeNode> openNodes = new HashSet<ResourceGroupTreeNode>();
+
+ private CurrentSelection getCurrentSelection() {
+ int selectedGroupId = getSelectedGroupId();
+ if (currentSelection == null || currentSelection.resourceGroup.getId() != selectedGroupId) {
ResourceGroupManagerLocal groupManager = LookupUtil.getResourceGroupManager();
- currentGroup = groupManager.getResourceGroupById(EnterpriseFacesContextUtility.getSubject(),
- this.selectedId, null);
- if (!currentGroup.isVisible()) {
- this.selectedClusterKey = ClusterKey.valueOf(currentGroup.getClusterKey());
+ currentSelection = new CurrentSelection();
+ currentSelection.resourceGroup = groupManager.getResourceGroupById(EnterpriseFacesContextUtility.getSubject(),
+ selectedGroupId, null);
+ if (!currentSelection.resourceGroup.isVisible()) {
+ currentSelection.clusterKey = ClusterKey.valueOf(currentSelection.resourceGroup.getClusterKey());
}
}
- return currentGroup;
+
+ return currentSelection;
}
- private int getSelectedGroupId() {
+ private static int getSelectedGroupId() {
String groupId = FacesContextUtility.getOptionalRequestParameter("groupId");
return Integer.parseInt(groupId);
}
@@ -87,18 +92,35 @@ public class ResourceGroupTreeStateAdvisor implements TreeStateAdvisor {
ResourceGroupTreeNode node = (ResourceGroupTreeNode) tree.getRowData(key);
ResourceGroupTreeNode selectedNode = (ResourceGroupTreeNode) tree.getRowData(state.getSelectedNode());
- selectedNode = selectedNode.getParent();
- while (selectedNode != null) {
- if (node.equals(selectedNode)) {
+ ResourceGroupTreeNode traverseCheckNode = selectedNode.getParent();
+ while (traverseCheckNode != null) {
+ if (node.equals(traverseCheckNode)) {
closingParent = true;
break;
}
- selectedNode = selectedNode.getParent();
+ traverseCheckNode = traverseCheckNode.getParent();
}
if (closingParent) {
- state.setSelected(key);
- redirectTo(node); // node state irrelevant if redirect was successful
+ if (redirectTo(node)) {
+ state.setSelected(key);
+ openNodes.remove(node);
+
+ //this is nasty hack. We need some kind of flag that would persist only for the remainder
+ //of this request to advertise that no more open/closed states should be made in this request.
+ //The tree is request scoped, so setting this flag will not persist to the next request.
+ //In the case of the tree, setting this to true in this listener has no side-effects.
+ tree.setBypassUpdates(true);
+ } else if (!redirectTo(selectedNode)) {
+ FacesContext.getCurrentInstance().addMessage("leftNavTreeForm:leftNavTree",
+ new FacesMessage(FacesMessage.SEVERITY_WARN, "Failed to re-expand node that shouldn't be collapsed.", null));
+ }
+ } else {
+ if (openNodes.contains(node)) {
+ openNodes.remove(node);
+ } else {
+ openNodes.add(node);
+ }
}
}
}
@@ -112,46 +134,56 @@ public class ResourceGroupTreeStateAdvisor implements TreeStateAdvisor {
return true;
}
- TreeState state = (TreeState) tree.getComponentState();
- TreeRowKey<?> selectedKey = state.getSelectedNode();
- if (selectedKey == null) {
- getCurrentGroup();
-
- if (preopen((ResourceGroupTreeNode) tree.getRowData(key), this.selectedClusterKey)) {
- return true;
- }
+ CurrentSelection currentSelection = getCurrentSelection();
+
+ //only update the state of open nodes in the preopen check
+ //if we're not finishing the request in which a parent
+ //of currently selected node was requested to close.
+ //If we did update the open node states in the "remainder"
+ //of such request the redirect that results from it would
+ //get wrong information and the parent wouldn't appear closed
+ //(because it'd had been re-opened in the below preopen call).
+ //@see changeExpandListener for more nasty details.
+ boolean setOpenStates = !tree.isBypassUpdates();
+
+ if (preopen(node, currentSelection, setOpenStates)) {
+ return true;
}
- return state.isExpanded(key);
+ return openNodes.contains(node);
}
return null;
}
- private boolean preopen(ResourceGroupTreeNode resourceTreeNode, ClusterKey selectedClusterKey) {
- ResourceGroup currentGroup = getCurrentGroup();
- if (resourceTreeNode.getData() instanceof ClusterKey) {
- if (((ClusterKey) resourceTreeNode.getData()).equals(selectedClusterKey)) {
- return true;
- }
- } else if (resourceTreeNode.getData() instanceof AutoGroupCompositeFlyweight) {
- ClusterKey key = resourceTreeNode.getClusterKey();
- AutoGroupCompositeFlyweight ag = (AutoGroupCompositeFlyweight) resourceTreeNode.getData();
- if (key.equals(selectedClusterKey)) {
- return true;
+ private boolean preopen(ResourceGroupTreeNode resourceTreeNode, CurrentSelection currentSelection, boolean setOpenState) {
+ ResourceGroup currentGroup = currentSelection.resourceGroup;
+ ClusterKey selectedClusterKey = currentSelection.clusterKey;
+
+ boolean ret = false;
+ for (ResourceGroupTreeNode child : resourceTreeNode.getChildren()) {
+ if (child.getData() instanceof ClusterKey) {
+ if (((ClusterKey) child.getData()).equals(selectedClusterKey)) {
+ ret = true;
+ break;
+ }
+ } else if (child.getData() instanceof ResourceGroup) {
+ if (currentGroup.getId() == ((ResourceGroup) child.getData()).getId()) {
+ ret = true;
+ break;
+ }
}
- } else if (resourceTreeNode.getData() instanceof ResourceGroup) {
- if (currentGroup.getId() == ((ResourceGroup) resourceTreeNode.getData()).getId()) {
- return true;
+
+ if (preopen(child, currentSelection, setOpenState)) {
+ ret = true;
+ break;
}
}
- for (ResourceGroupTreeNode child : resourceTreeNode.getChildren()) {
- if (preopen(child, selectedClusterKey)) {
- return true;
- }
+ if (setOpenState && ret) {
+ openNodes.add(resourceTreeNode);
}
-
- return false;
+
+ return ret;
}
public void nodeSelectListener(org.richfaces.event.NodeSelectedEvent e) {
@@ -168,15 +200,15 @@ public class ResourceGroupTreeStateAdvisor implements TreeStateAdvisor {
public Boolean adviseNodeSelected(UITree tree) {
- ResourceGroup currentGroup = getCurrentGroup();
+ CurrentSelection currentSelection = getCurrentSelection();
ResourceGroupTreeNode node = (ResourceGroupTreeNode) tree.getRowData(tree.getRowKey());
if (node.getData() instanceof ResourceGroup) {
- return (this.selectedId == ((ResourceGroup) node.getData()).getId());
+ return (currentSelection.resourceGroup.getId() == ((ResourceGroup) node.getData()).getId());
} else if (node.getData() instanceof ClusterKey) {
ClusterKey key = (ClusterKey) node.getData();
- if (currentGroup.getClusterKey() != null && currentGroup.getClusterKey().equals(key.getKey())) {
+ if (currentSelection.clusterKey != null && currentSelection.clusterKey.equals(key)) {
return true;
}
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeNode.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeNode.java
index 84579b1..212d839 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeNode.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeNode.java
@@ -113,10 +113,7 @@ public class ResourceTreeNode implements Comparable<ResourceTreeNode> {
ResourceTreeNode that = (ResourceTreeNode) o;
- if (!level.equals(that.level))
- return false;
-
- return true;
+ return level.equals(that.level);
}
@Override
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java
index efdc0cf..e9e705a 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java
@@ -19,6 +19,8 @@
package org.rhq.enterprise.gui.navigation.resource;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
@@ -30,15 +32,11 @@ import org.richfaces.component.state.TreeState;
import org.richfaces.component.state.TreeStateAdvisor;
import org.richfaces.model.TreeRowKey;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.composite.ResourceFacets;
import org.rhq.core.domain.resource.flyweight.AutoGroupCompositeFlyweight;
import org.rhq.core.domain.resource.flyweight.ResourceFlyweight;
import org.rhq.core.gui.util.FacesContextUtility;
import org.rhq.enterprise.gui.common.tag.FunctionTagLibrary;
-import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility;
-import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -46,22 +44,14 @@ import org.rhq.enterprise.server.util.LookupUtil;
* Manages the tree selection and node openess for the left nav resource tree
*
* @author Greg Hinkle
+ * @author Lukas Krejci
*/
public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
- UITree tree;
- TreeState treeState = new TreeState();
- private int selecteAGTypeId;
-
- private boolean hasMessages = false;
-
private ResourceTypeManagerLocal resourceTypeManager = LookupUtil.getResourceTypeManager();
- private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
-
- public TreeState getTreeState() {
- return treeState;
- }
+ Set<ResourceTreeNode> openNodes = new HashSet<ResourceTreeNode>();
+
public void changeExpandListener(org.richfaces.event.NodeExpandedEvent e) {
HtmlTree tree = (HtmlTree) e.getComponent();
TreeState state = (TreeState) tree.getComponentState();
@@ -87,12 +77,24 @@ public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
if (closingParent) {
if (redirectTo(node)) {
state.setSelected(key);
+ openNodes.remove(node);
+
+ //this is nasty hack. We need some kind of flag that would persist only for the remainder
+ //of this request to advertise that no more open/closed states should be made in this request.
+ //The tree is request scoped, so setting this flag will not persist to the next request.
+ //In the case of the tree, setting this to true in this listener has no side-effects.
+ tree.setBypassUpdates(true);
} else if (!redirectTo(selectedNode)) {
FacesContext.getCurrentInstance().addMessage("leftNavTreeForm:leftNavTree",
new FacesMessage(FacesMessage.SEVERITY_WARN, "Failed to re-expand node that shouldn't be collapsed.", null));
}
- }
-
+ } else {
+ if (openNodes.contains(node)) {
+ openNodes.remove(node);
+ } else {
+ openNodes.add(node);
+ }
+ }
}
}
@@ -125,7 +127,7 @@ public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
//make sure that the node refered to in the request parameters is visible
int selectedId = 0;
String typeId = FacesContextUtility.getOptionalRequestParameter("type");
- this.selecteAGTypeId = ((typeId == null || typeId.length() == 0) ? 0 : Integer.parseInt(typeId));
+ int selecteAGTypeId = ((typeId == null || typeId.length() == 0) ? 0 : Integer.parseInt(typeId));
if (typeId != null) {
String id = FacesContextUtility.getOptionalRequestParameter("parent");
@@ -140,35 +142,52 @@ public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
}
}
- if (preopen((ResourceTreeNode) tree.getRowData(key), selectedId, this.selecteAGTypeId)) {
+ //only update the state of open nodes in the preopen check
+ //if we're not finishing the request in which a parent
+ //of currently selected node was requested to close.
+ //If we did update the open node states in the "remainder"
+ //of such request the redirect that results from it would
+ //get wrong information and the parent wouldn't appear closed
+ //(because it'd had been re-opened in the below preopen call).
+ //@see changeExpandListener for more nasty details.
+ boolean setOpenStates = !tree.isBypassUpdates();
+
+ if (preopen(node, selectedId, selecteAGTypeId, setOpenStates)) {
return true;
}
//ok, in this case return whatever the last open state was
- TreeState state = (TreeState) tree.getComponentState();
- return state.isExpanded(key);
+ return openNodes.contains(node);
}
- private boolean preopen(ResourceTreeNode resourceTreeNode, int selectedResourceId, int selectedAGTypeId) {
- if (resourceTreeNode.getData() instanceof ResourceFlyweight && selectedAGTypeId == 0) {
- if (((ResourceFlyweight) resourceTreeNode.getData()).getId() == selectedResourceId) {
- return true;
+ private boolean preopen(ResourceTreeNode resourceTreeNode, int selectedResourceId, int selectedAGTypeId, boolean setOpenStates) {
+ boolean ret = false;
+ for (ResourceTreeNode child : resourceTreeNode.getChildren()) {
+ if (child.getData() instanceof ResourceFlyweight && selectedAGTypeId == 0) {
+ if (((ResourceFlyweight) child.getData()).getId() == selectedResourceId) {
+ ret = true;
+ break;
+ }
+ } else if (child.getData() instanceof AutoGroupCompositeFlyweight) {
+ AutoGroupCompositeFlyweight ag = (AutoGroupCompositeFlyweight) child.getData();
+ if (ag.getParentResource().getId() == selectedResourceId && ag.getResourceType() != null
+ && ag.getResourceType().getId() == selectedAGTypeId) {
+
+ ret = true;
+ break;
+ }
}
- } else if (resourceTreeNode.getData() instanceof AutoGroupCompositeFlyweight) {
- AutoGroupCompositeFlyweight ag = (AutoGroupCompositeFlyweight) resourceTreeNode.getData();
- if (ag.getParentResource().getId() == selectedResourceId && ag.getResourceType() != null
- && ag.getResourceType().getId() == selectedAGTypeId) {
- return true;
+
+ if (preopen(child, selectedResourceId, selectedAGTypeId, setOpenStates)) {
+ ret = true;
+ break;
}
}
- for (ResourceTreeNode child : resourceTreeNode.getChildren()) {
- if (preopen(child, selectedResourceId, selectedAGTypeId)) {
- return true;
- }
+ if (setOpenStates && ret) {
+ openNodes.add(resourceTreeNode);
}
-
- return false;
+ return ret;
}
public Boolean adviseNodeSelected(UITree tree) {
@@ -178,31 +197,25 @@ public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
String type = FacesContextUtility.getOptionalRequestParameter("type");
ResourceTreeNode node = (ResourceTreeNode) tree.getRowData(tree.getRowKey());
- if (this.selecteAGTypeId > 0) {
- if (node.getData() instanceof AutoGroupCompositeFlyweight) {
- AutoGroupCompositeFlyweight ag = (AutoGroupCompositeFlyweight) node.getData();
- if (ag.getParentResource() != null && ag.getResourceType() != null
- && String.valueOf(ag.getParentResource().getId()).equals(parent)
- && String.valueOf(ag.getResourceType().getId()).equals(type)) {
- return true;
- }
+ if (node.getData() instanceof AutoGroupCompositeFlyweight) {
+ AutoGroupCompositeFlyweight ag = (AutoGroupCompositeFlyweight) node.getData();
+ if (ag.getParentResource() != null && ag.getResourceType() != null
+ && String.valueOf(ag.getParentResource().getId()).equals(parent)
+ && String.valueOf(ag.getResourceType().getId()).equals(type)) {
+ return true;
}
- }
- if (node.getData() instanceof ResourceFlyweight) {
+ } else if (node.getData() instanceof ResourceFlyweight) {
if (String.valueOf(((ResourceFlyweight) node.getData()).getId()).equals(id)) {
return Boolean.TRUE;
}
}
- if (tree.getRowKey().equals(state.getSelectedNode())) {
- return Boolean.TRUE;
- }
- return null;
+
+ return tree.getRowKey().equals(state.getSelectedNode());
}
public boolean getHasMessages() {
- hasMessages = FacesContext.getCurrentInstance().getMessages("leftNavTreeForm:leftNavTree").hasNext();
- return hasMessages;
+ return FacesContext.getCurrentInstance().getMessages("leftNavTreeForm:leftNavTree").hasNext();
}
/**
@@ -211,7 +224,6 @@ public class ResourceTreeStateAdvisor implements TreeStateAdvisor {
private boolean redirectTo(ResourceTreeNode node) {
HttpServletResponse response = (HttpServletResponse) FacesContextUtility.getFacesContext().getExternalContext()
.getResponse();
- Subject subject = EnterpriseFacesContextUtility.getSubject();
String path = "";
if (node.getData() instanceof ResourceFlyweight) {
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/navigation/GroupTree.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/navigation/GroupTree.xhtml
index 572cf4f..9bad2c6 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/navigation/GroupTree.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/navigation/GroupTree.xhtml
@@ -49,7 +49,6 @@
<rich:tree style="width: 100%; height: 100%" switchType="ajax"
id="leftNavGroupTree"
var="treeNode"
- componentState="#{ResourceGroupTreeStateAdvisor.treeState}"
stateAdvisor="#{ResourceGroupTreeStateAdvisor}"
nodeSelectListener="#{ResourceGroupTreeStateAdvisor.nodeSelectListener}"
changeExpandListener="#{ResourceGroupTreeStateAdvisor.changeExpandListener}"
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml
index 4276b76..5275d13 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml
@@ -44,7 +44,6 @@
<a4j:keepAlive beanName="ResourceTreeModelUIBean" />
<rich:tree style="width: 100%; height: 100%; min-width: 100%; min-height: 100%" switchType="ajax"
- componentState="#{ResourceTreeStateAdvisor.treeState}"
stateAdvisor="#{ResourceTreeStateAdvisor}"
status="commonStatus"
var="treeNode"
commit 53a51f35cf344b7083e3ce77168ec3c3154d3ca0
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu May 13 14:26:44 2010 +0200
BZ 591645 - renamed the JBossAS(5) and RHQAgent JVM resources to just "JVM". This had to be done without actually renaming the resource types to avoid problems in existing inventories.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 546a418..27d2b76 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -1028,6 +1028,10 @@
<c:integer-constraint minimum="60"/>
</c:constraint>
</c:simple-property>
+
+ <c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
+ readOnly="true" required="false"
+ description="The name of the JBoss AS JVM resource."/>
</c:group>
<c:group name="events">
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index c2ddc8d..5902c06 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -150,6 +150,10 @@
<c:integer-constraint minimum="60"/>
</c:constraint>
</c:simple-property>
+
+ <c:simple-property name="childJmxServerName" displayName="JBoss AS JVM Name" default="JVM"
+ readOnly="true" required="false"
+ description="The name of the JBoss AS JVM resource."/>
</c:group>
</plugin-configuration>
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java
index 3451d50..f79daed 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java
@@ -25,7 +25,6 @@ package org.rhq.plugins.jmx;
import java.util.HashSet;
import java.util.Set;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import org.mc4j.ems.connection.EmsConnection;
import org.mc4j.ems.connection.bean.EmsBean;
@@ -42,7 +41,10 @@ import org.rhq.core.system.ProcessInfo;
/**
* This discovery component can be used to include JVM information under a parent Process oriented server that supports
* JMX (e.g. JBoss AS or Tomcat). The parent resource type's component must implement JMXComponent.
- *
+ * <p>
+ * The discovered resource is called the same name as its type or according to the "embeddedJvmName" property
+ * from the parent server's plugin configuration.
+ *
* @author Greg Hinkle
*/
public class EmbeddedJMXServerDiscoveryComponent implements ResourceDiscoveryComponent<JMXComponent> {
@@ -96,7 +98,7 @@ public class EmbeddedJMXServerDiscoveryComponent implements ResourceDiscoveryCom
if (runtimeMBean != null) {
String version = getSystemProperty(runtimeMBean, "java.version");
DiscoveredResourceDetails server = new DiscoveredResourceDetails(context.getResourceType(), "JVM",
- context.getResourceType().getName(), version, context.getResourceType().getDescription(),
+ ParentDefinedJMXServerNamingUtility.getJVMName(context), version, context.getResourceType().getDescription(),
configuration, null);
discoveredServers.add(server);
}
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java
index 6b2399b..8973b54 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java
@@ -42,7 +42,7 @@ public class InternalJMXServerDiscoveryComponent implements ResourceDiscoveryCom
Set<DiscoveredResourceDetails> found = new HashSet<DiscoveredResourceDetails>();
DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(), "InternalVM",
- context.getResourceType().getName(), System.getProperty("java.version"), "VM of plugin container", null,
+ ParentDefinedJMXServerNamingUtility.getJVMName(context), System.getProperty("java.version"), "VM of plugin container", null,
null);
Configuration configuration = localVM.getPluginConfiguration();
configuration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY,
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java
new file mode 100644
index 0000000..8817fa7
--- /dev/null
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java
@@ -0,0 +1,57 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.rhq.plugins.jmx;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+
+/**
+ * A simple utility class to extract the name of a JMX server from the parent resource's plugin configuration.
+ *
+ * @author Lukas Krejci
+ */
+public class ParentDefinedJMXServerNamingUtility {
+ public static final String PROPERTY_CHILD_JMX_SERVER_NAME = "childJmxServerName";
+
+ /**
+ * Checks if the parent resource's plugin configuration contains a property called {@link #PROPERTY_CHILD_JMX_SERVER_NAME}.
+ * If such property exists and its value is non-empty, its value is returned. Otherwise the name of the provided
+ * resource type is returned.
+ *
+ * @param context the discovery context to get the parent plugin configuration and current resource type from.
+ * @return the name that can be used for the JVM
+ */
+ public static String getJVMName(ResourceDiscoveryContext<?> context) {
+ Configuration parentPluginConfiguration = context.getParentResourceContext().getPluginConfiguration();
+ PropertySimple nameProperty = parentPluginConfiguration.getSimple(PROPERTY_CHILD_JMX_SERVER_NAME);
+ if (nameProperty == null || nameProperty.getStringValue() == null
+ || nameProperty.getStringValue().trim().length() == 0) {
+
+ return context.getResourceType().getName();
+ } else {
+ return nameProperty.getStringValue();
+ }
+ }
+}
diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
index 45af5ba..dbfdfe2 100644
--- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
@@ -56,6 +56,11 @@
<c:simple-property name="snapshotLogEnabled" type="boolean" default="true" description="If true, take a snapshot of the log files"/>
<c:simple-property name="snapshotDataEnabled" type="boolean" default="true" description="If true, take a snapshot of the data files"/>
</c:group>
+ <c:group name="advanced" displayName="Advanced" hiddenByDefault="true">
+ <c:simple-property name="childJmxServerName" displayName="JVM Name" default="JVM"
+ readOnly="true" required="false"
+ description="The name of the child JVM resource."/>
+ </c:group>
</plugin-configuration>
<operation name="restart"
commit 96e557c5b3aafc76738124874075b4eeb93d7de0
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed May 12 18:57:01 2010 -0400
BZ 589199: modified contentProvider to exclude modalElement in updates.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
index 3220bc6..22a82e0 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml
@@ -41,7 +41,9 @@
<input type="hidden" name="mode" value="#{param.mode}"/>
<!-- TODO: Only update if a sync is in progress. -->
- <a4j:poll id="poller" interval="7000" enabled="true" reRender="poller,contentSourceSyncResultsListForm"/>
+ <!-- BZ-589199 modified a4j:poll to rerender all other regions of contentSourceSyncResultsListForm but the modalPanel -->
+ <a4j:poll id="poller" interval="7000" enabled="true"
+ reRender="poller,table-check-boxes,table-start,table-end,table-id,table-status"/>
</h:form>
</a4j:region>
@@ -339,7 +341,7 @@
<onc:paginationControl id="ContentSourceSyncResultsList" />
</f:facet>
- <rich:column>
+ <rich:column id="table-check-boxes">
<f:facet name="header">
<onc:allSelect target="selectedContentSourceSyncResults" />
</f:facet>
@@ -347,7 +349,7 @@
<onc:select name="selectedContentSourceSyncResults" value="#{syncitem.id}" />
</rich:column>
- <rich:column>
+ <rich:column id="table-id">
<f:facet name="header">
<h:outputText styleClass="headerText" value="ID" />
</f:facet>
@@ -355,7 +357,7 @@
<h:outputText value="#{syncitem.id}"/>
</rich:column>
- <rich:column>
+ <rich:column id="table-start">
<f:facet name="header">
<onc:sortableColumnHeader sort="cssr.startTime">
<h:outputText styleClass="headerText" value="Start Time" />
@@ -367,7 +369,7 @@
</h:outputText>
</rich:column>
- <rich:column>
+ <rich:column id="table-end">
<f:facet name="header">
<onc:sortableColumnHeader sort="cssr.endTime">
<h:outputText styleClass="headerText" value="End Time" />
@@ -379,7 +381,7 @@
</h:outputText>
</rich:column>
- <rich:column>
+ <rich:column id="table-status">
<f:facet name="header">
<onc:sortableColumnHeader sort="cssr.status">
<h:outputText styleClass="headerText" value="Status" />
commit dd334d962aa60ad0dc171497c05612575eea0b6c
Merge: de743f6... 89bd0d2...
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 12 17:26:50 2010 -0400
Merge branch 'test-dbupgrade'
commit b6db90ecc922ac8286c008e799c591106d69ac27
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed May 12 23:02:34 2010 +0200
BZ 591645 - reverting back the resource type changes. changing a resource type name is a very dangerous thing to do.
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 608adc2..546a418 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -1168,7 +1168,7 @@
</configuration>
</content>
- <server name="JVM"
+ <server name="JBoss AS JVM"
description="JVM of the JBossAS"
sourcePlugin="JMX"
sourceType="JMX Server"
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index 54dd39a..c2ddc8d 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -390,7 +390,7 @@
</service>
</server>
- <server name="JVM"
+ <server name="JBoss AS JVM"
description="JVM of the JBossAS"
sourcePlugin="JMX"
sourceType="JMX Server"
diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
index d68c1c8..45af5ba 100644
--- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
@@ -614,7 +614,7 @@
</c:group>
</resource-configuration>
- <server name="JVM"
+ <server name="RHQ Agent JVM"
description="JVM of the Management Agent"
sourcePlugin="JMX"
sourceType="JMX Server"
commit de743f644555cd0d8857eabb779dca621e5a0cfa
Author: Joseph Marques <joseph(a)redhat.com>
Date: Wed May 12 16:55:57 2010 -0400
BZ-535576: change error-handling for template/group alert definition create/update workflows
* instead of failing fast on first error, presume that errors on rare and continue on failure
* after the create/update workflow completes, if any errors, throw the first exception back tot he caller
* exceptions indicate that one or more updates failed and will give the cause
* any updates that didn't experience an exception will be updated, because each individual alert definition update occurred in its own transaction
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
index 24cf476..992823c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.server.alert;
+import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
@@ -122,14 +123,16 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
try {
alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null);
} catch (Throwable t) {
- throw new AlertDefinitionCreationException("Could not create template for " + type + " with template"
+ throw new AlertDefinitionCreationException("Could not create alertTemplate for " + type + " with data "
+ alertTemplate.toSimpleString());
}
Subject overlord = subjectManager.getOverlord();
+ Throwable firstThrowable = null;
+
List<Integer> resourceIdsForType = getCommittedResourceIdsNeedingTemplateApplication(user, alertTemplateId,
resourceTypeId);
-
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
for (Integer resourceId : resourceIdsForType) {
try {
// construct the child
@@ -139,10 +142,17 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
// persist the child using overlord
alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
} catch (Throwable t) {
- throw new AlertDefinitionCreationException("Could not create child alert definition for Resource[id="
- + resourceId + "] with template" + alertTemplate.toSimpleString());
+ // continue on error, create as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ resourceIdsInError.add(resourceId);
}
}
+ if (firstThrowable != null) {
+ throw new AlertDefinitionCreationException("Could not create child alert definition for Resources "
+ + resourceIdsInError + " with template" + alertTemplate.toSimpleString(), firstThrowable);
+ }
return alertTemplateId;
}
@@ -235,25 +245,30 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
updated = alertDefinitionManager.updateAlertDefinition(user, alertTemplate.getId(), alertTemplate,
purgeInternals); // do not allow direct undeletes of an alert definition
} catch (Throwable t) {
- throw new AlertDefinitionUpdateException("Failed to update a AlertTemplate "
+ throw new AlertDefinitionUpdateException("Failed to update an AlertTemplate "
+ alertTemplate.toSimpleString(), t);
}
// overlord will be used for all system-side effects as a result of updating this alert template
Subject overlord = subjectManager.getOverlord();
+ Throwable firstThrowable = null;
// update all of the definitions that were spawned from alert templates
List<Integer> alertDefinitions = getChildrenAlertDefinitionIds(overlord, alertTemplate.getId());
if (LOG.isDebugEnabled()) {
LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
}
+ List<Integer> alertDefinitionIdsInError = new ArrayList<Integer>();
for (Integer alertDefinitionId : alertDefinitions) {
try {
alertDefinitionManager
.updateAlertDefinition(overlord, alertDefinitionId, alertTemplate, purgeInternals);
} catch (Throwable t) {
- throw new AlertDefinitionUpdateException("Failed to update child AlertDefinition[id="
- + alertDefinitionId + "] with template " + alertTemplate.toSimpleString(), t);
+ // continue on error, update as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ alertDefinitionIdsInError.add(alertDefinitionId);
}
}
@@ -263,6 +278,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
if (LOG.isDebugEnabled()) {
LOG.debug("Need to re-create alert definitions for the following resource ids: " + resourceIds);
}
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
for (Integer resourceId : resourceIds) {
try {
// construct the child
@@ -272,9 +288,22 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
// persist the child
alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
} catch (Throwable t) {
- throw new AlertDefinitionUpdateException("Failed to re-create child AlertDefinition for Resource[id="
- + resourceId + "] with template" + alertTemplate.toSimpleString(), t);
+ // continue on error, update as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ resourceIdsInError.add(resourceId);
+ }
+ }
+ if (firstThrowable != null) {
+ StringBuilder error = new StringBuilder();
+ if (alertDefinitionIdsInError.size() != 0) {
+ error.append("Failed to update child AlertDefinitions " + alertDefinitionIdsInError + "; ");
+ }
+ if (resourceIdsInError.size() != 0) {
+ error.append("Failed to re-create child AlertDefinition for Resources " + resourceIdsInError + "; ");
}
+ throw new AlertDefinitionUpdateException(error.toString(), firstThrowable);
}
return updated;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
index a1b26d1..0d5ed72 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
@@ -135,13 +135,21 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
Integer resourceGroupId) throws InvalidAlertDefinitionException, AlertDefinitionCreationException {
ResourceGroup group = entityManager.find(ResourceGroup.class, resourceGroupId);
groupAlertDefinition.setResourceGroup(group);
- int groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null);
- group = entityManager.merge(group);
+
+ int groupAlertDefinitionId = 0;
+ try {
+ groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null);
+ } catch (Throwable t) {
+ throw new AlertDefinitionCreationException("Could not create groupAlertDefinitions for " + group
+ + " with data " + groupAlertDefinition.toSimpleString());
+ }
Subject overlord = subjectManager.getOverlord();
+ Throwable firstThrowable = null;
+
List<Integer> resourceIdsForGroup = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(subject,
groupAlertDefinitionId, resourceGroupId);
-
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
for (Integer resourceId : resourceIdsForGroup) {
try {
// construct the child
@@ -151,10 +159,17 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
// persist the child
alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
} catch (Throwable t) {
- throw new AlertDefinitionCreationException("Could not create alert definition child for Resource[id="
- + resourceId + "] with group " + groupAlertDefinition.toSimpleString());
+ // continue on error, create as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ resourceIdsInError.add(resourceId);
}
}
+ if (firstThrowable != null) {
+ throw new AlertDefinitionCreationException("Could not create alert definition child for Resources "
+ + resourceIdsInError + " with group " + groupAlertDefinition.toSimpleString(), firstThrowable);
+ }
return groupAlertDefinitionId;
@@ -215,25 +230,31 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
// overlord will be used for all system-side effects as a result of updating this alert template
Subject overlord = subjectManager.getOverlord();
+ Throwable firstThrowable = null;
// update all of the definitions that were spawned from this group alert definition
List<Integer> alertDefinitions = getChildrenAlertDefinitionIds(overlord, groupAlertDefinition.getId());
if (LOG.isDebugEnabled()) {
LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
}
+ List<Integer> alertDefinitionIdsInError = new ArrayList<Integer>();
for (Integer alertDefinitionId : alertDefinitions) {
try {
alertDefinitionManager.updateAlertDefinition(overlord, alertDefinitionId, groupAlertDefinition,
purgeInternals);
} catch (Throwable t) {
- throw new AlertDefinitionUpdateException("Failed to update child AlertDefinition[id="
- + alertDefinitionId + "] with group " + groupAlertDefinition.toSimpleString(), t);
+ // continue on error, update as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ alertDefinitionIdsInError.add(alertDefinitionId);
}
}
// if the subject deleted the alertDefinition spawned from a groupAlertDefinition, cascade update will recreate it
List<Integer> resourceIds = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(overlord,
groupAlertDefinition.getId(), getResourceGroupIdForAlertDefinitionId(groupAlertDefinition.getId()));
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
for (Integer resourceId : resourceIds) {
try {
// construct the child
@@ -243,23 +264,39 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
// persist the child
alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
} catch (Throwable t) {
- throw new AlertDefinitionUpdateException("Failed to re-create child AlertDefinition for Resource[id="
- + resourceId + "] with group" + groupAlertDefinition.toSimpleString(), t);
+ // continue on error, update as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ resourceIdsInError.add(resourceId);
}
}
+ if (firstThrowable != null) {
+ StringBuilder error = new StringBuilder();
+ if (alertDefinitionIdsInError.size() != 0) {
+ error.append("Failed to update child AlertDefinitions " + alertDefinitionIdsInError + " ; ");
+ }
+ if (resourceIdsInError.size() != 0) {
+ error.append("Failed to re-create child AlertDefinition for Resources " + resourceIdsInError + "; ");
+ }
+ throw new AlertDefinitionUpdateException(error.toString(), firstThrowable);
+ }
return updated;
}
- public void addGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourcesIdsToAdd) {
+ public void addGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourcesIdsToAdd)
+ throws AlertDefinitionCreationException {
if (resourcesIdsToAdd == null || resourcesIdsToAdd.length == 0) {
return;
}
+ Subject overlord = subjectManager.getOverlord();
+ Throwable firstThrowable = null;
+
List<AlertDefinition> groupAlertDefinitions = findGroupAlertDefinitions(subject, resourceGroupId, PageControl
.getUnlimitedInstance());
-
- Subject overlord = subjectManager.getOverlord();
+ List<Integer> resourceIdsInError = new ArrayList<Integer>();
for (AlertDefinition groupAlertDefinition : groupAlertDefinitions) {
for (Integer resourceId : resourcesIdsToAdd) {
try {
@@ -270,13 +307,19 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
// persist the child
alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
} catch (Throwable t) {
- throw new AlertDefinitionCreationException(
- "Could not create child alert definition for Resource[id=" + resourceId
- + "] under ResourceGroup[id=" + resourceGroupId + "] with group"
- + groupAlertDefinition.toSimpleString());
+ // continue on error, create as many as possible
+ if (firstThrowable == null) {
+ firstThrowable = t;
+ }
+ resourceIdsInError.add(resourceId);
}
}
}
+ if (firstThrowable != null) {
+ throw new AlertDefinitionCreationException(
+ "Could not create group alert definition children for Resources " + resourceIdsInError
+ + " under ResourceGroup[id=" + resourceGroupId + "]", firstThrowable);
+ }
}
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
index 09f2d21..3db4ea9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
@@ -44,8 +44,9 @@ public interface GroupAlertDefinitionManagerLocal {
AlertDefinition updateGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
boolean purgeInternals) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
- // methods requires to implement system side-effects as a result of modifying group membership or deleting groups
- void addGroupAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd);
+ // required to implement system side-effects as a result of modifying group membership or deleting groups
+ void addGroupAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd)
+ throws AlertDefinitionCreationException;
void removeGroupAlertDefinitions(Subject subject, int groupId, int[] resourceIdsToRemove);
commit d4f93b33a55a32f1310b900a0466ab9dff83c0f3
Author: Joseph Marques <joseph(a)redhat.com>
Date: Wed May 12 16:52:52 2010 -0400
BZ-590724 - alert notifications C/U/D is now properly cascaded from template and group levels
* fix manager interface to always require subject as first argument for C/U/D alert notification
* alert notification C/U/D now occurs outside of a transaction in all scenarios
** notification manager calls into the appropriate template/group/resource manager to perform the persist work and cascading
* add display of JSF errors to the edit UI page for alert notifications
* add exception handling to all primary forms of C/U/D from the UI
* fix copy/clone logic inside AlertNotification entity and implement .equals()
* fix the copy/clone logic inside of AlertDefinition, which is responsible for copying/cloning conditions and notifications
* eliminate the needless 'copyIds' parameter in the copy/clone logic (false was being passed everywhere)
* finally, add new logic in AlertDefinitionManager.updateAlertDefinition
** properly cascade the C/U/D for alert notifications
** make sure to clean-up internal notification data for alert senders that use custom UIs
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
index 5fca393..c27dc37 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
@@ -340,10 +340,7 @@ public class AlertCondition implements Serializable {
*
* @param cond the alert condition to be copied
*/
- public AlertCondition(AlertCondition cond, boolean copyIds) {
- if (copyIds) {
- this.id = cond.id;
- }
+ public AlertCondition(AlertCondition cond) {
this.category = cond.category;
this.measurementDefinition = cond.measurementDefinition;
this.name = cond.name;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
index 5bd260d..07739cf 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java
@@ -402,15 +402,10 @@ public class AlertDefinition implements Serializable {
*/
public AlertDefinition(AlertDefinition alertDef) {
this();
- this.update(alertDef, false);
+ this.update(alertDef);
}
- public AlertDefinition(AlertDefinition alertDef, boolean copyIds) {
- this();
- this.update(alertDef, copyIds);
- }
-
- public void update(AlertDefinition alertDef, boolean copyIds) {
+ public void update(AlertDefinition alertDef) {
/*
* Don't copy the id, ctime, or mtime.
*/
@@ -443,18 +438,20 @@ public class AlertDefinition implements Serializable {
this.recoveryId = alertDef.recoveryId;
// copy conditions
- Set<AlertCondition> copiedConditions = new HashSet<AlertCondition>();
+ List<AlertCondition> copiedConditions = new ArrayList<AlertCondition>();
for (AlertCondition oldCondition : alertDef.getConditions()) {
- AlertCondition newCondition = new AlertCondition(oldCondition, copyIds);
+ AlertCondition newCondition = new AlertCondition(oldCondition);
newCondition.setAlertDefinition(this);
copiedConditions.add(newCondition);
}
this.removeAllConditions();
this.getConditions().addAll(copiedConditions);
- Set<AlertNotification> copiedNotifications = new HashSet<AlertNotification>();
- for (AlertNotification oldNotification : new HashSet<AlertNotification>(alertDef.getAlertNotifications())) {
- AlertNotification newNotification = new AlertNotification(oldNotification, copyIds);
+ // copy notifications
+ List<AlertNotification> copiedNotifications = new ArrayList<AlertNotification>();
+ for (AlertNotification oldNotification : alertDef.getAlertNotifications()) {
+ AlertNotification newNotification = new AlertNotification(oldNotification);
+ newNotification.setAlertDefinition(this);
copiedNotifications.add(newNotification);
}
this.removeAllAlertNotifications();
@@ -682,8 +679,7 @@ public class AlertDefinition implements Serializable {
}
public void removeAllAlertNotifications() {
- List<AlertNotification> toBeRemoved = new ArrayList<AlertNotification>(this.alertNotifications);
- for (AlertNotification notification : toBeRemoved) {
+ for (AlertNotification notification : this.alertNotifications) {
notification.prepareForOrphanDelete();
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java
index b9c0401..c1010e7 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java
@@ -38,12 +38,12 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.persistence.Transient;
import org.jetbrains.annotations.NotNull;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
@Entity
@NamedQueries( {
@@ -60,11 +60,6 @@ public class AlertNotification implements Serializable {
public static final String QUERY_DELETE_BY_RESOURCES = "AlertNotification.deleteByResources";
public static final String QUERY_DELETE_ORPHANED = "AlertNotification.deleteOrphaned";
- @Transient
- transient int alertDefinitionId;
- @Transient
- transient int alertNotificationId;
-
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIFICATION_ID_SEQ")
@Id
@@ -84,43 +79,22 @@ public class AlertNotification implements Serializable {
protected AlertNotification() {
} // JPA spec
- public AlertNotification(AlertDefinition alertDefinition) {
- if (alertDefinition == null) {
- throw new IllegalArgumentException("alertDefinition must be non-null.");
- }
-
- this.alertDefinition = alertDefinition;
- }
-
- public AlertNotification(AlertDefinition alertDefinition, Configuration config) {
- if (alertDefinition == null) {
- throw new IllegalArgumentException("alertDefinition must be non-null.");
- }
-
- this.alertDefinition = alertDefinition;
- this.configuration = config.deepCopy();
+ /**
+ * @param sender the type of alert sender for this {@link AlertNotification}
+ * @param configuration the custom data required for runtime configuration; it must be a new configuration object
+ * and not already persisted; in other words, the {@link Configuration} object as well as its
+ * {@link Property} children must have ids of 0.
+ */
+ public AlertNotification(String sender, Configuration configuration) {
+ setSenderName(sender);
+ setConfiguration(configuration);
}
- public AlertNotification(AlertNotification source, boolean copyIds) {
- if (copyIds) {
- this.id = source.id;
- this.configuration = source.configuration;
- } else {
- this.configuration = source.configuration.deepCopy(false);
- }
+ public AlertNotification(AlertNotification source) {
+ this.configuration = source.configuration.deepCopy(false);
this.senderName = source.senderName;
}
- /**
- * Constructor only for transient usage
- * @param alertDefinitionId
- * @param alertNotificationId
- */
- public AlertNotification(int alertDefinitionId, int alertNotificationId) {
- this.alertDefinitionId = alertDefinitionId;
- this.alertNotificationId = alertNotificationId;
- }
-
public AlertNotification(String sender) {
this.senderName = sender;
}
@@ -135,6 +109,9 @@ public class AlertNotification implements Serializable {
}
public void setAlertDefinition(AlertDefinition alertDefinition) {
+ if (alertDefinition == null) {
+ throw new IllegalArgumentException("alertDefinition must be non-null.");
+ }
this.alertDefinition = alertDefinition;
}
@@ -155,26 +132,50 @@ public class AlertNotification implements Serializable {
}
public void setConfiguration(Configuration configuration) {
+ if (configuration == null) {
+ throw new IllegalArgumentException("configuration must be non-null");
+ }
this.configuration = configuration;
}
- public int getAlertDefinitionId() {
- return alertDefinitionId;
- }
-
- public int getAlertNotificationId() {
- return alertNotificationId;
- }
-
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append("AlertNotification");
- sb.append("{alertDefinitionId=").append(alertDefinitionId);
- sb.append(", alertNotificationId=").append(alertNotificationId);
- sb.append(", id=").append(id);
+ sb.append("{id=").append(id);
sb.append(", senderName='").append(senderName).append('\'');
sb.append('}');
return sb.toString();
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + id;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (obj == null) {
+ return false;
+ }
+
+ if (!(obj instanceof AlertNotification)) {
+ return false;
+ }
+
+ AlertNotification other = (AlertNotification) obj;
+ if (id != other.id) {
+ return false;
+ }
+
+ return true;
+ }
+
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java
index 80cc829..5f44267 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java
@@ -24,6 +24,8 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import javax.faces.application.FacesMessage;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.In;
@@ -34,6 +36,7 @@ import org.jboss.seam.annotations.web.RequestParameter;
import org.rhq.core.domain.alert.notification.AlertNotification;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.gui.util.FacesContextUtility;
import org.rhq.enterprise.gui.alert.converter.AlertNotificationConverter;
import org.rhq.enterprise.gui.common.framework.EnterpriseFacesContextUIBean;
import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal;
@@ -160,39 +163,54 @@ public class AlertNotificationsUIBean extends EnterpriseFacesContextUIBean {
}
public String addAlertSender() {
- Configuration newSenderConfig = null;
- ConfigurationDefinition configDefinition = this.alertNotificationManager
- .getConfigurationDefinitionForSender(selectedNewSender);
-
- if (configDefinition != null) {
- newSenderConfig = configDefinition.getDefaultTemplate().createConfiguration();
- } else {
- newSenderConfig = new Configuration();
- }
+ try {
+ Configuration newSenderConfig = null;
+ ConfigurationDefinition configDefinition = this.alertNotificationManager
+ .getConfigurationDefinitionForSender(this.selectedNewSender);
+
+ if (configDefinition != null) {
+ newSenderConfig = configDefinition.getDefaultTemplate().createConfiguration();
+ } else {
+ newSenderConfig = new Configuration();
+ }
+
+ AlertNotification newNotification = new AlertNotification(this.selectedNewSender, newSenderConfig);
- AlertNotification newlyCreated = this.alertNotificationManager.addAlertNotification(getSubject(),
- this.contextId, this.selectedNewSender, newSenderConfig);
+ AlertNotification newlyCreated = this.alertNotificationManager.addAlertNotification(getSubject(),
+ this.contextId, newNotification);
- this.alertNotifications.add(newlyCreated); // only add if no errors
- this.activeNotification = newlyCreated;
- this.selectedNotifications.clear();
- this.selectedNotifications.add(this.activeNotification);
+ reloadAlertNotifications();
+ this.activeNotification = newlyCreated;
+ this.selectedNotifications.clear();
+ this.selectedNotifications.add(this.activeNotification);
+ } catch (Throwable t) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to create alert notification", t);
+ }
return OUTCOME_SUCCESS;
}
public String saveConfiguration() {
- if (this.activeNotification != null) {
- this.alertNotificationManager.updateAlertNotification(this.activeNotification);
+ try {
+ if (this.activeNotification != null) {
+ this.alertNotificationManager.updateAlertNotification(getSubject(), this.contextId,
+ this.activeNotification);
+ }
+ } catch (Throwable t) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to save alert notification", t);
}
return OUTCOME_SUCCESS;
}
public String removeSelected() {
- this.alertNotificationManager.removeNotifications(getSubject(), contextId, getSelectedIds());
- this.alertNotifications.removeAll(this.selectedNotifications); // only remove if no errors
- this.activeNotification = null;
+ try {
+ this.alertNotificationManager.removeNotifications(getSubject(), this.contextId, getSelectedIds());
+ this.alertNotifications.removeAll(this.selectedNotifications); // only remove if no errors
+ this.activeNotification = null;
+ } catch (Throwable t) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to save remove notifications", t);
+ }
return OUTCOME_SUCCESS;
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java
index 64bf25a..8aa82fe 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java
@@ -18,6 +18,8 @@
*/
package org.rhq.enterprise.gui.alert.common;
+import javax.faces.application.FacesMessage;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.In;
@@ -96,7 +98,13 @@ public class CustomContentUIBean extends EnterpriseFacesContextUIBean {
}
public String saveConfiguration() {
- customBackingBean.saveView();
+ try {
+ customBackingBean.saveView();
+ int alertDefinitionId = Integer.parseInt(customBackingBean.getContextId());
+ alertNotificationManager.updateAlertNotification(getSubject(), alertDefinitionId, null);
+ } catch (Throwable t) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to save alert notification", t);
+ }
return OUTCOME_SUCCESS;
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml
index 0c25391..1b0f5d1 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml
@@ -26,6 +26,17 @@
</ui:define>
<ui:define name="body">
+ <!-- Shows the results of the last action executed. -->
+ <h:messages showSummary="true"
+ showDetail="true"
+ infoClass="InfoBlock"
+ warnClass="WarnBlock"
+ errorClass="ErrorBlock"
+ fatalClass="FatalBlock"
+ globalOnly="true"
+ layout="table"
+ width="100%"/>
+
<a4j:keepAlive beanName="AlertNotificationContextUIBean" />
<a4j:keepAlive beanName="alertNotificationsUIBean" />
<a4j:keepAlive beanName="customContentUIBean" />
@@ -163,6 +174,7 @@
<h:panelGrid columns="4" styleClass="buttons-table" columnClasses="button-cell">
<a4j:commandButton value="OK" action="#{alertNotificationsUIBean.addAlertSender}"
styleClass="buttonmed" id="addAlertButton"
+ status="commonStatus"
reRender="sendersList">
<rich:componentControl for="addAlertPanel" attachTo="addAlertButton" operation="hide" event="onclick" />
</a4j:commandButton>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
index 7dfad20..597d1aa 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
@@ -32,12 +32,15 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.annotation.IgnoreDependency;
+
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.alert.AlertConditionLog;
import org.rhq.core.domain.alert.AlertDampeningEvent;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.alert.BooleanExpression;
+import org.rhq.core.domain.alert.notification.AlertNotification;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.composite.IntegerOptionItem;
@@ -54,6 +57,7 @@ import org.rhq.enterprise.server.alert.engine.AlertDefinitionEvent;
import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
import org.rhq.enterprise.server.authz.PermissionException;
import org.rhq.enterprise.server.cloud.StatusManagerLocal;
+import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean;
import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
import org.rhq.enterprise.server.util.CriteriaQueryRunner;
@@ -73,6 +77,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
private AuthorizationManagerLocal authorizationManager;
@EJB
private AlertDefinitionManagerLocal alertDefinitionManager;
+ @EJB
+ @IgnoreDependency
+ private AlertNotificationManagerLocal alertNotificationManager;
@EJB
private StatusManagerLocal agentStatusManager;
@@ -126,10 +133,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
public AlertDefinition getAlertDefinitionById(Subject subject, int alertDefinitionId) {
AlertDefinition alertDefinition = entityManager.find(AlertDefinition.class, alertDefinitionId);
-
- // avoid NPEs l8er if the caller passed an invalid id
- if (alertDefinition == null)
- return null;
+ if (alertDefinition == null) {
+ return null; // fail-fast to avoid downstream NPEs
+ }
if (checkViewPermission(subject, alertDefinition) == false) {
throw new PermissionException("User[" + subject.getName()
@@ -146,7 +152,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
}
// DO NOT LOAD ALL ALERTS FOR A DEFINITION... This would be all alerts that have been fired
//alertDefinition.getAlerts().size();
- alertDefinition.getAlertNotifications().size();
+ for (AlertNotification notification : alertDefinition.getAlertNotifications()) {
+ notification.getConfiguration().getProperties().size(); // eager load configuration and properties too
+ }
return alertDefinition;
}
@@ -498,7 +506,37 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
alertDefinition.setConditionExpression(BooleanExpression.ANY);
}
- oldAlertDefinition.update(alertDefinition, false);
+ /*
+ * Since the algorithm removes all existing notifications and adds them all back,
+ * we need to clean up all of them
+ */
+ for (AlertNotification notification : oldAlertDefinition.getAlertNotifications()) {
+ CustomAlertSenderBackingBean customBackingBean = alertNotificationManager.getBackingBeanForSender(
+ notification.getSenderName(), notification.getId());
+ if (customBackingBean != null) { // alert senders only have customBackingBeans if they have custom UIs
+ try {
+ customBackingBean.internalCleanup();
+ } catch (Throwable t) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error cleaning up custom alert sender data for " + notification, t);
+ } else {
+ LOG.error("Error cleaning up custom alert sender data for " + notification);
+ }
+ }
+ }
+ }
+
+ oldAlertDefinition.update(alertDefinition);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Updating: " + oldAlertDefinition);
+ for (AlertCondition nextCondition : oldAlertDefinition.getConditions()) {
+ LOG.debug("Condition: " + nextCondition);
+ }
+ for (AlertNotification nextNotification : oldAlertDefinition.getAlertNotifications()) {
+ LOG.debug("Notification: " + nextNotification);
+ LOG.debug("Notification-Configuration: " + nextNotification.getConfiguration().toString(true));
+ }
+ }
fixRecoveryId(oldAlertDefinition);
AlertDefinition newAlertDefinition = entityManager.merge(oldAlertDefinition);
@@ -608,28 +646,32 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public void purgeInternals(int alertDefinitionId) {
- Query alertDampeningEventPurgeQuery = entityManager
- .createNamedQuery(AlertDampeningEvent.QUERY_DELETE_BY_ALERT_DEFINITION_ID);
- Query unmatchedAlertConditionLogPurgeQuery = entityManager
- .createNamedQuery(AlertConditionLog.QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID);
+ try {
+ Query alertDampeningEventPurgeQuery = entityManager
+ .createNamedQuery(AlertDampeningEvent.QUERY_DELETE_BY_ALERT_DEFINITION_ID);
+ Query unmatchedAlertConditionLogPurgeQuery = entityManager
+ .createNamedQuery(AlertConditionLog.QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID);
- alertDampeningEventPurgeQuery.setParameter("alertDefinitionId", alertDefinitionId);
- unmatchedAlertConditionLogPurgeQuery.setParameter("alertDefinitionId", alertDefinitionId);
+ alertDampeningEventPurgeQuery.setParameter("alertDefinitionId", alertDefinitionId);
+ unmatchedAlertConditionLogPurgeQuery.setParameter("alertDefinitionId", alertDefinitionId);
- int alertDampeningEventPurgeCount = alertDampeningEventPurgeQuery.executeUpdate();
- int unmatchedAlertConditionLogPurgeCount = unmatchedAlertConditionLogPurgeQuery.executeUpdate();
+ int alertDampeningEventPurgeCount = alertDampeningEventPurgeQuery.executeUpdate();
+ int unmatchedAlertConditionLogPurgeCount = unmatchedAlertConditionLogPurgeQuery.executeUpdate();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Update to AlertDefinition[id=" + alertDefinitionId
- + " caused a purge of internal, dampening constructs.");
- if (alertDampeningEventPurgeCount > 0) {
- LOG.debug("Removed " + alertDampeningEventPurgeCount + " AlertDampeningEvent"
- + (alertDampeningEventPurgeCount == 1 ? "" : "s"));
- }
- if (unmatchedAlertConditionLogPurgeCount > 0) {
- LOG.debug("Removed " + unmatchedAlertConditionLogPurgeCount + " unmatched AlertConditionLog"
- + (unmatchedAlertConditionLogPurgeCount == 1 ? "" : "s"));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Update to AlertDefinition[id=" + alertDefinitionId
+ + " caused a purge of internal, dampening constructs.");
+ if (alertDampeningEventPurgeCount > 0) {
+ LOG.debug("Removed " + alertDampeningEventPurgeCount + " AlertDampeningEvent"
+ + (alertDampeningEventPurgeCount == 1 ? "" : "s"));
+ }
+ if (unmatchedAlertConditionLogPurgeCount > 0) {
+ LOG.debug("Removed " + unmatchedAlertConditionLogPurgeCount + " unmatched AlertConditionLog"
+ + (unmatchedAlertConditionLogPurgeCount == 1 ? "" : "s"));
+ }
}
+ } catch (Throwable t) {
+ LOG.debug("Could not purge internal alerting constructs for: " + alertDefinitionId, t);
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
index 2a9f4b3..20c4de9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java
@@ -712,7 +712,7 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote {
} else {
alNoLo = new AlertNotificationLog(alert, senderName, result);
}
- log.info(result);
+ log.debug(result);
} catch (Throwable t) {
log.error("Sender failed: " + t.getMessage());
if (log.isDebugEnabled())
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
index 5fc74c6..eb43be0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
@@ -26,6 +26,8 @@ import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
@@ -38,14 +40,11 @@ import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.alert.AlertDefinitionContext;
import org.rhq.core.domain.alert.notification.AlertNotification;
import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.plugin.PluginKey;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
-import org.rhq.enterprise.server.authz.PermissionException;
import org.rhq.enterprise.server.plugin.ServerPluginsLocal;
import org.rhq.enterprise.server.plugin.pc.alert.AlertSenderInfo;
import org.rhq.enterprise.server.plugin.pc.alert.AlertSenderPluginManager;
@@ -70,8 +69,6 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
@EJB
private GroupAlertDefinitionManagerLocal groupAlertDefintionManager;
@EJB
- private AuthorizationManagerLocal authorizationManager;
- @EJB
private SubjectManagerLocal subjectManager;
@EJB
private ServerPluginsLocal serverPluginsBean;
@@ -83,48 +80,69 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
* Must use detached object in all circumstances where the AlertDefinition will eventually be passed to
* AlertDefinitionManager.updateAlertDefinition() to perform the actual modifications and persistence.
* If we use an attached AlertDefinity entity at this layer, modify the set of notifications, then call
- * into AlertDefinitionManager.updateAlertDefinition() which starts a new transaction, the work will be
- * performed at the AlertTemplate layer twice. This would result in duplicate notifications (RHQ-629) as
- * well as errors during removal (which would be attempted twice for each being removed).
+ * into AlertDefinitionManager.updateAlertDefinition() which executes in a new transaction, the work will
+ * actually be performed twice - once at each layer. This would result in either duplicate notifications
+ * (in the case of adding notifications) or Hibernate exceptions (in the case of removing notifications,
+ * which are attempted twice for each being removed).
*
- * Must, however, return an AlertDefinition with a copy of the ids because the removeNotifications method
- * needs to compare ids to figure out what to remove from the set of notifications.
+ * However, instead of loading the alertDefinition from within a transaction, and then detaching it from
+ * the Hibernate session, a better method is to just execute the add/removal logic for the AlertNotification(s)
+ * outside a transaction and then call AlertDefinitionManager.updateAlertNotification() which starts a new
+ * transaction to do all of its logic.
+ *
+ * Note: for AlertNotification updates to work properly, alertDefinitionManager.getAlertDefinitionById() must
+ * eagerly load the List<AlertNotification> on the returned AlertDefinition
*/
private AlertDefinition getDetachedAlertDefinition(int alertDefinitionId) {
AlertDefinition alertDefinition = alertDefinitionManager.getAlertDefinitionById(subjectManager.getOverlord(),
alertDefinitionId);
- checkPermission(subjectManager.getOverlord(), alertDefinition);
- AlertDefinitionContext context = alertDefinition.getContext();
- if (context == AlertDefinitionContext.Resource) {
- return alertDefinition; // return attached to make modifications directly on
- }
- // otherwise, return detached to pass to alertTemplateManager.update or groupAlertDefinitionManager.update
- AlertDefinition detachedDefinition = new AlertDefinition(alertDefinition, true);
- detachedDefinition.setContext(context);
- detachedDefinition.setId(alertDefinition.getId());
- return detachedDefinition;
+ return alertDefinition;
}
- private void checkPermission(Subject subject, AlertDefinition alertDefinition) {
- boolean hasPermission = false;
-
- if (alertDefinition.getResourceType() != null) { // an alert template
- hasPermission = authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SETTINGS);
- } else if (alertDefinition.getResourceGroup() != null) { // a groupAlertDefinition
- hasPermission = authorizationManager.hasGroupPermission(subject, Permission.MANAGE_ALERTS, alertDefinition
- .getResourceGroup().getId());
- } else { // an alert definition
- hasPermission = authorizationManager.hasResourcePermission(subject, Permission.MANAGE_ALERTS,
- alertDefinition.getResource().getId());
+ /**
+ * @throws AlertDefinitionUpdateException if the {@link AlertNotification} is not associated with a known sender
+ */
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+ public AlertNotification addAlertNotification(Subject user, int alertDefinitionId, AlertNotification notification)
+ throws AlertDefinitionUpdateException {
+
+ List<String> validSenders = listAllAlertSenders();
+ if (validSenders.contains(notification.getSenderName()) == false) {
+ throw new AlertDefinitionUpdateException(notification.getSenderName()
+ + " is not a valid alert sender, options are: " + validSenders);
}
- if (!hasPermission) {
- throw new PermissionException(subject + " is not authorized to edit this alert definition");
+ AlertDefinition definition = getDetachedAlertDefinition(alertDefinitionId);
+ List<AlertNotification> notifications = definition.getAlertNotifications();
+ notifications.add(notification);
+
+ postProcessAlertDefinition(definition);
+
+ return notification;
+ }
+
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+ public void updateAlertNotification(Subject subject, int alertDefinitionId, AlertNotification notification) {
+ AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); // permissions check first
+
+ /*
+ * NULL notifications used to perform cascade updates from template and group level for alert senders
+ * that leverage custom UIs, which have a completely external methodology for loading/saving the data
+ * into and out of configuration object(s) associated with an AlertNotification.
+ */
+ if (notification != null) {
+ // remove then add is a cheap way of performing an update
+ List<AlertNotification> notifications = alertDefinition.getAlertNotifications();
+ notifications.remove(notification);
+ notifications.add(notification);
}
+
+ postProcessAlertDefinition(alertDefinition);
}
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public int removeNotifications(Subject subject, Integer alertDefinitionId, Integer[] notificationIds) {
- AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId);
+ AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); // permissions check first
if ((notificationIds == null) || (notificationIds.length == 0)) {
return 0;
}
@@ -141,22 +159,6 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
}
}
- // Before we delete the notification, check if has a custom backing bean
- // and give it the possibility to clean up
- for (AlertNotification notification : toBeRemoved) {
- CustomAlertSenderBackingBean bb = getBackingBeanForSender(notification.getSenderName(), notification
- .getId());
- if (bb!=null) { // Not all alert senders have custom backing beans
- try {
- bb.internalCleanup();
- } catch (Throwable t) {
- LOG
- .error("removeNotifications, calling backingBean.internalCleanup() resulted in " + t.getMessage(),
- t);
- }
- }
- }
-
alertDefinition.getAlertNotifications().removeAll(toBeRemoved);
postProcessAlertDefinition(alertDefinition);
@@ -169,23 +171,21 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
return purgeQuery.executeUpdate();
}
- private void postProcessAlertDefinition(AlertDefinition definition) {
+ private AlertDefinition postProcessAlertDefinition(AlertDefinition definition) {
+ AlertDefinition updated = null;
AlertDefinitionContext context = definition.getContext();
+ Subject overlord = subjectManager.getOverlord();
if (context == AlertDefinitionContext.Type) {
- try {
- alertTemplateManager.updateAlertTemplate(subjectManager.getOverlord(), definition, true);
- } catch (InvalidAlertDefinitionException iade) {
- // can this ever really happen? if it does, the logs will know about it
- LOG.error("Can not update alert template, invalid definition: " + definition);
- }
+ updated = alertTemplateManager.updateAlertTemplate(overlord, definition, true);
} else if (context == AlertDefinitionContext.Group) {
- try {
- groupAlertDefintionManager.updateGroupAlertDefinitions(subjectManager.getOverlord(), definition, true);
- } catch (InvalidAlertDefinitionException iade) {
- // can this ever really happen? if it does, the logs will know about it
- LOG.error("Can not update alert template, invalid definition: " + definition);
- }
+ updated = groupAlertDefintionManager.updateGroupAlertDefinitions(overlord, definition, true);
+ } else if (context == AlertDefinitionContext.Resource) {
+ updated = alertDefinitionManager.updateAlertDefinition(overlord, definition.getId(), definition, false);
+ } else {
+ throw new IllegalStateException("No support for updating alert notifications for AlertDefinitionContext: "
+ + definition.getContext());
}
+ return updated;
}
public Configuration getAlertPropertiesConfiguration(AlertNotification notification) {
@@ -269,26 +269,6 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
return pluginmanager.getBackingBeanNameForSender(shortName);
}
- // TODO: jmarques - this no longer handles the group alert definition or alert template cases!!
- public AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName,
- Configuration configuration) {
-
- AlertDefinition definition = alertDefinitionManager.getAlertDefinition(user, alertDefinitionId);
- if (definition == null) {
- LOG.error("Did not find definition for id [" + alertDefinitionId + "]");
- return null;
- }
-
- entityManager.persist(configuration);
- AlertNotification notif = new AlertNotification(definition);
- notif.setSenderName(senderName);
- notif.setConfiguration(configuration);
- entityManager.persist(notif);
- definition.getAlertNotifications().add(notif);
-
- return notif;
- }
-
/**
* Return notifications for a certain alertDefinitionId
*
@@ -315,14 +295,6 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
return notifications;
}
- // TODO: jmarques - this no longer handles the group alert definition or alert template cases!!
- public void updateAlertNotification(AlertNotification notification) {
- notification = entityManager.merge(notification);
-
- entityManager.persist(notification);
- entityManager.flush();
- }
-
public AlertNotification getAlertNotification(Subject user, int alertNotificationId) {
AlertNotification notification = entityManager.find(AlertNotification.class, alertNotificationId);
if (notification == null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
index bfa4dbf..9b2c27f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
@@ -38,6 +38,22 @@ import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean;
public interface AlertNotificationManagerLocal {
/**
+ * Add a new AlertNotification to the passed definition
+ * @param user subject of the caller
+ * @param alertDefinitionId Id of the alert definition
+ * @param senderName shortName of the {@link AlertSender}
+ * @param configuration Properties for this alert sender.
+ */
+ AlertNotification addAlertNotification(Subject user, int alertDefinitionId, AlertNotification notification);
+
+ /**
+ * Persist changes to the passed {@link AlertNotification}
+ *
+ * @param notification
+ */
+ void updateAlertNotification(Subject subject, int alertDefinitionId, AlertNotification notification);
+
+ /**
* Remove the passed notifications from the passed alert definition (all identified by their id)
* @param subject Caller
* @param alertDefinitionId alert definition to modify
@@ -59,16 +75,6 @@ public interface AlertNotificationManagerLocal {
ConfigurationDefinition getConfigurationDefinitionForSender(String shortName);
/**
- * Add a new AlertNotification to the passed definition
- * @param user subject of the caller
- * @param alertDefinitionId Id of the alert definition
- * @param senderName shortName of the {@link AlertSender}
- * @param configuration Properties for this alert sender.
- */
- AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName,
- Configuration configuration);
-
- /**
* Return notifications for a certain alertDefinitionId
*
* NOTE: this only returns notifications that have an AlertSender defined.
@@ -81,13 +87,6 @@ public interface AlertNotificationManagerLocal {
*/
List<AlertNotification> getNotificationsForAlertDefinition(Subject user, int alertDefinitionId);
- /**
- * Persist changes to the passed {@link AlertNotification}
- *
- * @param notification
- */
- void updateAlertNotification(AlertNotification notification);
-
AlertSenderInfo getAlertInfoForSender(String shortName);
/**
commit aca1ebad9820103bea6617fc2daee810e315b9c6
Author: Joseph Marques <joseph(a)redhat.com>
Date: Wed May 12 01:45:49 2010 -0400
BZ-591271: fix broken ConfigurationManagerBean.deleteConfigurations(List<Integer> configIds) method:
* no longer need to explicitly delete properties, they are cascade deleted at the DB-level
* fix typo to change configurationsQuery to use Configuration.QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDS
* add new query to break property recursion for DBs that don't support self-referencing cascading
** this means that nested (non-top-level) properties will be orphaned on MSSQL, which doesn't support that recursive cascade
* finally, needed to clean out RawConfiguration objects along with the delete
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java
index c2bf1bd..618ad9c 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java
@@ -22,9 +22,13 @@
*/
package org.rhq.core.domain.configuration;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-import org.jetbrains.annotations.NotNull;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -47,13 +51,9 @@ import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+import org.jetbrains.annotations.NotNull;
/**
* This is the root object for the storage of a hierarchical value set of data. This data may represent configurations
@@ -112,10 +112,17 @@ import java.util.Set;
+ " FROM PluginConfigurationUpdate cu " //
+ " JOIN cu.resource res " //
+ " WHERE cu.groupConfigurationUpdate.id = :groupConfigurationUpdateId"),
- @NamedQuery(name = Configuration.QUERY_DELETE_PROPERTIES_BY_CONFIGURATION_IDS, query = "" //
- + "DELETE FROM Property p WHERE p.configuration.id IN ( :configurationIds )"),
+ @NamedQuery(name = Configuration.QUERY_BREAK_PROPERTY_RECURSION_BY_CONFIGURATION_IDS, query = "" //
+ + "UPDATE Property p " //
+ + " SET p.parentMap = NULL, " //
+ + " p.parentList = NULL " //
+ + " WHERE p.configuration.id IN ( :configurationIds )"),
+ @NamedQuery(name = Configuration.QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS, query = "" //
+ + "DELETE FROM RawConfiguration rc " //
+ + " WHERE rc.configuration.id IN ( :configurationIds )"),
@NamedQuery(name = Configuration.QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs, query = "" //
- + "DELETE FROM Configuration c WHERE c.id IN ( :configurationIds )") })
+ + "DELETE FROM Configuration c " //
+ + " WHERE c.id IN ( :configurationIds )") })
@SequenceGenerator(name = "SEQ", sequenceName = "RHQ_CONFIG_ID_SEQ")
@Table(name = "RHQ_CONFIG")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -130,7 +137,8 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM
public static final String QUERY_GET_RESOURCE_CONFIG_MAP_BY_GROUP_UPDATE_ID = "Configuration.getResourceConfigMapByGroupUpdateId";
public static final String QUERY_GET_PLUGIN_CONFIG_MAP_BY_GROUP_UPDATE_ID = "Configuration.getPluginConfigMapByGroupUpdateId";
- public static final String QUERY_DELETE_PROPERTIES_BY_CONFIGURATION_IDS = "Property.deleteByConfigurationIds";
+ public static final String QUERY_BREAK_PROPERTY_RECURSION_BY_CONFIGURATION_IDS = "Property.breakPropertyRecursionByConfigurationIds";
+ public static final String QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS = "Configuration.deleteRawByConfigurationIds";
public static final String QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs = "Configuration.deleteByConfigurationIdS";
@GeneratedValue(generator = "SEQ", strategy = GenerationType.AUTO)
@@ -145,7 +153,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM
private Map<String, Property> properties = new LinkedHashMap<String, Property>();
@OneToMany(mappedBy = "configuration", fetch = FetchType.EAGER)
- @Cascade({CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DELETE_ORPHAN})
+ @Cascade( { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DELETE_ORPHAN })
private Set<RawConfiguration> rawConfigurations = new HashSet<RawConfiguration>();
@Column(name = "NOTES")
@@ -478,7 +486,6 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM
}
}
-
/**
* Clones this object in the same manner as {@link #deepCopy()}.
*
@@ -491,30 +498,30 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM
public Configuration clone() {
return deepCopy();
-/* TODO: GWT
-
- // TODO GH: This may be a performance problem when it comes to runtime scans...
- // do some profiling
- Object obj = null;
- try {
- // Write the object out to a byte array
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(bos);
- out.writeObject(this);
- out.flush();
- out.close();
-
- // Make an input stream from the byte array and read
- // a copy of the object back in.
- ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
- obj = in.readObject();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (ClassNotFoundException cnfe) {
- cnfe.printStackTrace();
- }
+ /* TODO: GWT
+
+ // TODO GH: This may be a performance problem when it comes to runtime scans...
+ // do some profiling
+ Object obj = null;
+ try {
+ // Write the object out to a byte array
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bos);
+ out.writeObject(this);
+ out.flush();
+ out.close();
+
+ // Make an input stream from the byte array and read
+ // a copy of the object back in.
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
+ obj = in.readObject();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException cnfe) {
+ cnfe.printStackTrace();
+ }
- return (Configuration) obj;*/
+ return (Configuration) obj;*/
}
/**
@@ -578,99 +585,98 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM
builder.append("], rawConfigurations[");
for (RawConfiguration rawConfig : rawConfigurations) {
- builder.append("[")
- .append(rawConfig.getPath())
- .append(", ")
- .append(rawConfig.getSha256())
- .append("]");
+ builder.append("[").append(rawConfig.getPath()).append(", ").append(rawConfig.getSha256()).append("]");
}
builder.append("]");
}
return builder.append("]").toString();
}
-/*
- public void writeExternal(ObjectOutput out) throws IOException {
- ExternalizableStrategy.Subsystem strategy = ExternalizableStrategy.getStrategy();
- out.writeChar(strategy.id());
+ /*
- if (isAgentOrRemoteAPISerialization(strategy.id())) {
- writeExternalAgentOrRemote(out);
- }
- else {
- EntitySerializer.writeExternalRemote(this, out);
+ public void writeExternal(ObjectOutput out) throws IOException {
+ ExternalizableStrategy.Subsystem strategy = ExternalizableStrategy.getStrategy();
+ out.writeChar(strategy.id());
+
+ if (isAgentOrRemoteAPISerialization(strategy.id())) {
+ writeExternalAgentOrRemote(out);
+ }
+ else {
+ EntitySerializer.writeExternalRemote(this, out);
+ }
}
- }
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- char c = in.readChar();
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ char c = in.readChar();
- if (isAgentOrRemoteAPISerialization(c)) {
- readExternalAgentOrRemote(in);
- }
- else {
- EntitySerializer.readExternalRemote(this, in);
+ if (isAgentOrRemoteAPISerialization(c)) {
+ readExternalAgentOrRemote(in);
+ }
+ else {
+ EntitySerializer.readExternalRemote(this, in);
+ }
}
- }
- private boolean isAgentOrRemoteAPISerialization(char strategy) {
- return strategy == ExternalizableStrategy.Subsystem.AGENT.id() ||
- strategy == ExternalizableStrategy.Subsystem.REMOTEAPI.id();
- }
+ private boolean isAgentOrRemoteAPISerialization(char strategy) {
+ return strategy == ExternalizableStrategy.Subsystem.AGENT.id() ||
+ strategy == ExternalizableStrategy.Subsystem.REMOTEAPI.id();
+ }
- */
-/**
- * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
- *//*
+ */
+ /**
+ * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
+ */
+ /*
public void writeExternalAgentOrRemote(ObjectOutput out) throws IOException {
- Configuration copy = deepCopyWithoutProxies();
+ Configuration copy = deepCopyWithoutProxies();
- out.writeInt(id);
- out.writeObject(createDeepCopyOfMap());
- out.writeObject(createDeepCopyOfRawConfigs());
- out.writeUTF((notes == null) ? "null" : notes);
- out.writeLong(version);
- out.writeLong(ctime);
- out.writeLong(mtime);
+ out.writeInt(id);
+ out.writeObject(createDeepCopyOfMap());
+ out.writeObject(createDeepCopyOfRawConfigs());
+ out.writeUTF((notes == null) ? "null" : notes);
+ out.writeLong(version);
+ out.writeLong(ctime);
+ out.writeLong(mtime);
}
private Map<String, Property> createDeepCopyOfMap() {
- Map<String, Property> copy = new HashMap<String, Property>();
- for (Map.Entry<String, Property> entry : this.properties.entrySet()) {
- Property copiedProperty = entry.getValue().deepCopy(true);
- copiedProperty.setConfiguration(this);
- copy.put(entry.getKey(), copiedProperty);
- }
- return copy;
+ Map<String, Property> copy = new HashMap<String, Property>();
+ for (Map.Entry<String, Property> entry : this.properties.entrySet()) {
+ Property copiedProperty = entry.getValue().deepCopy(true);
+ copiedProperty.setConfiguration(this);
+ copy.put(entry.getKey(), copiedProperty);
+ }
+ return copy;
}
private Set<RawConfiguration> createDeepCopyOfRawConfigs() {
- Set<RawConfiguration> copy = new HashSet<RawConfiguration>();
- for (RawConfiguration rawConfig : this.rawConfigurations) {
- RawConfiguration copiedRawConfig = rawConfig.deepCopy(true);
- copiedRawConfig.setConfiguration(this);
- copy.add(copiedRawConfig);
- }
- return copy;
+ Set<RawConfiguration> copy = new HashSet<RawConfiguration>();
+ for (RawConfiguration rawConfig : this.rawConfigurations) {
+ RawConfiguration copiedRawConfig = rawConfig.deepCopy(true);
+ copiedRawConfig.setConfiguration(this);
+ copy.add(copiedRawConfig);
+ }
+ return copy;
}
*/
-/**
- * @see java.io.Externalizable#readExternal(java.io.ObjectInput)
- *//*
+ /**
+ * @see java.io.Externalizable#readExternal(java.io.ObjectInput)
+ */
+ /*
@SuppressWarnings("unchecked")
public void readExternalAgentOrRemote(ObjectInput in) throws IOException, ClassNotFoundException {
- id = in.readInt();
- properties = (HashMap<String, Property>) in.readObject();
- rawConfigurations = (Set<RawConfiguration>) in.readObject();
- notes = in.readUTF();
- version = in.readLong();
- ctime = in.readLong();
- mtime = in.readLong();
- }
-*/
+ id = in.readInt();
+ properties = (HashMap<String, Property>) in.readObject();
+ rawConfigurations = (Set<RawConfiguration>) in.readObject();
+ notes = in.readUTF();
+ version = in.readLong();
+ ctime = in.readLong();
+ mtime = in.readLong();
+ }
+ */
/**
* This listener runs after jaxb unmarshalling and reconnects children properties to their parent configurations (as
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java
index 18d53d3..2556406 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java
@@ -22,8 +22,6 @@
*/
package org.rhq.core.domain.operation;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
import java.io.Serializable;
import javax.persistence.CascadeType;
@@ -107,14 +105,14 @@ import org.rhq.core.domain.configuration.Configuration;
+ " WHERE go.status != 'INPROGRESS' AND s = :subject "),
@NamedQuery(name = OperationHistory.QUERY_GET_PARAMETER_CONFIGURATION_IDS, query = "" //
+ "SELECT params.id " //
- + " FROM OperationHistory oh " //
+ + " FROM OperationHistory oh " // both resource and group operations have parameters
+ " JOIN oh.parameters params " //
+ " WHERE oh.id = :historyId"), //
@NamedQuery(name = OperationHistory.QUERY_GET_RESULT_CONFIGURATION_IDS, query = "" //
+ "SELECT res.id " //
- + " FROM OperationHistory oh " //
- + " JOIN oh.results res " //
- + " WHERE oh.id = :historyId"), //
+ + " FROM ResourceOperationHistory roh " // only resource operations have results
+ + " JOIN roh.results res " //
+ + " WHERE roh.id = :historyId"), //
@NamedQuery(name = OperationHistory.QUERY_DELETE_BY_HISTORY_IDS, query = "" //
+ "DELETE FROM OperationHistory oh " //
+ " WHERE oh.id = :historyId ") })
@@ -129,7 +127,7 @@ public abstract class OperationHistory implements Serializable {
public static final String QUERY_GET_RECENTLY_COMPLETED_GROUP_ADMIN = "OperationHistory.getRecentlyCompletedGroup_admin";
public static final String QUERY_GET_PARAMETER_CONFIGURATION_IDS = "OperationHistory.getParameterConfigurationIds";
- public static final String QUERY_GET_RESULT_CONFIGURATION_IDS = "OperationHistory.getResultConfigurationIds";
+ public static final String QUERY_GET_RESULT_CONFIGURATION_IDS = "ResourceOperationHistory.getResultConfigurationIds";
public static final String QUERY_DELETE_BY_HISTORY_IDS = "OperationHistory.deleteByHistoryIds";
private static final long serialVersionUID = 1L;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 946154d..5b5bb96 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -50,6 +50,7 @@ import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.configuration.ConfigurationAgentService;
import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest;
import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse;
+import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate;
@@ -1902,16 +1903,24 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return;
}
- Query propertiesQuery = entityManager
- .createNamedQuery(Configuration.QUERY_DELETE_PROPERTIES_BY_CONFIGURATION_IDS);
+ boolean supportsCascade = DatabaseTypeFactory.getDefaultDatabaseType().supportsSelfReferringCascade();
+ if (supportsCascade == false) {
+ Query breakPropertyRecursionQuery = entityManager
+ .createNamedQuery(Configuration.QUERY_BREAK_PROPERTY_RECURSION_BY_CONFIGURATION_IDS);
+ breakPropertyRecursionQuery.setParameter("configurationIds", configurationIds);
+ breakPropertyRecursionQuery.executeUpdate();
+ }
+
+ Query rawConfigurationsQuery = entityManager
+ .createNamedQuery(Configuration.QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS);
Query configurationsQuery = entityManager
- .createNamedQuery(Configuration.QUERY_DELETE_PROPERTIES_BY_CONFIGURATION_IDS);
+ .createNamedQuery(Configuration.QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs);
- propertiesQuery.setParameter("configurationIds", configurationIds);
+ rawConfigurationsQuery.setParameter("configurationIds", configurationIds);
configurationsQuery.setParameter("configurationIds", configurationIds);
- propertiesQuery.executeUpdate();
- configurationsQuery.executeUpdate();
+ rawConfigurationsQuery.executeUpdate();
+ configurationsQuery.executeUpdate(); // uses DB-level cascades to delete properties
}
public void deleteProperties(int[] propertyIds) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
index c4ef22a..d47601b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
@@ -980,6 +980,8 @@ public class OperationManagerBean implements OperationManagerLocal, OperationMan
List<Integer> allConfigurationIdsToDelete = new ArrayList<Integer>(historyArgumentConfigurationIds.size()
+ historyResultConfigurationIds.size());
+ allConfigurationIdsToDelete.addAll(historyArgumentConfigurationIds);
+ allConfigurationIdsToDelete.addAll(historyResultConfigurationIds);
configurationManager.deleteConfigurations(allConfigurationIdsToDelete);
return;
commit 87beed21d501d597994ef21634956176e0094246
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed May 12 22:26:46 2010 +0200
BZ 591645 - making a couple of resource types singletons, some minor changes to naming of others
diff --git a/modules/plugins/aliases/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/aliases/src/main/resources/META-INF/rhq-plugin.xml
index 01f5862..b10b0be 100644
--- a/modules/plugins/aliases/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/aliases/src/main/resources/META-INF/rhq-plugin.xml
@@ -14,7 +14,8 @@
description="the local file used for mapping aliases to usernames"
discovery="AliasesDiscoveryComponent"
class="AliasesComponent"
- supportsManualAdd="true">
+ supportsManualAdd="true"
+ singleton="true">
<runs-inside>
<parent-resource-type name="Linux" plugin="Platforms"/>
diff --git a/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml
index 18b1ee4..555d5d1 100644
--- a/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml
@@ -23,7 +23,7 @@
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true" default="Hibernate:application=%application%,type=statistics"/>
- <c:simple-property name="nameTemplate" default="{application} Hibernate statistics"/>
+ <c:simple-property name="nameTemplate" default="{application}"/>
<c:simple-property name="descriptionTemplate" default="Hibernate statistics for the {application} application."/>
<c:simple-property name="application" type="string" description="the Hibernate application name"/>
</plugin-configuration>
diff --git a/modules/plugins/hosts/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hosts/src/main/resources/META-INF/rhq-plugin.xml
index a2aef3d..dc60543 100644
--- a/modules/plugins/hosts/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/hosts/src/main/resources/META-INF/rhq-plugin.xml
@@ -14,7 +14,8 @@
description="the local file used for mapping host names to IP addresses"
discovery="HostsDiscoveryComponent"
class="HostsComponent"
- supportsManualAdd="true">
+ supportsManualAdd="true"
+ singleton="true">
<runs-inside>
<parent-resource-type name="Linux" plugin="Platforms"/>
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index 546a418..608adc2 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -1168,7 +1168,7 @@
</configuration>
</content>
- <server name="JBoss AS JVM"
+ <server name="JVM"
description="JVM of the JBossAS"
sourcePlugin="JMX"
sourceType="JMX Server"
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java
index 01cb6bc..4966c49 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java
@@ -79,17 +79,14 @@ public class JBossASTomcatDiscoveryComponent implements ResourceDiscoveryCompone
String key = jbossWebDir.getName();
// TODO GH: Get bound addresses and ports or something
- String hostname = context.getSystemInformation().getHostname();
boolean pre42 = jbossWebDir.getName().startsWith(EMBEDDED_TOMCAT_PRE42_DIR);
String serverName = (pre42) ? "Tomcat" : "JBossWeb";
- String bindAddress = context.getParentResourceComponent().getBindingAddress();
String version = getVersion(jbossWebDir);
- String name = getResourceName(hostname, serverName, version, bindAddress);
String description = "JBossAS-Embedded " + serverName + " Web Server (" + jbossWebDir.getName()
+ File.separator + ")";
Configuration pluginConfig = null;
ProcessInfo processInfo = null;
- DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), key, name,
+ DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), key, getResourceName(pre42),
version, description, pluginConfig, processInfo);
set.add(resource);
}
@@ -97,8 +94,8 @@ public class JBossASTomcatDiscoveryComponent implements ResourceDiscoveryCompone
return set;
}
- private String getResourceName(String hostName, String serverName, String version, String bindAddress) {
- return bindAddress;
+ private String getResourceName(boolean pre42) {
+ return pre42 ? "Embedded Tomcat Server" : "Embedded JBossWeb Server";
}
private String getVersion(File jbossWebDir) throws IOException {
diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
index c2ddc8d..54dd39a 100644
--- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml
@@ -390,7 +390,7 @@
</service>
</server>
- <server name="JBoss AS JVM"
+ <server name="JVM"
description="JVM of the JBossAS"
sourcePlugin="JMX"
sourceType="JMX Server"
diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
index 45af5ba..d68c1c8 100644
--- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml
@@ -614,7 +614,7 @@
</c:group>
</resource-configuration>
- <server name="RHQ Agent JVM"
+ <server name="JVM"
description="JVM of the Management Agent"
sourcePlugin="JMX"
sourceType="JMX Server"
diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
index 1cc0925..94db789 100644
--- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
@@ -11,7 +11,8 @@
<service name="RHQ Server Alerts Engine Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="AlertsCacheResourceComponent"
- description="RHQ Server Alerts Engine Subsystem">
+ description="RHQ Server Alerts Engine Subsystem"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
@@ -80,7 +81,8 @@
<service name="RHQ Server Measurement Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="org.rhq.plugins.jmx.MBeanResourceComponent"
- description="RHQ Server Measurement Subsystem">
+ description="RHQ Server Measurement Subsystem"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
@@ -136,7 +138,8 @@
<service name="RHQ Server Group Definition / DynaGroups Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="GroupDefinitionResourceComponent"
- description="Statistics for the RHQ Server Group Definition / DynaGroups Subsystem">
+ description="Statistics for the RHQ Server Group Definition / DynaGroups Subsystem"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
@@ -181,7 +184,8 @@
<service name="RHQ Server Communications Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="CommunicationsResourceComponent"
- description="Details on communications with agents">
+ description="Details on communications with agents"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
@@ -257,7 +261,8 @@
<service name="RHQ Server Remote API Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="RemoteAPIResourceComponent"
- description="Details on remote API communications with external clients, including the CLI">
+ description="Details on remote API communications with external clients, including the CLI"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
@@ -301,7 +306,8 @@
<service name="RHQ Server Plugin Subsystem"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
class="org.rhq.plugins.jmx.MBeanResourceComponent"
- description="Details on the server-side plugin container subsystem">
+ description="Details on the server-side plugin container subsystem"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
diff --git a/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml
index 27b36d4..00de1e5 100644
--- a/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml
@@ -13,7 +13,8 @@
<service name="Sudoers"
description="The static table lookup for host names"
discovery="SudoersDiscoveryComponent"
- class="SudoersComponent">
+ class="SudoersComponent"
+ singleton="true">
<runs-inside>
<parent-resource-type name="Linux" plugin="Platforms"/>
commit 89bd0d2fd4fe5d10ff57265cc042bdbcb95398ab
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 12 16:11:16 2010 -0400
Fixing new ant target to run dbupgrade after runnin the older release dbsetup.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index acccfed..11655fb 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -197,6 +197,8 @@ To run the default target, you must set one of the following properties to true:
<param name="_dataonly" value="true"/>
<param name="_uninstall" value="false"/>
</antcall>
+
+ <antcall target="dbsetup-upgrade"/>
</target>
<!-- Inserts the dbsetup data. Assumes the schema already exists. -->
commit ab2aad2b2837680ef35054d251b23b85d8c651ca
Merge: 62c4964... 71c80f7...
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 12 15:07:42 2010 -0400
Merge branch 'master' into test-dbupgrade
Conflicts:
modules/core/dbutils/pom.xml
diff --cc modules/core/dbutils/pom.xml
index 35a50c4,2cb1b2d..b2b0b7e
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@@ -128,182 -118,143 +128,186 @@@
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <!-- generate the I18N resource bundles -->
- <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
-
- <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">
- <classpath refid="maven.runtime.classpath" />
- <classfileset dir="${project.build.outputDirectory}">
- <include name="**/*I18NResourceKeys.class" />
- </classfileset>
- </i18n>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>dbsetup-worker</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
-
- <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>DatabaseTest.nofail</name>
+ <value>${DatabaseTest.nofail}</value>
+ </property>
+ <property>
+ <name>AntDatabaseTest.test-resources</name>
+ <value>${basedir}/src/test/resources</value>
+ </property>
+ </systemProperties>
+ <!-- The below is required for tests to run against Oracle. -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
- <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
- <property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
- <property name="postgresql.version" value="${postgresql.version}" />
- <property name="h2.version" value="${h2.version}" />
- <property name="jtds.version" value="${jtds.version}" />
- <property name="task.classpath.property" refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password" value="${rhq.ds.password}" />
- <property name="project.version" value="${project.version}" />
- <property name="db.schema.version" value="${db.schema.version}" />
- <property name="dbsetup" value="${dbsetup}" />
- <property name="dbsetup-uninstall" value="${dbsetup-uninstall}" />
- <property name="dbsetup-upgrade" value="${dbsetup-upgrade}" />
- <property name="dbsetup-export" value="${dbsetup-export}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ </plugins>
+ </build>
- <execution>
- <id>generate-dbsetup-dbupgrade-xml-files</id>
- <phase>process-classes</phase>
+ <profiles>
+ <profile>
+ <id>latest</id>
+ <activation>
+ <property>
+ <name>!jon.release</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- generate the I18N resource bundles -->
+ <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
+
+ <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">
+ <classpath refid="maven.runtime.classpath" />
+ <classfileset dir="${project.build.outputDirectory}">
+ <include name="**/*I18NResourceKeys.class" />
+ </classfileset>
+ </i18n>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>dbsetup-worker</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
- <property name="settings.localRepository" value="${settings.localRepository}" />
++ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+ <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="postgresql.version" value="${postgresql.version}" />
+ <property name="h2.version" value="${h2.version}" />
+ <property name="jtds.version" value="${jtds.version}" />
+ <property name="task.classpath.property" refid="maven.test.classpath" />
+ <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password" value="${rhq.ds.password}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="db.schema.version" value="${db.schema.version}" />
+ <property name="dbsetup" value="${dbsetup}" />
+ <property name="dbsetup-uninstall" value="${dbsetup-uninstall}" />
+ <property name="dbsetup-upgrade" value="${dbsetup-upgrade}" />
+ <property name="dbsetup-export" value="${dbsetup-export}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>generate-dbsetup-dbupgrade-xml-files</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
- <property name="settings.localRepository" value="${settings.localRepository}" />
++ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+ <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="postgresql.version" value="${postgresql.version}" />
+ <property name="h2.version" value="${h2.version}" />
+ <property name="jtds.version" value="${jtds.version}" />
+ <property name="task.classpath.property" refid="maven.test.classpath" />
+ <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password" value="${rhq.ds.password}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="db.schema.version" value="${db.schema.version}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <!--
+ This execution will abort the build if the database schema is not up to date.
+ If you want the build to continue, regardless of your currently installed schema,
+ then pass -Ddbsetup-do-not-check-schema to the mvn command line.
+ -->
+ <id>test-db-schema-version</id>
+ <phase>test</phase>
<configuration>
<tasks>
- <property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
++ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
- <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
- <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
- <property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
- <property name="postgresql.version" value="${postgresql.version}" />
- <property name="h2.version" value="${h2.version}" />
- <property name="jtds.version" value="${jtds.version}" />
- <property name="task.classpath.property" refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password" value="${rhq.ds.password}" />
- <property name="project.version" value="${project.version}" />
- <property name="db.schema.version" value="${db.schema.version}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
- <execution>
- <!--
- This execution will abort the build if the database schema is not up to date.
- If you want the build to continue, regardless of your currently installed schema,
- then pass -Ddbsetup-do-not-check-schema to the mvn command line.
- -->
- <id>test-db-schema-version</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
- <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.driver-class" value="${rhq.dev.ds.driver-class}" else="${rhq.test.ds.driver-class}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@@ -326,73 -277,34 +330,73 @@@
<goal>run</goal>
</goals>
</execution>
-
</executions>
</plugin>
+ </plugins>
+ </build>
+ </profile>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>DatabaseTest.nofail</name>
- <value>${DatabaseTest.nofail}</value>
- </property>
+ <profile>
+ <id>jon.release</id>
+ <activation>
<property>
- <name>AntDatabaseTest.test-resources</name>
- <value>${basedir}/src/test/resources</value>
- </property>
- </systemProperties>
- <!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElements>
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <profiles>
+ <name>jon.release</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-schema</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
- <property name="settings.localRepository" value="${settings.localRepository}" />
++ <property name="settings.localRepository" location="${user.home}/.m2/repository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="create-release-schema">
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+ <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="postgresql.version" value="${postgresql.version}" />
+ <property name="h2.version" value="${h2.version}" />
+ <property name="jtds.version" value="${jtds.version}" />
+ <property name="task.classpath.property" refid="maven.test.classpath" />
+ <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password" value="${rhq.ds.password}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="db.schema.version" value="${db.schema.version}" />
+ <property name="jon.release" value="${jon.release}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>dev</id>
commit 62c4964f1359570b52de8f23aaa4b64b4423de37
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 12 14:49:53 2010 -0400
Cleaning up some debug code
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 6dc356e..35a50c4 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.0-rc-5</version>
+ <version>1.0</version>
<dependencies>
<dependency>
<groupId>postgresql</groupId>
@@ -93,8 +93,6 @@
return
}
- println "DB = ${project.properties.db}"
-
db = project.properties.db
if (db == 'dev') {
database = project.properties['rhq.dev.ds.db-name']
commit 27a6576778f85f9b4afc564c0e381b45ccff7543
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 12 12:24:28 2010 -0400
Adding temporary work around for https://cvs.codehaus.org/browse/GMAVEN-46
This bug prevents groovy scripts in the build from getting the correct build property values
when properties are defined in a pom (or parent pom) and are overridden on the command line.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 7356d08..6dc356e 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.0-rc-5</version>
<dependencies>
<dependency>
<groupId>postgresql</groupId>
@@ -93,10 +93,22 @@
return
}
+ println "DB = ${project.properties.db}"
+
db = project.properties.db
if (db == 'dev') {
database = project.properties['rhq.dev.ds.db-name']
- } else {
+ }
+ // This is a bit of a temporary hack to work around
+ // https://cvs.codehaus.org/browse/GMAVEN-46 which results in
+ // groovy scripts not being able to get the correct values of
+ // build properties that are overridden on the command line.
+ // This is being done in support of the hudson job which is
+ // trying to use a database named rhqupgrade.
+ else if (project.properties['upgrade.db']) {
+ database = 'rhqupgrade'
+ }
+ else {
database = project.properties['rhq.test.ds.db-name']
}
project.properties.dbsetup = 'true'
@@ -197,11 +209,6 @@
<equals arg1="${db}" arg2="dev"/>
</condition>
- <echo message="URL = ${rhq.test.ds.connection-url}"/>
- <echo message="URL = ${rhq.ds.connection.url}"/>
-
- <fail unless="rhq.dev.ds.connection-url" message="PROP NOT SET"/>
-
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -250,8 +257,6 @@
<equals arg1="${db}" arg2="dev"/>
</condition>
- <echo message="URL = ${rhq.ds.connection.url}"/>
-
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -445,50 +450,18 @@
</plugins>
</build>
</profile>
-
- <!--
- <profile>
- <id>rhq-dev-db</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>rhq.db</name>
- <value>dev</value>
- </property>
- </activation>
- <properties>
- <rhq.db.name>rhqdev</rhq.db.name>
- </properties>
- </profile>
-
- <profile>
- <id>rhq-test-db</id>
- <activation>
- <property>
- <name>rhq.db</name>
- <value>test</value>
- </property>
- </activation>
- <properties>
- <rhq.db.name>rhq</rhq.db.name>
- </properties>
- </profile>
-
- <profile>
- <id>rhq-upgrade-db</id>
- <activation>
- <property>
- <name>rhq.db</name>
- <value>upgrade</value>
- </property>
- </activation>
- <properties>
- <rhq.db.name>rhqupgrade</rhq.db.name>
- </properties>
- </profile>
- -->
-
</profiles>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>codehaus-snapshots</id>
+ <name>codehaus snapshots</name>
+ <url>http://snapshots.repository.codehaus.org</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
commit 71c80f76135eb4ae34dae2914d471044ffdfb4d9
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 12 10:57:19 2010 -0400
upgrade SIGAR from 1.6.3 to 1.6.4 (https://bugzilla.redhat.com/show_bug.cgi?id=591552)
diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml
index 49dcc28..856c682 100644
--- a/modules/core/native-system/ant-run.xml
+++ b/modules/core/native-system/ant-run.xml
@@ -2,7 +2,7 @@
<!--
=======================================================================
-ANT Script that builds a test jar to run SIGAR bug replication code.
+Ant Script that builds a test jar to run SIGAR bug replication code.
=======================================================================
-->
@@ -10,8 +10,8 @@ ANT Script that builds a test jar to run SIGAR bug replication code.
<!-- in case it wasn't passed in, assume the default location -->
<property name="settings.localRepository" location="${user.home}/.m2/repository"/>
- <property name="project.version" value="2.0.0-SNAPSHOT"/>
- <property name="sigar.version" value="1.4.0.0"/>
+ <property name="project.version" value="3.0.0-SNAPSHOT"/>
+ <property name="sigar.version" value="1.6.4.129"/>
<fileset dir="${settings.localRepository}" id="jar.fileset">
<include name="i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar" />
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 52e1c8a..d47d4c8 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.hyperic</groupId>
<artifactId>sigar-dist</artifactId>
- <version>${sigar.version}</version>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<type>zip</type>
</dependency>
@@ -60,8 +60,8 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <echo>SIGAR java library version used is ${sigar.version}</echo>
- <echo>Copying/unzipping SIGAR native libraries (version ${sigar.version}) to local build directory</echo>
+ <echo>SIGAR Java library version used is ${sigar.version}.</echo>
+ <echo>Copying/unzipping SIGAR native libraries (version ${sigar.version}) to local build directory...</echo>
<mkdir dir="${project.build.directory}/jboss-sigar" />
<copy toDir="${project.build.directory}/jboss-sigar">
<fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" />
@@ -107,4 +107,17 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+ <repositories>
+ <!-- This is for SIGAR 1.6.4. -->
+ <repository>
+ <id>jboss-thirdparty-uploads</id>
+ <name>JBoss Third Party Uploads</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
+
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 197ef69..b0472c3 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -186,6 +186,7 @@
</pluginRepositories>
<repositories>
+
<repository>
<id>java.net</id>
<name>java.net Maven Repository</name>
@@ -195,6 +196,18 @@
<enabled>false</enabled>
</snapshots>
</repository>
+
+ <!-- This is for SIGAR 1.6.4. -->
+ <repository>
+ <id>jboss-thirdparty-uploads</id>
+ <name>JBoss Third Party Uploads</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
</repositories>
</project>
+
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index e36af59..16a0194 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -2,7 +2,7 @@
<!--
=======================================================================
-ANT Script that provides ways to package the agent.
+Ant Script that provides ways to package the Agent.
=======================================================================
-->
@@ -11,7 +11,7 @@ ANT Script that provides ways to package the agent.
<!-- in case these weren't passed in (i.e. not invoked via maven), assume some defaults -->
<property name="settings.localRepository" location="${user.home}/.m2/repository"/>
<property name="project.version" value="2.0.0-SNAPSHOT"/>
- <property name="sigar.version" value="1.6.3.82"/>
+ <property name="sigar.version" value="1.6.4.129"/>
<property name="getopt.version" value="1.0.13"/>
<property name="jaxb-api.version" value="2.1"/>
<property name="jaxb-impl.version" value="2.1"/>
@@ -194,3 +194,4 @@ ANT Script that provides ways to package the agent.
</target>
</project>
+
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index e0a9498..d9f1c1c 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -231,6 +231,18 @@ Build-Number=${buildNumber}
</plugins>
</build>
+ <repositories>
+ <!-- This is for SIGAR 1.6.4. -->
+ <repository>
+ <id>jboss-thirdparty-uploads</id>
+ <name>JBoss Third Party Uploads</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<reporting>
<plugins>
@@ -241,4 +253,5 @@ Build-Number=${buildNumber}
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/pom.xml b/pom.xml
index 7c866dc..6f037b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<jtds.version>1.2.2</jtds.version>
<richfaces.version>3.3.3.CR1</richfaces.version>
<jline.version>0.9.94</jline.version>
- <sigar.version>1.6.3.82</sigar.version>
+ <sigar.version>1.6.4.129</sigar.version>
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.2</jna.version>
commit ae1747a14da7fb316e8fb3a6cd5ace44714591eb
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Wed May 12 15:27:03 2010 +0200
[apache] new format of resource key in Directory,IfModule and IfModuleDirectory components.
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
index 0cf6e74..237e76d 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
@@ -54,23 +54,13 @@ import org.rhq.plugins.apache.util.AugeasNodeSearch;
public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtualHostServiceComponent>, ConfigurationFacet, DeleteResourceFacet {
private final Log log = LogFactory.getLog(this.getClass());
- public static final String DIRECTIVE_INDEX_PROP = "directiveIndex";
public static final String REGEXP_PROP = "regexp";
- public static final String PARAMS_PROPERTY_NAME = "ifmoduleParams";
public static final String DIRECTORY_DIRECTIVE = "<Directory";
- private List<String> position;
private ResourceContext<ApacheVirtualHostServiceComponent> resourceContext;
public void start(ResourceContext<ApacheVirtualHostServiceComponent> context) throws InvalidPluginConfigurationException, Exception {
- resourceContext = context;
- String key = context.getResourceKey();
- position = new ArrayList<String>();
- String param = key.substring(0,key.indexOf("|"));
- for (String pm :param.split(";")){
- position.add(pm);
- }
-
+ resourceContext = context;
}
@@ -146,16 +136,9 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
* @return
*/
public AugeasNode getNode(AugeasNode virtualHost) {
- List<AugeasNode> directories = AugeasNodeSearch.getNodeByParentParams(virtualHost, DIRECTORY_DIRECTIVE, position);
- int index = resourceContext.getPluginConfiguration().getSimple(DIRECTIVE_INDEX_PROP).getIntegerValue();
+ AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, resourceContext.getResourceKey());
- for(AugeasNode dir : directories) {
- if (dir.getSeq() == index) {
- return dir;
- }
- }
-
- return null;
+ return directory;
}
public AugeasNode getNode(){
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
index be707b9..81f5f93 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
@@ -77,12 +77,8 @@ public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryCompo
for (AugeasNode node : directories) {
Configuration pluginConfiguration = new Configuration();
-
- int idx = node.getSeq();
-
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, idx));
- String ifmoduleParams = AugeasNodeSearch.getParamsString(node, parentNode);
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.PARAMS_PROPERTY_NAME, ifmoduleParams));
+
+ String ifmoduleParams = AugeasNodeSearch.getNodeKey(node, parentNode);
List<AugeasNode> params = node.getChildByLabel("param");
String directoryParam;
@@ -98,7 +94,7 @@ public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryCompo
pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.REGEXP_PROP, isRegexp));
- String resourceKey = directoryParam + "|" + idx;
+ String resourceKey = ifmoduleParams;
String resourceName = AugeasNodeValueUtil.unescape(directoryParam);
discoveredResources.add(new DiscoveredResourceDetails(resourceType, resourceKey, resourceName, null, null,
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
index 537ccef..ddf0355 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
@@ -52,7 +52,6 @@ public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualH
private AugeasTree tree;
private ResourceContext<ApacheVirtualHostServiceComponent> context;
- private List<String> position;
private ApacheVirtualHostServiceComponent parentComponent;
private final Log log = LogFactory.getLog(this.getClass());
private static final String IFMODULE_DIRECTIVE_NAME="<IfModule";
@@ -62,12 +61,6 @@ public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualH
this.context = context;
parentComponent = context.getParentResourceComponent();
- String resourceKey = context.getResourceKey();
- position = new ArrayList<String>();
-
- for (String pm : resourceKey.split(";")){
- position.add(pm);
- }
}
public void stop(){
@@ -115,14 +108,8 @@ public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualH
}
private AugeasNode getNode(AugeasNode virtualHost) {
- List<AugeasNode> directories = AugeasNodeSearch.getNodeByParentParams(virtualHost, IFMODULE_DIRECTIVE_NAME, position);
- if (directories.isEmpty())
- {
- log.warn("Parent directive of ifmodule was probably deleted in configuration file.");
- throw new RuntimeException("Parent directive of ifmodule was probably deleted in configuration file.");
- }
-
- return directories.get(0);
+ AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, context.getResourceKey());
+ return directory;
}
private void prepareNode(AugeasNode node,AugeasNode parentNode,AugeasTree tree,Configuration configuration){
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
index 8f715ac..a20d180 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
@@ -22,7 +22,6 @@
*/
package org.rhq.plugins.apache;
-import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
@@ -35,7 +34,6 @@ import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
@@ -45,7 +43,6 @@ import org.rhq.plugins.apache.util.AugeasNodeSearch;
public class ApacheIfModuleDirectoryComponent implements ResourceComponent<ApacheDirectoryComponent>, ConfigurationFacet {
private ResourceContext<ApacheDirectoryComponent> context;
- private List<String> position;
private ApacheDirectoryComponent parentComponent;
private final Log log = LogFactory.getLog(this.getClass());
private static final String IFMODULE_DIRECTIVE_NAME="<IfModule";
@@ -55,12 +52,7 @@ public class ApacheIfModuleDirectoryComponent implements ResourceComponent<Apach
this.context = context;
parentComponent = context.getParentResourceComponent();
- String resourceKey = context.getResourceKey();
- position = new ArrayList<String>();
-
- for (String pm : resourceKey.split(";")){
- position.add(pm);
- }
+
}
public void stop() {
@@ -104,13 +96,8 @@ public class ApacheIfModuleDirectoryComponent implements ResourceComponent<Apach
}
private AugeasNode getNode(AugeasNode virtualHost) {
- List<AugeasNode> directories = AugeasNodeSearch.getNodeByParentParams(virtualHost, IFMODULE_DIRECTIVE_NAME, position);
- if (directories.isEmpty())
- {
- log.warn("Parent directive of ifmodule was probably deleted in configuration file.");
- throw new RuntimeException("Parent directive of ifmodule was probably deleted in configuration file.");
- }
- return directories.get(0);
+ AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, context.getResourceKey());
+ return directory;
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
index 3a04a34..6532b9d 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
@@ -57,15 +57,10 @@ public class ApacheIfModuleDirectoryDiscoveryComponent implements ResourceDiscov
for (AugeasNode node : ifModuleNodes) {
- String resourceKey = AugeasNodeSearch.getParamsString(node,parentNode);
- int separatorPosition = resourceKey.indexOf(";");
- String resourceName = null;
-
- if (separatorPosition!=-1)
- resourceName = resourceKey.substring(0,separatorPosition);
- else
- resourceName = resourceKey.toString();
+ String resourceKey = AugeasNodeSearch.getNodeKey(node,parentNode);
+ String [] paramArray = resourceKey.split("\\|");
+ String resourceName = paramArray[1];
discoveredResources.add(new DiscoveredResourceDetails(resourceType, resourceKey, resourceName, null, null,
null, null));
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
index ea53b87..bca1598 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
@@ -57,15 +57,9 @@ public class ApacheIfModuleDiscoveryComponent implements ResourceDiscoveryCompo
for (AugeasNode node : ifModuleNodes) {
- String resourceKey = AugeasNodeSearch.getParamsString(node,parentNode);
-
- int separatorPosition = resourceKey.indexOf(";");
- String resourceName = null;
-
- if (separatorPosition!=-1)
- resourceName = resourceKey.substring(0,separatorPosition);
- else
- resourceName = resourceKey.toString();
+ String resourceKey = AugeasNodeSearch.getNodeKey(node,parentNode);
+ String [] paramArray = resourceKey.split("\\|");
+ String resourceName = paramArray[1];
discoveredResources.add(new DiscoveredResourceDetails(resourceType, resourceKey, resourceName, null, null,
null, null));
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
index a91363d..afede02 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
@@ -60,6 +60,7 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.util.ResponseTimeConfiguration;
import org.rhq.core.pluginapi.util.ResponseTimeLogParser;
import org.rhq.plugins.apache.mapping.ApacheAugeasMapping;
+import org.rhq.plugins.apache.util.AugeasNodeSearch;
import org.rhq.plugins.apache.util.AugeasNodeValueUtil;
import org.rhq.plugins.apache.util.ConfigurationTimestamp;
import org.rhq.plugins.apache.util.HttpdAddressUtility;
@@ -253,23 +254,33 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
AugeasTree tree = getServerConfigurationTree();
AugeasNode myNode = getNode(tree);
List<AugeasNode> directories = myNode.getChildByLabel("<Directory");
- int seq = 0;
+ int seq = 1;
+ /*
+ * myNode will be parent node of the new Directory node.
+ * We need to create a new node for directory node which will contain child nodes.
+ * To create a node we can call method from AugeasTree which will create a node. In this method is
+ * parameter sequence, if we will leave this parameter empty and there will be more nodes with
+ * the same label, new node will be created but the method createNode will return node with index 0 resp 1.
+ * If that will happen we can not update the node anymore because we are updating wrong node.
+ * To avoid this situation we need to know what is the last sequence nr. of virtual host's child (directory) nodes.
+ * We can not just count child nodes with the same label because some of the child nodes
+ * could be stored in another file. So that in httpd configurationstructure they are child nodes of virtual host,
+ * but in augeas configuration structure they can be child nodes of node Include[];.
+ */
+
for (AugeasNode n : directories) {
- if (n.getSeq() > seq) {
- seq = n.getSeq();
+ String param = n.getFullPath();
+ int end = param.lastIndexOf(File.separatorChar);
+ if (end != -1)
+ if (myNode.getFullPath().equals(param.substring(0,end)))
+ seq++;
}
- }
- seq++;
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, seq));
+ //pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, seq));
//we don't support this yet... need to figure out how...
pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.REGEXP_PROP, false));
-
- //set the resource key and name
String dirNameToSet = AugeasNodeValueUtil.escape(directoryName);
- report.setResourceKey(dirNameToSet + "|" + seq);
- report.setResourceName(directoryName);
-
+
//now actually create the data in augeas
try {
ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
@@ -278,6 +289,12 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
mapping.updateAugeas(directoryNode, resourceConfiguration, resourceType.getResourceConfigurationDefinition());
tree.save();
+
+ tree = getServerConfigurationTree();
+ String key = AugeasNodeSearch.getNodeKey(myNode, directoryNode);
+ report.setResourceKey(key);
+ report.setResourceName(directoryName);
+
report.setStatus(CreateResourceStatus.SUCCESS);
resourceContext.getParentResourceComponent().finishChildResourceCreate(report);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java
index fb868c1..6c3a362 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java
@@ -8,6 +8,14 @@ import org.rhq.augeas.node.AugeasNode;
public class AugeasNodeSearch {
public static String [] NESTED_DIRECTIVES = {"<IfModule","<Directive","<VirtualHost","<Files"};
+ /**
+ * Searches for all nodes in parent nodes's subtree which matches specified criteria.
+ *
+ * @param parentNodeNames
+ * @param nodeName
+ * @param startNode
+ * @return
+ */
public static List<AugeasNode> searchNode(String [] parentNodeNames,String nodeName,AugeasNode startNode){
List<AugeasNode> nodes = new ArrayList<AugeasNode>();
search(nodes,parentNodeNames,startNode,nodeName);
@@ -67,23 +75,106 @@ public class AugeasNodeSearch {
pNode = pNode.getParentNode();
}
return res;
- }
+ }
+
+ /**
+ * Returns all params of node as one string.
+ * @param nd
+ * @return
+ */
+ public static String getNodeParamString(AugeasNode nd){
+ List<AugeasNode> childNodes = nd.getChildByLabel("param");
+ StringBuilder str = new StringBuilder();
+ for (AugeasNode paramNode : childNodes){
+ str.append(paramNode.getValue());
+ }
+ return str.toString();
+ }
- public static String getParamsString(AugeasNode node,AugeasNode parentNode){
- StringBuffer str = new StringBuffer();
+ /**
+ * If there is a more nodes which have the same node name and the same value of parameters than we need index
+ * for identification of Node.
+ *
+ * @param node
+ * @return
+ */
+ public static int getNodeIndex(AugeasNode node){
+ List<AugeasNode> nodes = node.getParentNode().getChildByLabel(node.getLabel());
+ String param = getNodeParamString(node);
+ int index = 1;
+
+ for(AugeasNode nd:nodes){
+ if (getNodeParamString(nd).equals(param)){
+ if (node.equals(nd))
+ return index;
+ else
+ index++;
+ }
+ }
+ return index;
+ }
+ /**
+ * Returns the unique identifier of node. By this string we can identify node from parentNode's child nodes.
+ * @param node
+ * @return
+ */
+ public static String getNodeKeyFromParent(AugeasNode node){
+
+ String param = getNodeParamString(node);
+ int index = getNodeIndex(node);
+ return (node.getLabel()+"|"+param+"|"+String.valueOf(index)+";");
+
+ }
+ /**
+ * Returns the unique identifier of node. By this string we can identify the node in parent node's subtree.
+ * @param node
+ * @param parentNode
+ * @return
+ */
+ public static String getNodeKey(AugeasNode node,AugeasNode parentNode){
AugeasNode pNode = node;
- while (!pNode.equals(parentNode))
- {
- List<AugeasNode> paramNodes = pNode.getChildByLabel("param");
- for (AugeasNode param : paramNodes){
- str.append(param.getValue()+";");
- }
+ StringBuilder str = new StringBuilder();
+ while (pNode!=null & !pNode.equals(parentNode))
+ {
+ str.append(getNodeKeyFromParent(pNode));
pNode = pNode.getParentNode();
- }
-
+ }
return str.toString();
- }
+ }
+ public static AugeasNode findNodeById(AugeasNode parentNode,String params){
+
+ AugeasNode tempNode=parentNode;
+ String [] ids = params.split(";");
+ for (int i=ids.length-1;i>=0;i--){
+ tempNode = getNodeFromParentById(tempNode,ids[i]);
+ }
+ return tempNode;
+ }
+ public static AugeasNode getNodeFromParentById(AugeasNode parentNode,String params){
+ String nodeName;
+ String parameters;
+ int index=1;
+
+ String [] paramsArray = params.split("\\|");
+ if (paramsArray.length != 3)
+ throw new RuntimeException("Node with id "+params +" was not found.");
+
+ nodeName = paramsArray[0];
+ parameters = paramsArray[1];
+
+ index = Integer.valueOf(paramsArray[2]);
+
+ for (AugeasNode nd : parentNode.getChildByLabel(nodeName)){
+ String ndParam = getNodeKeyFromParent(nd);
+ if (ndParam.equals(params+";")){
+ return nd;
+ }
+ }
+
+ throw new RuntimeException("Searched node with id " + params+ " was not found.");
+ }
}
+
commit 3cd07e721647fe867b55d8b7fb6c62549d068b58
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 12 08:56:54 2010 -0400
Replacing hard-coded database name with property substitution to reduce places it needs to be changed
diff --git a/pom.xml b/pom.xml
index 88b73ce..4cb37a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,8 @@
defaults for datasource used by integration tests -
these may be overridden in ~/.m2/settings.xml
-->
- <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.test.ds.connection-url>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.test.ds.db-name}</rhq.test.ds.connection-url>
<rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
<rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
<rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
@@ -97,7 +98,6 @@
<rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
<rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
<rhq.test.ds.port>5432</rhq.test.ds.port>
- <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
<rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
<rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
<rhq.test.quartz.selectWithLockSQL>
@@ -109,7 +109,8 @@
defaults for datasource used by the dev container build (see dev docs on the 'dev' profile) -
these may be overridden in ~/.m2/settings.xml
-->
- <rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqdev</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.db-name>rhqdev</rhq.dev.ds.db-name>
+ <rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.dev.ds.db-name}</rhq.dev.ds.connection-url>
<rhq.dev.ds.driver-class>org.postgresql.Driver</rhq.dev.ds.driver-class>
<rhq.dev.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.dev.ds.xa-datasource-class>
<rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
@@ -118,7 +119,6 @@
<rhq.dev.ds.type-mapping>PostgreSQL</rhq.dev.ds.type-mapping>
<rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
<rhq.dev.ds.port>5432</rhq.dev.ds.port>
- <rhq.dev.ds.db-name>rhqdev</rhq.dev.ds.db-name>
<rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.dev.ds.hibernate-dialect>
<rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.dev.quartz.driverDelegateClass>
<rhq.dev.quartz.selectWithLockSQL>
commit bbee6ede84ea2ac5db0c380d195497e2ded79060
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 12 12:36:45 2010 +0200
Parametrize the driver class too to use the -Ddb switch
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 72b7c30..2cb1b2d 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -95,7 +95,7 @@
db = project.properties.db
if (db == 'dev') {
- database = project.properties['rhq.dev.ds.db-name']
+ database = project.properties['rhq.dev.ds.db-name']
} else {
database = project.properties['rhq.test.ds.db-name']
}
@@ -251,6 +251,10 @@
<equals arg1="${db}" arg2="dev"/>
</condition>
+ <condition property="rhq.ds.driver-class" value="${rhq.dev.ds.driver-class}" else="${rhq.test.ds.driver-class}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -264,7 +268,7 @@
<property name="rhq.ds.password" value="${rhq.ds.password}" />
<property name="project.version" value="${project.version}" />
<property name="db.schema.version" value="${db.schema.version}" />
- <property name="rhq.ds.driver-class" value="${rhq.test.ds.driver-class}" />
+ <property name="rhq.ds.driver-class" value="${rhq.ds.driver-class}" />
<property name="dbsetup-do-not-check-schema" value="${dbsetup-do-not-check-schema}" />
</ant>
</tasks>
commit 5e7c7fd4723d62dec969438a5c64d040e0e911b0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed May 12 11:42:16 2010 +0200
Be more verbose about the used connection parameters.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index d5be746..c0b9276 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -13,7 +13,7 @@ To run the default target, you must set one of the following properties to true:
<project name="dbsetup" default="dbsetup-only-if-do-dbsetup" basedir="..\..\..">
- <!-- set the do-dbsetup-X property to indicate what needs to be done -->
+ <!-- set the do-dbsetup-X property to indicate what needs to be done -->
<condition property="do-dbsetup-setup">
<equals arg1="${dbsetup}" arg2="true"/>
</condition>
@@ -31,7 +31,7 @@ To run the default target, you must set one of the following properties to true:
<equals arg1="${dbsetup-do-not-check-schema}" arg2="true"/>
</not>
</condition>
-
+
<!-- load in the development environment properties - used as replacements for the @@@ strings in the dbsetup xml files -->
<property file="${basedir}/src/main/scripts/dbsetup.properties"/>
@@ -49,7 +49,7 @@ To run the default target, you must set one of the following properties to true:
<property name="jar.dbsetup.combined.schema" value="${jar.dbsetup.output.dir}/db-schema-combined.xml" />
<property name="jar.dbsetup.combined.data" value="${jar.dbsetup.output.dir}/db-data-combined.xml" />
<property name="jar.dbupgrade.file" value="${jar.dbsetup.output.dir}/db-upgrade.xml" />
-
+
<!-- define our custom ANT tasks -->
<target name="dbsetup-init-taskdefs"
unless="dbsetup-init-taskdefs.notrequired">
@@ -60,10 +60,10 @@ To run the default target, you must set one of the following properties to true:
<pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/>
<pathelement location="${settings.localRepository}/net/sourceforge/jtds/jtds/${jtds.version}/jtds-${jtds.version}.jar"/>
</path>
- <property name="full.task.classpath.property" refid="full.task.classpath" />
-
+ <property name="full.task.classpath.property" refid="full.task.classpath" />
+
<echo message="Task Classpath: ${full.task.classpath.property}"/>
-
+
<taskdef resource="db-ant-tasks.properties">
<classpath refid="full.task.classpath" />
</taskdef>
@@ -74,7 +74,7 @@ To run the default target, you must set one of the following properties to true:
<target name="dbsetup-init"
depends="dbsetup-init-taskdefs"
unless="dbsetup-init.notrequired">
-
+
<delete file="${dbsetup.output.dir}/dbsetup-${rhq.ds.type-mapping}-install.log" />
<echo message="Database: ${rhq.ds.type-mapping}" />
@@ -123,24 +123,24 @@ To run the default target, you must set one of the following properties to true:
<sysproperty key="i18nlog.log-locale-is-default" value="true" />
</dbsetup-cat>
- <!-- these need to be replaced for all copies of the combined files -->
+ <!-- these need to be replaced for all copies of the combined files -->
<replace file="${dbsetup.combined.data}">
<replacefilter token="@@@SERVER_VERSION@@@" value="${project.version}"/>
<replacefilter token="@@@DB_SCHEMA_VERSION@@@" value="${db.schema.version}"/>
</replace>
-
+
<!-- copy the combined files to the jar; note that in those jar copies, -->
- <!-- we do not replace the other replacement strings, the installer will do that -->
- <copy file="${dbsetup.combined.data}" tofile="${jar.dbsetup.combined.data}" />
- <copy file="${dbsetup.combined.schema}" tofile="${jar.dbsetup.combined.schema}" />
- <copy file="${dbsetup.scripts.dir}/../dbupgrade/db-upgrade.xml" tofile="${jar.dbupgrade.file}" />
-
+ <!-- we do not replace the other replacement strings, the installer will do that -->
+ <copy file="${dbsetup.combined.data}" tofile="${jar.dbsetup.combined.data}" />
+ <copy file="${dbsetup.combined.schema}" tofile="${jar.dbsetup.combined.schema}" />
+ <copy file="${dbsetup.scripts.dir}/../dbupgrade/db-upgrade.xml" tofile="${jar.dbupgrade.file}" />
+
<touch file="${dbsetup.tstamp.file}"/>
</target>
<!-- This replaces @@@ tokens found in the DBSetup XML files with their respective custom settings -->
- <!-- Note this is only done in our development builds - the installer will do its own replacements -->
- <!-- If you add new/remove replacement @@@ tokens, you must modify the installer class ServerInformation -->
+ <!-- Note this is only done in our development builds - the installer will do its own replacements -->
+ <!-- If you add new/remove replacement @@@ tokens, you must modify the installer class ServerInformation -->
<target name="dbsetup-replace" depends="dbsetup-combine">
<replace file="${dbsetup.combined.schema}">
@@ -209,7 +209,7 @@ To run the default target, you must set one of the following properties to true:
depends="dbsetup-init,dbsetup-replace"
description="Exports the schema info and its data - for informational purposes only; cannot be reimported">
- <echo>Exporting schema to file ${dbsetup.output.dir}/db-export.xml ...</echo>
+ <echo>Exporting schema to file ${dbsetup.output.dir}/db-export.xml ...</echo>
<dbsetup xmlFile="${dbsetup.output.dir}/db-export.xml"
jdbcUrl="${rhq.ds.connection-url}"
jdbcUser="${rhq.ds.user-name}"
@@ -218,7 +218,7 @@ To run the default target, you must set one of the following properties to true:
<sysproperty key="i18nlog.dump-keys" value="false" />
<sysproperty key="i18nlog.log-locale-is-default" value="true" />
<sysproperty key="jdbcLogSqlOnly" value="true" />
- </dbsetup>
+ </dbsetup>
</target>
<!-- This target is used via antcall by other targets in this script. The params expected are:
@@ -230,7 +230,7 @@ To run the default target, you must set one of the following properties to true:
-->
<target name="dbsetup-process-file" depends="dbsetup-init-taskdefs">
- <echo>Processing DBSetup file ${_xmlfile}...</echo>
+ <echo>Processing DBSetup file ${_xmlfile}...</echo>
<dbsetup xmlFile="${_xmlfile}"
jdbcUrl="${rhq.ds.connection-url}"
jdbcUser="${rhq.ds.user-name}"
@@ -240,7 +240,7 @@ To run the default target, you must set one of the following properties to true:
<sysproperty key="i18nlog.dump-keys" value="false" />
<sysproperty key="i18nlog.log-locale-is-default" value="true" />
<sysproperty key="jdbcLogSqlOnly" value="true" />
- </dbsetup>
+ </dbsetup>
</target>
<!-- the gateway to the main target - rhq-dbsetup-X properties control what actually is executed -->
@@ -249,7 +249,7 @@ To run the default target, you must set one of the following properties to true:
dbsetup-uninstall-only-if-prop-set,
dbsetup-upgrade-only-if-prop-set,
dbsetup-export-only-if-prop-set" />
-
+
<!-- these targets will trigger the appropriate dbsetup but only if a property of the same name as the target was set -->
<target name="dbsetup-only-if-prop-set" if="do-dbsetup-setup" >
<antcall target="dbsetup" />
@@ -288,7 +288,7 @@ To run the default target, you must set one of the following properties to true:
<property name="jdbc.password" value="${rhq.ds.password}"/>
<property name="target.schema.version" value="${target.schema.version}"/>
<property name="i18nlog.dump-keys" value="false" />
- <property name="i18nlog.log-locale-is-default" value="true" />
+ <property name="i18nlog.log-locale-is-default" value="true" />
</ant>
</target>
@@ -297,6 +297,9 @@ To run the default target, you must set one of the following properties to true:
description="Standalone target that checks an existing schema to see if it matches db.schema.version"
if="do-dbsetup-check-schema">
<echo>Querying the database to see if it is at db.schema.version=${db.schema.version} (pass -Ddbsetup-do-not-check-schema to skip this test)</echo>
+ <echo> Driver: ${rhq.ds.driver-class}</echo>
+ <echo> Url : ${rhq.ds.connection-url}</echo>
+ <echo> User : ${rhq.ds.user-name}</echo>
<sql driver="${rhq.ds.driver-class}"
url="${rhq.ds.connection-url}"
userid="${rhq.ds.user-name}"
@@ -310,7 +313,7 @@ To run the default target, you must set one of the following properties to true:
<pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/>
<pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/>
<pathelement location="${settings.localRepository}/net/sourceforge/jtds/jtds/${jtds.version}/jtds-${jtds.version}.jar"/>
- </classpath>
+ </classpath>
<transaction>
SELECT PROPERTY_VALUE FROM RHQ_SYSTEM_CONFIG WHERE PROPERTY_KEY='DB_SCHEMA_VERSION'
</transaction>
commit 549e9b6dc815964be25602c00d0ae376e58dd654
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 21:53:41 2010 -0400
Adding back data source build properties in root pom and restoring property resolution code in dbutils/pom.xml
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 061dc63..7356d08 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -23,26 +23,6 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
<db.schema.version>2.85</db.schema.version>
-
- <!--
- The rhq.db property determines which database profile to use. Possible
- values include dev, test, upgrade
- -->
- <rhq.db>dev</rhq.db>
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.db.name}</rhq.ds.connection-url>
- <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.ds.password>rhqadmin</rhq.ds.password>
- <rhq.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.ds.password.encrypted>
- <rhq.ds.type-mapping>PostgreSQL</rhq.ds.type-mapping>
- <rhq.ds.server-name>127.0.0.1</rhq.ds.server-name>
- <rhq.ds.port>5432</rhq.ds.port>
- <rhq.ds.db-name>rhqdev</rhq.ds.db-name>
- <rhq.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.ds.hibernate-dialect>
- <rhq.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.quartz.driverDelegateClass>
- <rhq.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.quartz.selectWithLockSQL>
- <rhq.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.quartz.lockHandlerClass>
</properties>
<dependencies>
@@ -113,14 +93,19 @@
return
}
- database = project.properties['rhq.db.name']
+ db = project.properties.db
+ if (db == 'dev') {
+ database = project.properties['rhq.dev.ds.db-name']
+ } else {
+ database = project.properties['rhq.test.ds.db-name']
+ }
project.properties.dbsetup = 'true'
sql = Sql.newInstance(
- "jdbc:postgresql://127.0.0.1:5432/postgres",
- "postgres",
- "postgres",
- "org.postgresql.Driver")
+ "jdbc:postgresql://127.0.0.1:5432/postgres",
+ "postgres",
+ "postgres",
+ "org.postgresql.Driver")
sql.execute("drop database if exists ${Sql.expand(database)};")
log.info("dropped database $database")
@@ -194,6 +179,29 @@
<phase>test</phase>
<configuration>
<tasks>
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <echo message="URL = ${rhq.test.ds.connection-url}"/>
+ <echo message="URL = ${rhq.ds.connection.url}"/>
+
+ <fail unless="rhq.dev.ds.connection-url" message="PROP NOT SET"/>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -224,6 +232,26 @@
<phase>process-classes</phase>
<configuration>
<tasks>
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <echo message="URL = ${rhq.ds.connection.url}"/>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -255,6 +283,24 @@
<phase>test</phase>
<configuration>
<tasks>
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -268,7 +314,7 @@
<property name="rhq.ds.password" value="${rhq.ds.password}" />
<property name="project.version" value="${project.version}" />
<property name="db.schema.version" value="${db.schema.version}" />
- <property name="rhq.ds.driver-class" value="${rhq.ds.driver-class}" />
+ <property name="rhq.ds.driver-class" value="${rhq.test.ds.driver-class}" />
<property name="dbsetup-do-not-check-schema" value="${dbsetup-do-not-check-schema}" />
</ant>
</tasks>
@@ -284,7 +330,7 @@
</profile>
<profile>
- <id>release</id>
+ <id>jon.release</id>
<activation>
<property>
<name>jon.release</name>
@@ -300,6 +346,24 @@
<phase>test</phase>
<configuration>
<tasks>
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+
+ <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
+ <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="create-release-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -382,6 +446,7 @@
</build>
</profile>
+ <!--
<profile>
<id>rhq-dev-db</id>
<activation>
@@ -421,6 +486,7 @@
<rhq.db.name>rhqupgrade</rhq.db.name>
</properties>
</profile>
+ -->
</profiles>
diff --git a/pom.xml b/pom.xml
index 624e373..88b73ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,47 @@
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.2</jna.version>
+ <!--
+ defaults for datasource used by integration tests -
+ these may be overridden in ~/.m2/settings.xml
+ -->
+ <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.test.ds.connection-url>
+ <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
+ <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
+ <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+ <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
+ <rhq.test.ds.port>5432</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
+ <rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
+ <rhq.test.quartz.selectWithLockSQL>
+ SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE
+ </rhq.test.quartz.selectWithLockSQL>
+ <rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+
+ <!--
+ defaults for datasource used by the dev container build (see dev docs on the 'dev' profile) -
+ these may be overridden in ~/.m2/settings.xml
+ -->
+ <rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqdev</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.driver-class>org.postgresql.Driver</rhq.dev.ds.driver-class>
+ <rhq.dev.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+ <rhq.dev.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.dev.ds.password.encrypted>
+ <rhq.dev.ds.type-mapping>PostgreSQL</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
+ <rhq.dev.ds.port>5432</rhq.dev.ds.port>
+ <rhq.dev.ds.db-name>rhqdev</rhq.dev.ds.db-name>
+ <rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.dev.ds.hibernate-dialect>
+ <rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.dev.quartz.driverDelegateClass>
+ <rhq.dev.quartz.selectWithLockSQL>
+ SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE
+ </rhq.dev.quartz.selectWithLockSQL>
+ <rhq.dev.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.dev.quartz.lockHandlerClass>
+
<!-- default port numbers for RHQ server -->
<rhq.server.http.port>7080</rhq.server.http.port>
<rhq.server.https.port>7443</rhq.server.https.port>
commit bc6b97e86581dfe360043605b3452cc161ddae05
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 20:38:55 2010 -0400
Updating property name from release to jon.release. This property is passed to the ant script
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 7fff27b..061dc63 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -313,7 +313,7 @@
<property name="rhq.ds.password" value="${rhq.ds.password}" />
<property name="project.version" value="${project.version}" />
<property name="db.schema.version" value="${db.schema.version}" />
- <property name="release" value="${release}"/>
+ <property name="jon.release" value="${jon.release}"/>
</ant>
</tasks>
</configuration>
commit 21241b990e92a60c5acae3f34e2ca106303593aa
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 20:38:04 2010 -0400
Changing property name from release to jon.release to be more descriptive
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index 32f1ed1..9df82ee 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -183,8 +183,8 @@ To run the default target, you must set one of the following properties to true:
<target name="create-release-schema" depends="dbsetup-init">
<fail unless="jon.release" message="The jon.release property must be set for this target"/>
- <property name="schema-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-schema-combined-${jon.release}.xml"/>
- <property name="data-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-data-combined-${jon.release}.xml"/>
+ <property name="schema-file" value="${basedir}/src/main/scripts/dbsetup/${jon.release}/db-schema-combined-${jon.release}.xml"/>
+ <property name="data-file" value="${basedir}/src/main/scripts/dbsetup/${jon.release}/db-data-combined-${jon.release}.xml"/>
<antcall target="dbsetup-process-file">
<param name="_xmlfile" value="${schema-file}"/>
commit 373cc70872d00a7001c57b902c723e7f44c110b8
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 20:33:04 2010 -0400
Changing activation policy so that the latest and release profiles are mutually exclusive and so that one is always activated.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index e5feb75..7fff27b 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -24,8 +24,6 @@
<scm.module.path>modules/core/dbutils/</scm.module.path>
<db.schema.version>2.85</db.schema.version>
- <dbutils.mode>latest</dbutils.mode>
-
<!--
The rhq.db property determines which database profile to use. Possible
values include dev, test, upgrade
@@ -161,10 +159,8 @@
<profile>
<id>latest</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
- <name>dbutils.mode</name>
- <value>latest</value>
+ <name>!jon.release</name>
</property>
</activation>
@@ -291,8 +287,7 @@
<id>release</id>
<activation>
<property>
- <name>dbutils.mode</name>
- <value>release</value>
+ <name>jon.release</name>
</property>
</activation>
<build>
@@ -411,21 +406,6 @@
</activation>
<properties>
<rhq.db.name>rhq</rhq.db.name>
- <!--
- <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.ds.connection-url>
- <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
- <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
- <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
- <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
- <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
- <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
- <rhq.test.ds.port>5432</rhq.test.ds.port>
- <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
- <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
- <rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
- <rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
- <rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
- -->
</properties>
</profile>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index 3ce8c7a..32f1ed1 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -181,10 +181,10 @@ To run the default target, you must set one of the following properties to true:
</target>
<target name="create-release-schema" depends="dbsetup-init">
- <fail unless="release" message="The release property must be set for this target"/>
+ <fail unless="jon.release" message="The jon.release property must be set for this target"/>
- <property name="schema-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-schema-combined-${release}.xml"/>
- <property name="data-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-data-combined-${release}.xml"/>
+ <property name="schema-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-schema-combined-${jon.release}.xml"/>
+ <property name="data-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-data-combined-${jon.release}.xml"/>
<antcall target="dbsetup-process-file">
<param name="_xmlfile" value="${schema-file}"/>
commit 3df263b5706d2b3351b39c87c99048c152b06d7a
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 16:23:07 2010 -0400
Changing version of plugin while debugging hudson issues
diff --git a/pom.xml b/pom.xml
index 753577f..624e373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -481,7 +481,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
+ <version>2.0.1</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
commit 08dac62e1390ad3e17ef3172fb72c8a89cd5d2fc
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 15:47:31 2010 -0400
Setting release property to be passed to ant script
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index de3c1e0..e5feb75 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -318,6 +318,7 @@
<property name="rhq.ds.password" value="${rhq.ds.password}" />
<property name="project.version" value="${project.version}" />
<property name="db.schema.version" value="${db.schema.version}" />
+ <property name="release" value="${release}"/>
</ant>
</tasks>
</configuration>
commit 42eb1d10775749e7282fd62e90cbf36a0e651e19
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 15:30:21 2010 -0400
Changing dbreset script to run in compile phase to guarentee that it runs before the dbsetup/upgrade tasks
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 2ca1737..de3c1e0 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -102,7 +102,7 @@
</dependencies>
<executions>
<execution>
- <phase>test</phase>
+ <phase>compile</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -115,14 +115,7 @@
return
}
- db = project.properties.db
- if (db == 'dev') {
- //database = project.properties['rhq.dev.ds.db-name']
database = project.properties['rhq.db.name']
- } else {
- database = project.properties['rhq.db.name']
- //database = project.properties['rhq.test.ds.db-name']
- }
project.properties.dbsetup = 'true'
sql = Sql.newInstance(
commit 1a29b788baaaef819420c2849984a12726d361aa
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 11 14:47:18 2010 -0400
Refactoring dbutils build to support building databases for earlier releases
Consolidated dbutils-related properties into a set of common properties and using profiles
to determine which database to use. Currently three database profiles are supported,
1. dev - dev container
2. test - automated tests
3. upgrade - testing an upgrade
The antrun plugin code in dbutils/pom.xml was moved into a profile and is run by default.
When building an upgrade database you will want to use another new profile, release which
is activating with -Ddbutils.mode=release. And specifiy the release as -Drelease=2.3.1
so the ant script can determine which scripts to use.
Adding a new target to dbsetup-build.xml for creating an upgrade database.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 72b7c30..2ca1737 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -23,6 +23,28 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
<db.schema.version>2.85</db.schema.version>
+
+ <dbutils.mode>latest</dbutils.mode>
+
+ <!--
+ The rhq.db property determines which database profile to use. Possible
+ values include dev, test, upgrade
+ -->
+ <rhq.db>dev</rhq.db>
+ <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/${rhq.db.name}</rhq.ds.connection-url>
+ <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
+ <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
+ <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
+ <rhq.ds.password>rhqadmin</rhq.ds.password>
+ <rhq.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.ds.password.encrypted>
+ <rhq.ds.type-mapping>PostgreSQL</rhq.ds.type-mapping>
+ <rhq.ds.server-name>127.0.0.1</rhq.ds.server-name>
+ <rhq.ds.port>5432</rhq.ds.port>
+ <rhq.ds.db-name>rhqdev</rhq.ds.db-name>
+ <rhq.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.ds.hibernate-dialect>
+ <rhq.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.quartz.driverDelegateClass>
+ <rhq.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.quartz.selectWithLockSQL>
+ <rhq.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.quartz.lockHandlerClass>
</properties>
<dependencies>
@@ -95,9 +117,11 @@
db = project.properties.db
if (db == 'dev') {
- database = project.properties['rhq.dev.ds.db-name']
+ //database = project.properties['rhq.dev.ds.db-name']
+ database = project.properties['rhq.db.name']
} else {
- database = project.properties['rhq.test.ds.db-name']
+ database = project.properties['rhq.db.name']
+ //database = project.properties['rhq.test.ds.db-name']
}
project.properties.dbsetup = 'true'
@@ -118,139 +142,130 @@
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <!-- generate the I18N resource bundles -->
- <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
-
- <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">
- <classpath refid="maven.runtime.classpath" />
- <classfileset dir="${project.build.outputDirectory}">
- <include name="**/*I18NResourceKeys.class" />
- </classfileset>
- </i18n>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>dbsetup-worker</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
-
- <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
-
- <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
- <property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
- <property name="postgresql.version" value="${postgresql.version}" />
- <property name="h2.version" value="${h2.version}" />
- <property name="jtds.version" value="${jtds.version}" />
- <property name="task.classpath.property" refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password" value="${rhq.ds.password}" />
- <property name="project.version" value="${project.version}" />
- <property name="db.schema.version" value="${db.schema.version}" />
- <property name="dbsetup" value="${dbsetup}" />
- <property name="dbsetup-uninstall" value="${dbsetup-uninstall}" />
- <property name="dbsetup-upgrade" value="${dbsetup-upgrade}" />
- <property name="dbsetup-export" value="${dbsetup-export}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>DatabaseTest.nofail</name>
+ <value>${DatabaseTest.nofail}</value>
+ </property>
+ <property>
+ <name>AntDatabaseTest.test-resources</name>
+ <value>${basedir}/src/test/resources</value>
+ </property>
+ </systemProperties>
+ <!-- The below is required for tests to run against Oracle. -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
- <execution>
- <id>generate-dbsetup-dbupgrade-xml-files</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
-
- <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
-
- <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
- <property name="settings.localRepository" value="${settings.localRepository}" />
- <property name="ojdbc5.version" value="${ojdbc5.version}" />
- <property name="postgresql.version" value="${postgresql.version}" />
- <property name="h2.version" value="${h2.version}" />
- <property name="jtds.version" value="${jtds.version}" />
- <property name="task.classpath.property" refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
- <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
- <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
- <property name="rhq.ds.password" value="${rhq.ds.password}" />
- <property name="project.version" value="${project.version}" />
- <property name="db.schema.version" value="${db.schema.version}" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ </plugins>
+ </build>
- <execution>
- <!--
- This execution will abort the build if the database schema is not up to date.
- If you want the build to continue, regardless of your currently installed schema,
- then pass -Ddbsetup-do-not-check-schema to the mvn command line.
- -->
- <id>test-db-schema-version</id>
- <phase>test</phase>
+ <profiles>
+ <profile>
+ <id>latest</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>dbutils.mode</name>
+ <value>latest</value>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- generate the I18N resource bundles -->
+ <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />
+
+ <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true">
+ <classpath refid="maven.runtime.classpath" />
+ <classfileset dir="${project.build.outputDirectory}">
+ <include name="**/*I18NResourceKeys.class" />
+ </classfileset>
+ </i18n>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>dbsetup-worker</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+ <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="postgresql.version" value="${postgresql.version}" />
+ <property name="h2.version" value="${h2.version}" />
+ <property name="jtds.version" value="${jtds.version}" />
+ <property name="task.classpath.property" refid="maven.test.classpath" />
+ <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password" value="${rhq.ds.password}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="db.schema.version" value="${db.schema.version}" />
+ <property name="dbsetup" value="${dbsetup}" />
+ <property name="dbsetup-uninstall" value="${dbsetup-uninstall}" />
+ <property name="dbsetup-upgrade" value="${dbsetup-upgrade}" />
+ <property name="dbsetup-export" value="${dbsetup-export}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>generate-dbsetup-dbupgrade-xml-files</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine">
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+ <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="postgresql.version" value="${postgresql.version}" />
+ <property name="h2.version" value="${h2.version}" />
+ <property name="jtds.version" value="${jtds.version}" />
+ <property name="task.classpath.property" refid="maven.test.classpath" />
+ <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password" value="${rhq.ds.password}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="db.schema.version" value="${db.schema.version}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <!--
+ This execution will abort the build if the database schema is not up to date.
+ If you want the build to continue, regardless of your currently installed schema,
+ then pass -Ddbsetup-do-not-check-schema to the mvn command line.
+ -->
+ <id>test-db-schema-version</id>
+ <phase>test</phase>
<configuration>
<tasks>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
-
- <condition property="rhq.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" else="${rhq.test.ds.type-mapping}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.connection-url" value="${rhq.dev.ds.connection-url}" else="${rhq.test.ds.connection-url}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.user-name" value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
- <condition property="rhq.ds.password" value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
- <equals arg1="${db}" arg2="dev"/>
- </condition>
-
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema">
<property name="settings.localRepository" value="${settings.localRepository}" />
<property name="ojdbc5.version" value="${ojdbc5.version}" />
@@ -264,7 +279,7 @@
<property name="rhq.ds.password" value="${rhq.ds.password}" />
<property name="project.version" value="${project.version}" />
<property name="db.schema.version" value="${db.schema.version}" />
- <property name="rhq.ds.driver-class" value="${rhq.test.ds.driver-class}" />
+ <property name="rhq.ds.driver-class" value="${rhq.ds.driver-class}" />
<property name="dbsetup-do-not-check-schema" value="${dbsetup-do-not-check-schema}" />
</ant>
</tasks>
@@ -273,34 +288,55 @@
<goal>run</goal>
</goals>
</execution>
-
</executions>
</plugin>
+ </plugins>
+ </build>
+ </profile>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>DatabaseTest.nofail</name>
- <value>${DatabaseTest.nofail}</value>
- </property>
+ <profile>
+ <id>release</id>
+ <activation>
<property>
- <name>AntDatabaseTest.test-resources</name>
- <value>${basedir}/src/test/resources</value>
- </property>
- </systemProperties>
- <!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElements>
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <profiles>
+ <name>dbutils.mode</name>
+ <value>release</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-schema</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="create-release-schema">
+ <property name="settings.localRepository" value="${settings.localRepository}" />
+ <property name="ojdbc5.version" value="${ojdbc5.version}" />
+ <property name="postgresql.version" value="${postgresql.version}" />
+ <property name="h2.version" value="${h2.version}" />
+ <property name="jtds.version" value="${jtds.version}" />
+ <property name="task.classpath.property" refid="maven.test.classpath" />
+ <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url" value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name" value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password" value="${rhq.ds.password}" />
+ <property name="project.version" value="${project.version}" />
+ <property name="db.schema.version" value="${db.schema.version}" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>dev</id>
@@ -357,6 +393,61 @@
</build>
</profile>
+ <profile>
+ <id>rhq-dev-db</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>rhq.db</name>
+ <value>dev</value>
+ </property>
+ </activation>
+ <properties>
+ <rhq.db.name>rhqdev</rhq.db.name>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>rhq-test-db</id>
+ <activation>
+ <property>
+ <name>rhq.db</name>
+ <value>test</value>
+ </property>
+ </activation>
+ <properties>
+ <rhq.db.name>rhq</rhq.db.name>
+ <!--
+ <rhq.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.ds.connection-url>
+ <rhq.ds.driver-class>org.postgresql.Driver</rhq.ds.driver-class>
+ <rhq.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.ds.xa-datasource-class>
+ <rhq.ds.user-name>rhqadmin</rhq.ds.user-name>
+ <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
+ <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
+ <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
+ <rhq.test.ds.port>5432</rhq.test.ds.port>
+ <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
+ <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
+ <rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
+ <rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
+ <rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+ -->
+ </properties>
+ </profile>
+
+ <profile>
+ <id>rhq-upgrade-db</id>
+ <activation>
+ <property>
+ <name>rhq.db</name>
+ <value>upgrade</value>
+ </property>
+ </activation>
+ <properties>
+ <rhq.db.name>rhqupgrade</rhq.db.name>
+ </properties>
+ </profile>
+
</profiles>
</project>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index d5be746..3ce8c7a 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -172,7 +172,7 @@ To run the default target, you must set one of the following properties to true:
<target name="dbsetup-create-schema"
depends="dbsetup-init,dbsetup-replace"
description="Initialize the database schema but not the data - assumes the schema does not yet exist">
-
+
<antcall target="dbsetup-process-file">
<param name="_xmlfile" value="${dbsetup.combined.schema}"/>
<param name="_dataonly" value="false"/>
@@ -180,6 +180,25 @@ To run the default target, you must set one of the following properties to true:
</antcall>
</target>
+ <target name="create-release-schema" depends="dbsetup-init">
+ <fail unless="release" message="The release property must be set for this target"/>
+
+ <property name="schema-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-schema-combined-${release}.xml"/>
+ <property name="data-file" value="${basedir}/src/main/scripts/dbsetup/${release}/db-data-combined-${release}.xml"/>
+
+ <antcall target="dbsetup-process-file">
+ <param name="_xmlfile" value="${schema-file}"/>
+ <param name="_dataonly" value="false"/>
+ <param name="_uninstall" value="false"/>
+ </antcall>
+
+ <antcall target="dbsetup-process-file">
+ <param name="_xmlfile" value="${data-file}"/>
+ <param name="_dataonly" value="true"/>
+ <param name="_uninstall" value="false"/>
+ </antcall>
+ </target>
+
<!-- Inserts the dbsetup data. Assumes the schema already exists. -->
<target name="dbsetup-data"
depends="dbsetup-init,dbsetup-replace"
@@ -329,4 +348,4 @@ To run the default target, you must set one of the following properties to true:
</condition>
</fail>
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-data-combined-2.3.1.xml b/modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-data-combined-2.3.1.xml
new file mode 100644
index 0000000..7d83798
--- /dev/null
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-data-combined-2.3.1.xml
@@ -0,0 +1,663 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dbsetup name="data.xml">
+<!-- BEGIN: rhq-data.xml -->
+<!-- BEGIN: auth-data.xml -->
+
+
+ <table name="RHQ_PRINCIPAL">
+ <data id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
+ </table>
+
+<!-- END: auth-data.xml -->
+<!-- BEGIN: authz-data.xml -->
+
+
+ <!-- the overlord user -->
+ <table name="RHQ_SUBJECT">
+ <data ID="1"
+ NAME="admin"
+ FIRST_NAME="Super"
+ LAST_NAME="User"
+ FSYSTEM="TRUE"/>
+ </table>
+
+ <!-- the initial rhqadmin user -->
+ <table name="RHQ_SUBJECT">
+ <data ID="2"
+ NAME="rhqadmin"
+ FIRST_NAME="RHQ"
+ LAST_NAME="Administrator"
+ EMAIL_ADDRESS="rhqadmin@localhost"
+ FSYSTEM="FALSE"/>
+ </table>
+
+ <!-- Define the system root role which includes our overlord and rhqadmin users -->
+ <table name="RHQ_ROLE">
+ <data ID="1"
+ NAME="Super User Role"
+ FSYSTEM="TRUE"
+ DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
+ <data ID="2"
+ NAME="All Resources Role"
+ FSYSTEM="FALSE"
+ DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
+ </table>
+
+ <!-- associate the root users with all security permissions -->
+ <table name="RHQ_SUBJECT_ROLE_MAP">
+ <data SUBJECT_ID="1" ROLE_ID="1"/>
+ <!-- overlord user -->
+ <data SUBJECT_ID="2" ROLE_ID="1"/>
+ <!-- rhqadmin user -->
+ </table>
+
+ <table name="RHQ_PERMISSION">
+ <!-- give super-user-role all permissions (resource perms is mainly just to show on view-role page) -->
+ <data ROLE_ID="1" OPERATION="0"/>
+ <!-- Permission.MANAGE_SECURITY -->
+ <data ROLE_ID="1" OPERATION="1"/>
+ <!-- Permission.MANAGE_INVENTORY -->
+ <data ROLE_ID="1" OPERATION="2"/>
+ <!-- Permission.MANAGE_SETTINGS -->
+ <!-- resource permissions start here-->
+ <data ROLE_ID="1" OPERATION="3"/>
+ <!-- Permission.VIEW_RESOURCE -->
+ <data ROLE_ID="1" OPERATION="4"/>
+ <!-- Permission.MODIFY_RESOURCE -->
+ <data ROLE_ID="1" OPERATION="5"/>
+ <!-- Permission.DELETE_RESOURCE -->
+ <data ROLE_ID="1" OPERATION="6"/>
+ <!-- Permission.CREATE_CHILD_RESOURCES -->
+ <data ROLE_ID="1" OPERATION="7"/>
+ <!-- Permission.MANAGE_ALERTS -->
+ <data ROLE_ID="1" OPERATION="8"/>
+ <!-- Permission.MANAGE_MEASUREMENTS -->
+ <data ROLE_ID="1" OPERATION="9"/>
+ <!-- Permission.MANAGE_CONTENT -->
+ <data ROLE_ID="1" OPERATION="10"/>
+ <!-- Permission.CONTROL -->
+ <data ROLE_ID="1" OPERATION="11"/>
+ <!-- Permission.CONFIGURE -->
+
+ <!-- give all-resources-role all permissions (resource perms is mainly just to show on view-role page) -->
+ <data ROLE_ID="2" OPERATION="1"/>
+ <!-- Permission.MANAGE_INVENTORY -->
+ <!-- resource permissions start here-->
+ <data ROLE_ID="2" OPERATION="3"/>
+ <!-- Permission.VIEW_RESOURCE -->
+ <data ROLE_ID="2" OPERATION="4"/>
+ <!-- Permission.MODIFY_RESOURCE -->
+ <data ROLE_ID="2" OPERATION="5"/>
+ <!-- Permission.DELETE_RESOURCE -->
+ <data ROLE_ID="2" OPERATION="6"/>
+ <!-- Permission.CREATE_CHILD_RESOURCES -->
+ <data ROLE_ID="2" OPERATION="7"/>
+ <!-- Permission.MANAGE_ALERTS -->
+ <data ROLE_ID="2" OPERATION="8"/>
+ <!-- Permission.MANAGE_MEASUREMENTS -->
+ <data ROLE_ID="2" OPERATION="9"/>
+ <!-- Permission.MANAGE_CONTENT -->
+ <data ROLE_ID="2" OPERATION="10"/>
+ <!-- Permission.CONTROL -->
+ <data ROLE_ID="2" OPERATION="11"/>
+ <!-- Permission.CONFIGURE -->
+ </table>
+
+<!-- END: authz-data.xml -->
+<!-- BEGIN: sysconfig-data.xml -->
+
+
+ <!--
+ This file contains the seed data for the configuration table.
+ All keys mentioned here should be referenced via the RHQConstants class
+ -->
+ <table name="RHQ_SYSTEM_CONFIG">
+ <data ID="1" PROPERTY_KEY="SERVER_VERSION" PROPERTY_VALUE="1.3.1.GA"
+ DEFAULT_PROPERTY_VALUE="1.3.1.GA" FREAD_ONLY="TRUE"/>
+ <data ID="2" PROPERTY_KEY="DB_SCHEMA_VERSION" PROPERTY_VALUE="2.59"
+ DEFAULT_PROPERTY_VALUE="2.59" FREAD_ONLY="TRUE"/>
+ <data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="JDBC"
+ DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
+ <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://169.254.222.60:7080/"
+ DEFAULT_PROPERTY_VALUE="http://169.254.222.60:7080/" FREAD_ONLY="FALSE"/>
+ <data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
+ DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
+ <data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
+ DEFAULT_PROPERTY_VALUE="user" FREAD_ONLY="FALSE"/>
+
+ <!-- default LDAP configuration options -->
+ <data ID="11" PROPERTY_KEY="CAM_LDAP_NAMING_FACTORY_INITIAL"
+ PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
+ DEFAULT_PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
+ FREAD_ONLY="FALSE"/>
+ <data ID="12" PROPERTY_KEY="CAM_LDAP_NAMING_PROVIDER_URL"
+ PROPERTY_VALUE="ldap://localhost/"
+ DEFAULT_PROPERTY_VALUE="ldap://localhost/"
+ FREAD_ONLY="FALSE"/>
+ <data ID="13" PROPERTY_KEY="CAM_LDAP_LOGIN_PROPERTY"
+ PROPERTY_VALUE="cn"
+ DEFAULT_PROPERTY_VALUE="cn" FREAD_ONLY="FALSE"/>
+ <data ID="14" PROPERTY_KEY="CAM_LDAP_BASE_DN"
+ PROPERTY_VALUE="o=JBoss,c=US"
+ DEFAULT_PROPERTY_VALUE="o=JBoss,c=US"
+ FREAD_ONLY="FALSE"/>
+ <data ID="15" PROPERTY_KEY="CAM_LDAP_BIND_DN"
+ PROPERTY_VALUE=""
+ DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="16" PROPERTY_KEY="CAM_LDAP_BIND_PW"
+ PROPERTY_VALUE=""
+ DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="17" PROPERTY_KEY="CAM_LDAP_PROTOCOL"
+ PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="18" PROPERTY_KEY="CAM_LDAP_FILTER"
+ PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+
+ <!-- Does this build support Syslog actions? -->
+ <data ID="21" PROPERTY_KEY="CAM_SYSLOG_ACTIONS_ENABLED"
+ PROPERTY_VALUE="false" DEFAULT_PROPERTY_VALUE="false"
+ FREAD_ONLY="FALSE"/>
+ <data ID="23" PROPERTY_KEY="CAM_GUIDE_ENABLED"
+ PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+ <data ID="24" PROPERTY_KEY="CAM_RT_COLLECT_IP_ADDRS"
+ PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+
+ <!-- Default data storage options -->
+ <!-- Default 14 days -->
+ <data ID="26" PROPERTY_KEY="CAM_DATA_PURGE_1H"
+ PROPERTY_VALUE="1209600000" DEFAULT_PROPERTY_VALUE="1209600000"
+ FREAD_ONLY="FALSE"/>
+ <!-- Default 31 days -->
+ <data ID="27" PROPERTY_KEY="CAM_DATA_PURGE_6H"
+ PROPERTY_VALUE="2678400000" DEFAULT_PROPERTY_VALUE="2678400000"
+ FREAD_ONLY="FALSE"/>
+ <!-- Default 1 year -->
+ <data ID="28" PROPERTY_KEY="CAM_DATA_PURGE_1D"
+ PROPERTY_VALUE="31536000000" DEFAULT_PROPERTY_VALUE="31536000000"
+ FREAD_ONLY="FALSE"/>
+
+ <!-- Baseline options -->
+ <!-- How often to calculate, default 3 days; if 0, never calculate them automatically -->
+ <data ID="29" PROPERTY_KEY="CAM_BASELINE_FREQUENCY"
+ PROPERTY_VALUE="259200000" DEFAULT_PROPERTY_VALUE="259200000"
+ FREAD_ONLY="FALSE"/>
+ <!-- How much data to include in the calulation, default 7 days -->
+ <data ID="30" PROPERTY_KEY="CAM_BASELINE_DATASET"
+ PROPERTY_VALUE="604800000" DEFAULT_PROPERTY_VALUE="604800000"
+ FREAD_ONLY="FALSE"/>
+
+ <!-- ID 31 has been deleted -->
+
+ <!-- How often to run database maintainence routines -->
+ <data ID="32" PROPERTY_KEY="CAM_DATA_MAINTENANCE"
+ PROPERTY_VALUE="3600000" DEFAULT_PROPERTY_VALUE="3600000" FREAD_ONLY="FALSE"/>
+
+ <!-- How long to keep RT data around -->
+ <data ID="34" PROPERTY_KEY="RT_DATA_PURGE" PROPERTY_VALUE="2678400000"
+ DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
+
+ <!-- Whether to reindex the data tables nightly -->
+ <data ID="35" PROPERTY_KEY="DATA_REINDEX_NIGHTLY" PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+
+ <!-- How long to keep alerts around -->
+ <data ID="36" PROPERTY_KEY="ALERT_PURGE" PROPERTY_VALUE="2678400000"
+ DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
+
+ <!-- Determines if SNMP actions will be used -->
+ <data ID="37" PROPERTY_KEY="SNMP_VERSION" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="38" PROPERTY_KEY="SNMP_AUTH_PROTOCOL" PROPERTY_VALUE="MD5" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="39" PROPERTY_KEY="SNMP_AUTH_PASSPHRASE" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="40" PROPERTY_KEY="SNMP_PRIV_PASSPHRASE" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="41" PROPERTY_KEY="SNMP_COMMUNITY" PROPERTY_VALUE="public" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="42" PROPERTY_KEY="SNMP_ENGINE_ID" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="43" PROPERTY_KEY="SNMP_CONTEXT_NAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="44" PROPERTY_KEY="SNMP_SECURITY_NAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="45" PROPERTY_KEY="SNMP_TRAP_OID" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="46" PROPERTY_KEY="SNMP_ENTERPRISE_OID" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="47" PROPERTY_KEY="SNMP_GENERIC_ID" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="48" PROPERTY_KEY="SNMP_SPECIFIC_ID" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="49" PROPERTY_KEY="SNMP_AGENT_ADDRESS" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="50" PROPERTY_KEY="SNMP_PRIVACY_PROTOCOL" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+
+ <!-- How long to keep events around (1209600000 millis == 14 days) -->
+ <data ID="51" PROPERTY_KEY="EVENT_PURGE" PROPERTY_VALUE="1209600000"
+ DEFAULT_PROPERTY_VALUE="1209600000" FREAD_ONLY="FALSE"/>
+
+ <!-- How long an agent is allowed to be quiet before we consider it down and backfill it -->
+ <data ID="52" PROPERTY_KEY="AGENT_MAX_QUIET_TIME_ALLOWED" PROPERTY_VALUE="900000"
+ DEFAULT_PROPERTY_VALUE="900000" FREAD_ONLY="FALSE"/>
+
+ <!-- Will our server-cloud support agents auto-updating themselves? -->
+ <data ID="53" PROPERTY_KEY="ENABLE_AGENT_AUTO_UPDATE" PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+
+ <!-- How old does a trait have to be in order to get purged -->
+ <data ID="54" PROPERTY_KEY="TRAIT_PURGE" PROPERTY_VALUE="31536000000"
+ DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
+
+ <!-- How old does availability have to be in order to get purged -->
+ <data ID="55" PROPERTY_KEY="AVAILABILITY_PURGE" PROPERTY_VALUE="31536000000"
+ DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
+
+ </table>
+
+<!-- END: sysconfig-data.xml -->
+<!-- BEGIN: measurement-data.xml -->
+
+ <table name="RHQ_NUMBERS">
+ <data i="0"/>
+ <data i="1"/>
+ <data i="2"/>
+ <data i="3"/>
+ <data i="4"/>
+ <data i="5"/>
+ <data i="6"/>
+ <data i="7"/>
+ <data i="8"/>
+ <data i="9"/>
+ <data i="10"/>
+ <data i="11"/>
+ <data i="12"/>
+ <data i="13"/>
+ <data i="14"/>
+ <data i="15"/>
+ <data i="16"/>
+ <data i="17"/>
+ <data i="18"/>
+ <data i="19"/>
+ <data i="20"/>
+ <data i="21"/>
+ <data i="22"/>
+ <data i="23"/>
+ <data i="24"/>
+ <data i="25"/>
+ <data i="26"/>
+ <data i="27"/>
+ <data i="28"/>
+ <data i="29"/>
+ <data i="30"/>
+ <data i="31"/>
+ <data i="32"/>
+ <data i="33"/>
+ <data i="34"/>
+ <data i="35"/>
+ <data i="36"/>
+ <data i="37"/>
+ <data i="38"/>
+ <data i="39"/>
+ <data i="40"/>
+ <data i="41"/>
+ <data i="42"/>
+ <data i="43"/>
+ <data i="44"/>
+ <data i="45"/>
+ <data i="46"/>
+ <data i="47"/>
+ <data i="48"/>
+ <data i="49"/>
+ <data i="50"/>
+ <data i="51"/>
+ <data i="52"/>
+ <data i="53"/>
+ <data i="54"/>
+ <data i="55"/>
+ <data i="56"/>
+ <data i="57"/>
+ <data i="58"/>
+ <data i="59"/>
+ </table>
+
+<!-- END: measurement-data.xml -->
+<!-- BEGIN: content-data.xml -->
+
+ <table name="RHQ_ARCHITECTURE">
+ <data id="1" name="noarch"/>
+ <data id="2" name="i386"/>
+ <data id="3" name="i486"/>
+ <data id="4" name="i586"/>
+ <data id="5" name="i686"/>
+ <data id="6" name="alpha"/>
+ <data id="7" name="alphaev6"/>
+ <data id="8" name="ia64"/>
+ <data id="9" name="sparc"/>
+ <data id="10" name="sparcv9"/>
+ <data id="11" name="sparc64"/>
+ <data id="12" name="src"/>
+ <data id="13" name="s390"/>
+ <data id="14" name="athlon"/>
+ <data id="15" name="s390x"/>
+ <data id="16" name="ppc"/>
+ <data id="17" name="ppc64"/>
+ <data id="18" name="pSeries"/>
+ <data id="19" name="iSeries"/>
+ <data id="20" name="x86_64"/>
+ <data id="21" name="ppc64iseries"/>
+ <data id="22" name="ppc64pseries"/>
+ <data id="23" name="sparc-solaris"/>
+ <data id="24" name="sparc.sun4u-solaris"/>
+ <data id="25" name="tar"/>
+ <data id="26" name="ia32e"/>
+ <data id="27" name="amd64"/>
+ <data id="28" name="i386-solaris"/>
+ <data id="29" name="nosrc"/>
+ <data id="30" name="sparc-solaris-patch"/>
+ <data id="31" name="i386-solaris-patch"/>
+ <data id="32" name="sparc-solaris-patch-cluster"/>
+ <data id="33" name="i386-solaris-patch-cluster"/>
+ <data id="34" name="noarch-solaris"/>
+ <data id="35" name="noarch-solaris-patch"/>
+ <data id="36" name="noarch-solaris-patch-cluster"/>
+ <data id="37" name="solaris-patch"/>
+ <data id="38" name="solaris-patch-cluster"/>
+ </table>
+<!-- END: content-data.xml -->
+<!-- BEGIN: jms-data.xml -->
+
+<!-- the schema matches that which would be automatically created by the JMS subsystem -->
+<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
+<!-- the data must match that which is expected in conf/login-config.xml -->
+
+
+ <table name="JMS_USERS">
+ <data USERID="guest" PASSWD="guest" />
+ </table>
+
+ <table name="JMS_ROLES">
+ <data ROLEID="guest" USERID="guest" />
+ </table>
+
+<!-- END: jms-data.xml -->
+<!-- END: rhq-data.xml -->
+<!-- BEGIN: jon-data.xml -->
+
+
+ <!-- *** metadata *** -->
+
+ <table name="RHQ_CONFIG_DEF">
+ <data ID="101"
+ NAME="JBossASPatchSource"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_DEF">
+ <data ID="101"
+ NAME="url"
+ DISPLAY_NAME="Feed URL"
+ DESCRIPTION="Destination URL of the feed."
+ REQUIRED="1"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="0"
+ SIMPLE_TYPE="STRING"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="102"
+ NAME="username"
+ DISPLAY_NAME="Username"
+ DESCRIPTION="Username used to log into the feed."
+ REQUIRED="0"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="1"
+ SIMPLE_TYPE="STRING"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="103"
+ NAME="password"
+ DISPLAY_NAME="Password"
+ DESCRIPTION="Password used to log into the feed."
+ REQUIRED="0"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="2"
+ SIMPLE_TYPE="PASSWORD"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="104"
+ NAME="active"
+ DISPLAY_NAME="Active"
+ DESCRIPTION="Indicates if this instance should go out and check the feed for packages."
+ REQUIRED="1"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="3"
+ SIMPLE_TYPE="BOOLEAN"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="105"
+ NAME="proxyUrl"
+ DISPLAY_NAME="Proxy URL"
+ REQUIRED="0"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="4"
+ SIMPLE_TYPE="STRING"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="106"
+ NAME="proxyPort"
+ DISPLAY_NAME="Proxy Port"
+ REQUIRED="0"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="5"
+ SIMPLE_TYPE="STRING"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="107"
+ NAME="proxyUsername"
+ DISPLAY_NAME="Proxy Username"
+ REQUIRED="0"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="6"
+ SIMPLE_TYPE="STRING"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ <data ID="108"
+ NAME="proxyPassword"
+ DISPLAY_NAME="Proxy Password"
+ REQUIRED="0"
+ READONLY="0"
+ SUMMARY="0"
+ ACTIVATION_POLICY="IMMEDIATE"
+ ORDER_INDEX="7"
+ SIMPLE_TYPE="STRING"
+ ALLOW_CUSTOM_ENUM_VALUE="0"
+ DTYPE="property"
+ CONFIG_DEF_ID="101"
+ UNITS="0"/>
+ </table>
+
+ <table name="RHQ_CONTENT_SOURCE_TYPE">
+ <data ID="101"
+ NAME="JBossASPatchSource"
+ DISPLAY_NAME="JBoss CSP Patch Content Source"
+ DESCRIPTION="This content source retrieves packages from the JBoss CSP RSS feed."
+ PLUGIN_NAME="JBossASPatchContentSourcePlugin"
+ DEFAULT_LAZY_LOAD="1"
+ DEFAULT_DOWNLOAD_MODE="FILESYSTEM"
+ DEFAULT_SYNC_SCHEDULE="0 0 3 * * ?"
+ API_CLASS="org.rhq.enterprise.server.plugins.jboss.software.JBossSoftwareContentSourceAdapter"
+ SOURCE_CONFIG_DEF_ID="101"/>
+ </table>
+
+
+ <!-- Default template for the AS software content source type's configuration -->
+ <table name="RHQ_CONFIG">
+ <data ID="101"
+ VERSION="0"
+ CTIME="1267099200000"
+ MTIME="1267099200000"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROPERTY">
+ <data ID="101"
+ NAME="url"
+ CONFIGURATION_ID="101"
+ STRING_VALUE=""
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="102"
+ NAME="username"
+ CONFIGURATION_ID="101"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="103"
+ NAME="password"
+ CONFIGURATION_ID="101"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="104"
+ NAME="proxyUrl"
+ CONFIGURATION_ID="101"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="105"
+ NAME="proxyPort"
+ CONFIGURATION_ID="101"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="106"
+ NAME="active"
+ CONFIGURATION_ID="101"
+ STRING_VALUE="true"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="107"
+ NAME="proxyUsername"
+ CONFIGURATION_ID="101"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="108"
+ NAME="proxyPassword"
+ CONFIGURATION_ID="101"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ </table>
+
+ <table name="RHQ_CONFIG_TEMPLATE">
+ <data ID="101"
+ NAME="default"
+ DESCRIPTION="the default template"
+ CONFIG_ID="101"
+ CONFIG_DEF_ID="101"
+ IS_DEFAULT="1"/>
+ </table>
+
+
+ <!-- *** data *** -->
+
+ <table name="RHQ_CONFIG">
+ <data ID="102"
+ VERSION="0"
+ CTIME="1267099200000"
+ MTIME="1267099200000"/>
+ </table>
+
+ <!-- Data for the content source itself -->
+ <table name="RHQ_CONFIG_PROPERTY">
+ <data ID="111"
+ NAME="url"
+ CONFIGURATION_ID="102"
+ STRING_VALUE="https://support.redhat.com/jbossnetwork/restricted/feed/software.html?produ…"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="112"
+ NAME="username"
+ CONFIGURATION_ID="102"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="113"
+ NAME="password"
+ CONFIGURATION_ID="102"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="114"
+ NAME="proxyUrl"
+ CONFIGURATION_ID="102"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="115"
+ NAME="proxyPort"
+ CONFIGURATION_ID="102"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="116"
+ NAME="active"
+ CONFIGURATION_ID="102"
+ STRING_VALUE="false"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="117"
+ NAME="proxyUsername"
+ CONFIGURATION_ID="102"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ <data ID="118"
+ NAME="proxyPassword"
+ CONFIGURATION_ID="102"
+ OVERRIDE="0"
+ DTYPE="property"/>
+ </table>
+
+ <table name="RHQ_CONTENT_SOURCE">
+ <data ID="101"
+ NAME="JBoss Patch Content Source"
+ DESCRIPTION="All patches provided by the JBoss Subscription"
+ LAZY_LOAD="1"
+ DOWNLOAD_MODE="FILESYSTEM"
+ SYNC_SCHEDULE="0 0 3 * * ?"
+ CREATION_TIME="1267099200000"
+ LAST_MODIFIED_TIME="1267099200000"
+ CONTENT_SOURCE_TYPE_ID="101"
+ CONFIGURATION_ID="102"/>
+ </table>
+
+ <table name="RHQ_CHANNEL">
+ <data ID="101"
+ NAME="JBoss Patch Channel"
+ DESCRIPTION="JBoss Subscription Channel"
+ CREATION_TIME="1267099200000"
+ LAST_MODIFIED_TIME="1267099200000"/>
+ </table>
+
+ <table name="RHQ_CHANNEL_CONTENT_SRC_MAP">
+ <data CHANNEL_ID="101"
+ CONTENT_SRC_ID="101"
+ CTIME="1267099200000"/>
+ </table>
+
+
+<!-- END: jon-data.xml -->
+</dbsetup>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-schema-combined-2.3.1.xml b/modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-schema-combined-2.3.1.xml
new file mode 100644
index 0000000..923c0b5
--- /dev/null
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-schema-combined-2.3.1.xml
@@ -0,0 +1,1916 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dbsetup name="schema">
+<!-- BEGIN: config-schema.xml -->
+
+
+ <!-- Definition or Metadata tables -->
+
+ <table name="RHQ_CONFIG_DEF">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
+ <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_GRP_DEF">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
+ <column name="DEFAULT_HIDDEN" type="BOOLEAN" required="false"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_DEF">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="1000"/>
+ <column name="DEFAULT_VALUE" type="VARCHAR2" required="false" size="2000"/>
+ <column name="REQUIRED" type="BOOLEAN" required="false"/>
+ <column name="READONLY" type="BOOLEAN" required="false"/>
+ <column name="SUMMARY" type="BOOLEAN" required="false"/>
+ <column name="ACTIVATION_POLICY" type="VARCHAR2" required="false" size="20"/>
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_GRP_DEF"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
+ <column name="PARENT_MAP_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ <column name="PARENT_LIST_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ <column name="SIMPLE_TYPE" type="VARCHAR2" required="false" size="20"/>
+ <column name="ALLOW_CUSTOM_ENUM_VALUE" type="BOOLEAN" required="false"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
+
+ <!-- only simple properties (not lists and maps) have this -->
+ <column name="UNITS" type="SMALLINT" required="false"/>
+ </table>
+
+ <table name="RHQ_CONF_PROP_DEF_ENUM">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="STRING_VALUE" type="VARCHAR2" required="false" size="500"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
+ <column name="NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_CONSTR">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="15"/>
+ <column name="DETAILS" type="VARCHAR2" required="false" size="250"/>
+ <column name="CONFIG_PROP_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ </table>
+
+
+ <!-- Content or value tables -->
+
+ <table name="RHQ_CONFIG">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
+ <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROPERTY">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG" ondelete="cascade"/>
+ <column name="STRING_VALUE" type="VARCHAR2" required="false" size="2000"/>
+ <column name="OVERRIDE" type="BOOLEAN" required="false"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ <!-- Recursive cascade path to RHQ_CONFIG_PROPERTY causes constraint creation errors on SQL Server, see
+ http://support.microsoft.com/kb/321843 -->
+ <column name="PARENT_LIST_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
+ <column name="PARENT_MAP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
+ <column name="LIST_INDEX" type="INTEGER"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <index name="RHQ_CONFIG_PROP_idx_prop_key" unique="false">
+ <field ref="CONFIGURATION_ID"/>
+ <field ref="NAME"/>
+ </index>
+ <index name="RHQ_CONFIG_PROP_idx_map_key" unique="false">
+ <field ref="PARENT_MAP_ID"/>
+ <field ref="NAME"/>
+ </index>
+ <index name="RHQ_CONFIG_PROP_idx_list_key" unique="false">
+ <field ref="PARENT_LIST_ID"/>
+ </index>
+ <!-- List entries all have the same name -->
+ </table>
+
+ <table name="RHQ_CONFIG_TEMPLATE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="500"/>
+ <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
+ <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
+ </table>
+
+<!-- END: config-schema.xml -->
+<!-- BEGIN: cluster-schema.xml -->
+
+ <table name="RHQ_AFFINITY_GROUP">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="255" type="VARCHAR2"/>
+ </table>
+
+ <table name="RHQ_SERVER">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="255" type="VARCHAR2"/>
+ <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
+ <column name="PORT" required="true" type="INTEGER"/>
+ <column name="SECURE_PORT" required="true" type="INTEGER"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="MTIME" required="true" type="LONG"/>
+ <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
+ <column name="COMPUTE_POWER" required="true" type="INTEGER"/>
+ <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2"/>
+ <column name="STATUS" type="INTEGER" required="false" default="0" />
+
+ <!-- This index is for constraint, not performance -->
+ <index name="RHQ_SERVER_NAME_UNIQUE" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- new agent -->
+ <table name="RHQ_AGENT">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="255" type="VARCHAR2"/>
+ <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
+ <column name="PORT" required="true" type="INTEGER"/>
+ <column name="AGENTTOKEN" required="true" size="100" type="VARCHAR2"/>
+ <column name="REMOTE_ENDPOINT" required="false" size="4000" type="VARCHAR2"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="MTIME" required="true" type="LONG"/>
+ <column name="LAST_AVAILABILITY_REPORT" required="false" type="LONG"/>
+ <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
+ <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="false"/>
+ <column name="STATUS" type="INTEGER" required="false" default="0" />
+ <column name="BACKFILLED" type="BOOLEAN" required="true" />
+
+ <index name="RHQ_AGENT_NAME_UNIQUE" unique="true">
+ <field ref="NAME"/>
+ </index>
+
+ <index name="RHQ_AGENT_ADDRESS_PORT" unique="true">
+ <field ref="ADDRESS"/>
+ <field ref="PORT"/>
+ </index>
+
+ <index name="RHQ_AGENT_TOKEN_UNIQUE" unique="true">
+ <field ref="AGENTTOKEN"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PARTITION_EVENT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="SUBJECT_NAME" required="true" size="255" type="VARCHAR2"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="EVENT_TYPE" required="true" size="50" type="VARCHAR2"/>
+ <column name="EVENT_DETAIL" required="false" size="512" type="VARCHAR2"/>
+ <column name="EXECUTION_STATUS" required="true" size="32" type="VARCHAR2"/>
+ </table>
+
+ <table name="RHQ_PARTITION_DETAILS">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
+ <column name="AGENT_NAME" type="VARCHAR2" size="255" required="true"/>
+ <column name="SERVER_NAME" type="VARCHAR2" size="255" required="true"/>
+ </table>
+
+ <table name="RHQ_FAILOVER_LIST">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
+ <column name="AGENT_ID" type="INTEGER" references="RHQ_AGENT" required="true"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ </table>
+
+ <table name="RHQ_FAILOVER_DETAILS">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="FAILOVER_LIST_ID" type="INTEGER" references="RHQ_FAILOVER_LIST" required="true"/>
+ <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="true"/>
+ <column name="ORDINAL" type = "INTEGER" required="true"/>
+ </table>
+
+<!-- END: cluster-schema.xml -->
+<!-- BEGIN: inventory-schema.xml -->
+
+
+ <!-- NEW RESOURCE TYPES -->
+ <table name="RHQ_RESOURCE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" type="VARCHAR2" size="100" required="true"/>
+ <column name="CATEGORY" type="VARCHAR2" size="16" required="true"/>
+ <column name="CREATION_DATA_TYPE" type="VARCHAR2" size="16" required="true"/>
+ <column name="CREATE_DELETE_POLICY" type="VARCHAR2" size="16" required="true"/>
+ <column name="SINGLETON" type="BOOLEAN" required="true"/>
+ <column name="SUPPORTS_MANUAL_ADD" type="BOOLEAN" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+ <column name="PLUGIN" type="VARCHAR2" size="100"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="SUBCATEGORY_ID" type="INTEGER"/>
+ <!--
+ TODO add support to DB setup for tables with circular dependencies and then add back this RI
+ <column name="SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT" />
+ -->
+ <column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+
+ <index name="RHQ_RES_TYPE_IDX_PLG_NAME">
+ <field ref="NAME"/>
+ <field ref="PLUGIN"/>
+ </index>
+ </table>
+
+ <!-- NEW RESOURCE SUBCATEGORIES -->
+ <table name="RHQ_RESOURCE_SUBCAT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" type="VARCHAR2" size="100"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="PARENT_SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT"/>
+ <!-- resourceTypeId is not required on child sub categories -->
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+ </table>
+
+ <!-- Many To Many mapping for resource type to its parents -->
+ <table name="RHQ_RESOURCE_TYPE_PARENTS">
+ <column name="RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+ <column name="PARENT_RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+
+ <!-- not using full words to fit index name length -->
+ <constraint name="RHQ_RES_TYPE_PARENTS_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="PARENT_RESOURCE_TYPE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_PROCESS_SCAN">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="QUERY" type="VARCHAR2" size="256" required="true"/>
+ <column name="NAME" type="VARCHAR2" size="100" required="false"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+
+ <index name="RHQ_PROCESS_SCAN_QUERY_INDEX" unique="true">
+ <field ref="QUERY"/>
+ <field ref="RESOURCE_TYPE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PRD_VER">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="VERSION" type="VARCHAR2" size="50" required="true"/>
+ <column name="RES_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ </table>
+
+ <table name="RHQ_RESOURCE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ <column name="UUID" type="CHAR" size="36" required="true"/>
+ <column name="NAME" type="VARCHAR2" size="500"/>
+ <column name="RESOURCE_KEY" type="VARCHAR2" required="true" size="500"/>
+ <column name="AGENT_ID" required="false" type="INTEGER" references="RHQ_AGENT(id)"/>
+ <column name="INVENTORY_STATUS" type="VARCHAR2" size="20"/>
+ <column name="CONNECTED" type="BOOLEAN"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+ <column name="VERSION" type="VARCHAR2" size="50"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="ITIME" type="LONG"/>
+ <column name="RES_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
+ <column name="PLUGIN_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
+ <column name="MODIFIED_BY" required="false" type="INTEGER"/>
+ <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
+ <column name="PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
+ <column name="PRODUCT_VERSION_ID" type="INTEGER" references="RHQ_PRD_VER"/>
+
+ <index name="RHQ_RESOURCE_idx_key">
+ <field ref="RESOURCE_KEY"/>
+ </index>
+
+ <index name="RHQ_RESOURCE_idx_type">
+ <field ref="RESOURCE_TYPE_ID"/>
+ </index>
+
+ <index name="RHQ_RESOURCE_idx_agent">
+ <field ref="AGENT_ID"/>
+ </index>
+
+ <index name="RHQ_RESOURCE_idx_parent">
+ <field ref="PARENT_RESOURCE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_RESOURCE_ERROR">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="TIME_OCCURRED" type="LONG" required="true"/>
+ <column name="ERROR_TYPE" type="VARCHAR2" required="true" size="32"/>
+ <column name="SUMMARY" type="VARCHAR2" required="true" size="1000"/>
+ <column name="DETAIL" type="LONGVARCHAR" required="false"/>
+
+ <index name="RHQ_RES_ERROR_IDX_RES_ID">
+ <field ref="RESOURCE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_GROUP_DEF">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="CALC_TIME" type="LONG"/>
+ <column name="CALC_INTERVAL" type="LONG"/>
+ <column name="RECURSIVE" type="BOOLEAN"/>
+ <column name="EXPRESSION" type="VARCHAR2" size="1000"/>
+
+ <index name="RHQ_GROUP_DEF_NAME" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_RESOURCE_GROUP">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <!-- this name can be longer than the size of the GROUP_BY column, which is used to uniquely identify it -->
+ <!-- Max bytes for Oracle Varchar2 to accommodate large cluster keys -->
+ <column name="NAME" required="true" size="4000" type="VARCHAR2"/>
+ <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
+ <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+ <!-- Compatible groups only -->
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="MODIFIED_BY" required="false" type="INTEGER"/>
+ <!-- TODO: Reorder to allow this references="RHQ_SUBJECT" -->
+ <column name="RECURSIVE" type="BOOLEAN"/>
+
+ <column name="GROUP_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_GROUP_DEF"/>
+ <column name="GROUP_BY" size="500" type="VARCHAR2"/>
+
+ <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
+
+ <column name="CLUSTER_KEY" type="VARCHAR2" size="4000" required="false"/>
+
+ <!-- These two only set if this is a backing group for a resource cluster -->
+ <column name="CLUSTER_RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <column name="VISIBLE" type="BOOLEAN"/>
+
+ <index name="RHQ_RES_GROUP_NAME" unique="false">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- Many To Many mapping for groups to implicit resources -->
+ <table name="RHQ_RESOURCE_GROUP_RES_IMP_MAP">
+ <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
+ <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <!-- not using full words to fit index name length -->
+ <constraint name="RHQ_RES_GROUP_RES_IMP_MAP_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_ID"/>
+ <field ref="RESOURCE_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <!-- Many To Many mapping for groups to explicit resources -->
+ <table name="RHQ_RESOURCE_GROUP_RES_EXP_MAP">
+ <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
+ <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <!-- not using full words to fit index name length -->
+ <constraint name="RHQ_RES_GROUP_RES_EXP_MAP_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_ID"/>
+ <field ref="RESOURCE_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_CONFIG_GROUP_UPDATE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ </table>
+
+ <table name="RHQ_CONFIG_UPDATE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG" ondelete="cascade"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="PLUGIN_CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="AGG_RES_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
+ <column name="AGG_PLUGIN_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ </table>
+
+<!-- END: inventory-schema.xml -->
+<!-- BEGIN: auth-schema.xml -->
+
+
+ <table name="RHQ_PRINCIPAL">
+
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PRINCIPAL" required="true" type="VARCHAR2" size="100"/>
+ <column name="PASSWORD" required="true" type="VARCHAR2" size="64"/>
+
+ <!-- ensure that principals are unique -->
+ <index name="RHQ_PRINCIPAL_PRINCIPAL_KEY" unique="true">
+ <field ref="PRINCIPAL"/>
+ </index>
+
+ </table>
+
+<!-- END: auth-schema.xml -->
+<!-- BEGIN: authz-schema.xml -->
+
+
+ <table name="RHQ_ROLE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
+ <column name="FSYSTEM" type="BOOLEAN" default="false"/>
+
+ <index name="RHQ_ROLE_NAME_KEY" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ROLE_RESOURCE_GROUP_MAP">
+ <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
+ <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <constraint name="RHQ_ROLE_RES_GROUP_MAP_KEY">
+ <primaryKey>
+ <field ref="ROLE_ID"/>
+ <field ref="RESOURCE_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_PERMISSION">
+ <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE" required="true"/>
+ <column name="OPERATION" type="INTEGER" required="true"/>
+ <constraint name="RHQ_PERMISSION_PK">
+ <primaryKey>
+ <field ref="ROLE_ID"/>
+ <field ref="OPERATION"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_SUBJECT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
+ <column name="FIRST_NAME" required="false" size="100" type="VARCHAR2"/>
+ <column name="LAST_NAME" required="false" size="100" type="VARCHAR2"/>
+ <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
+ <column name="SMS_ADDRESS" size="100" type="VARCHAR2"/>
+ <column name="PHONE_NUMBER" size="100" type="VARCHAR2"/>
+ <column name="DEPARTMENT" size="100" type="VARCHAR2"/>
+ <column name="FACTIVE" required="true" type="BOOLEAN" default="true"/>
+ <column name="FSYSTEM" required="true" type="BOOLEAN" default="false"/>
+
+ <index name="RHQ_SUBJECT_AUTH_KEY" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_SUBJECT_ROLE_MAP">
+ <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
+ <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
+
+ <constraint name="RHQ_SUBJECT_ROLE_MAPPING_KEY">
+ <primaryKey>
+ <field ref="SUBJECT_ID"/>
+ <field ref="ROLE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: authz-schema.xml -->
+<!-- BEGIN: operation-schema.xml -->
+
+
+ <table name="RHQ_OPERATION_DEF">
+
+ <!-- === required columns === -->
+
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+
+ <!-- === optional columns === -->
+
+ <!-- an OSGI version range - if null, the operation def applies to all versions of the associated resource type -->
+ <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
+
+ <!-- A parameter config definition is only required for operations that have parameters. -->
+ <!-- A results config definition is only required for operations that return data. -->
+ <column name="PARAMETER_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="RESULTS_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="4000"/>
+ <column name="TIMEOUT" type="INTEGER"/>
+
+ <!-- === business key (RESOURCE_TYPE_ID + NAME) === -->
+ <index name="RHQ_OPERATION_DEF_KEY_IDX" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_OPERATION_HISTORY">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
+ <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
+ <column name="OPERATION_DEF_ID" type="INTEGER" required="true" references="RHQ_OPERATION_DEF"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="STIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="PARAMETERS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+
+ <!-- for resource history -->
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="RESULTS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="GROUP_HISTORY_ID" type="INTEGER" required="false" references="RHQ_OPERATION_HISTORY"/>
+
+ <!-- for group history -->
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
+
+ <index name="RHQ_OPERATION_HISTORY_JOB_IDX" unique="true">
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ <field ref="CTIME"/>
+ </index>
+
+ </table>
+
+ <!--
+ This table is really just to support some specific use-cases.
+ Specifically, to be able to get a list of histories for a specific schedule (aka quartz job)
+ and to be able to query a list of all schedules along with their associated resource/group IDs
+ possibly sorted by their next fire time.
+ Note that a NULL next fire time means it won't fire again and the row is probaby about to be deleted;
+ we can probably not even insert rows with NULL and make it a non-nullable field. But rather than
+ code special conditions into the session bean, we'll allow a short-lived NULL next fire time row.
+ -->
+ <table name="RHQ_OPERATION_SCHEDULE">
+ <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
+ <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
+
+ <!-- for resource history -->
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+
+ <!-- for group history -->
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
+
+ <!--
+ Note that this is the same primary key that Quartz uses for its schedules (RHQ_qrtz_job_details).
+ We do not need to add DTYPE to the key, because we ensure the name/group are unique
+ across resource/group schedules
+ -->
+ <constraint name="RHQ_OPERATION_SCHEDULE_KEY">
+ <primaryKey>
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: operation-schema.xml -->
+<!-- BEGIN: sysconfig-schema.xml -->
+
+
+ <table name="RHQ_SYSTEM_CONFIG">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PROPERTY_KEY" type="VARCHAR2" size="80"/>
+ <column name="PROPERTY_VALUE" type="VARCHAR2" size="300"/>
+ <column name="DEFAULT_PROPERTY_VALUE" type="VARCHAR2" size="300"/>
+ <column name="FREAD_ONLY" type="BOOLEAN" default="FALSE"/>
+
+ <index name="RHQ_SYSTEM_CONFIG_KEY_INDX" unique="true">
+ <field ref="PROPERTY_KEY"/>
+ </index>
+ </table>
+
+<!-- END: sysconfig-schema.xml -->
+<!-- BEGIN: scheduler-schema.xml -->
+
+
+ <table name="RHQ_QRTZ_JOB_DETAILS">
+ <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
+ <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
+ <column name="DESCRIPTION" required="false" type="VARCHAR2" size="120"/>
+ <column name="JOB_CLASS_NAME" required="true" type="VARCHAR2" size="128"/>
+ <column name="IS_DURABLE" required="true" type="BOOLEAN" default="FALSE"/>
+ <column name="IS_VOLATILE" required="true" type="BOOLEAN"/>
+ <column name="IS_STATEFUL" required="true" type="BOOLEAN" default="FALSE"/>
+ <column name="REQUESTS_RECOVERY" required="true" type="BOOLEAN" default="FALSE"/>
+ <column name="JOB_DATA" required="false" type="BLOB"/>
+
+ <constraint name="RHQ_PK_QRTZ_JOB_DETAILS">
+ <primaryKey>
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_QRTZ_JOB_LISTENERS">
+ <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
+ <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
+ <column name="JOB_LISTENER" required="true" type="VARCHAR2" size="80"/>
+
+ <constraint name="RHQ_PK_QRTZ_JOB_LISTENERS">
+ <primaryKey>
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ <field ref="JOB_LISTENER"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_JOB_LSTNRS_JN_JG">
+ <foreignKey local="JOB_NAME,JOB_GROUP"
+ references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+ </table>
+
+ <table name="RHQ_QRTZ_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
+ <column name="JOB_NAME" type="VARCHAR2" required="true" size="80"/>
+ <column name="JOB_GROUP" type="VARCHAR2" required="true" size="80"/>
+ <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/>
+ <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
+ <column name="PREV_FIRE_TIME" type="LONG" required="false"/>
+ <column name="PRIORITY" type="INTEGER" required="false"/>
+ <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/>
+ <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/>
+ <column name="START_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="false"/>
+ <column name="CALENDAR_NAME" type="VARCHAR2" required="false" size="80"/>
+ <column name="MISFIRE_INSTR" type="INTEGER" required="false"/>
+ <column name="JOB_DATA" type="BLOB" required="false"/>
+
+ <constraint name="RHQ_PK_QRTZ_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_TRIGGERS_JN_JG">
+ <foreignKey local="JOB_NAME,JOB_GROUP"
+ references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend these indexes. -->
+ <index name="RHQ_QRTZ_TRIGGERS_JN_JG_IDX">
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ </index>
+ <index name="RHQ_QRTZ_TRIGGERS_NFT_IDX">
+ <field ref="NEXT_FIRE_TIME"/>
+ </index>
+ <index name="RHQ_QRTZ_TRIGGERS_TS_IDX">
+ <field ref="TRIGGER_STATE"/>
+ </index>
+ <index name="RHQ_QRTZ_TRIGGERS_TS_NFT_IDX">
+ <field ref="TRIGGER_STATE"/>
+ <field ref="NEXT_FIRE_TIME"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_QRTZ_SIMPLE_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
+ <column name="REPEAT_COUNT" type="LONG" required="true"/>
+ <column name="REPEAT_INTERVAL" type="LONG" required="true"/>
+ <column name="TIMES_TRIGGERED" type="LONG" required="true"/>
+
+ <constraint name="RHQ_PK_QRTZ_SIMPLE_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_SIMPLE_TRGRS_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <!-- Commenting out, because Oracle auto-creates an index for the
+ primary key column(s) and fails if you try to create another
+ index for the same column(s) (ips, 03/29/07).
+ -->
+ <!--
+ <index name="RHQ_QRTZ_SIMPLE_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ -->
+ </table>
+
+ <table name="RHQ_QRTZ_CRON_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="CRON_EXPRESSION" type="VARCHAR2" size="80" required="true"/>
+ <column name="TIME_ZONE_ID" type="VARCHAR2" size="80" required="false"/>
+
+ <constraint name="RHQ_PK_QRTZ_CRON_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_CRON_TRIG_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <!-- Commenting out, because Oracle auto-creates an index for the
+ primary key column(s) and fails if you try to create another
+ index for the same column(s) (ips, 03/29/07).
+ -->
+ <!--
+ <index name="RHQ_QRTZ_CRON_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ -->
+ </table>
+
+ <table name="RHQ_QRTZ_BLOB_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="BLOB_DATA" type="BLOB" required="false"/>
+
+ <constraint name="RHQ_PK_QRTZ_BLOB_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_BLOB_TRIGG_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <!-- Commenting out, because Oracle auto-creates an index for the
+ primary key column(s) and fails if you try to create another
+ index for the same column(s) (ips, 03/29/07).
+ -->
+ <!--
+ <index name="RHQ_QRTZ_BLOB_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ -->
+ </table>
+
+ <table name="RHQ_QRTZ_TRIGGER_LISTENERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_LISTENER" type="VARCHAR2" size="80" required="true"/>
+
+ <constraint name="RHQ_PK_QRTZ_TRIGGER_LISTENERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ <field ref="TRIGGER_LISTENER"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_TRGR_LSTNRS_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <index name="RHQ_QRTZ_TRGR_LSTNRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_QRTZ_FIRED_TRIGGERS">
+ <column name="ENTRY_ID" primarykey="true" type="VARCHAR2" size="95" required="true"/>
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="FIRED_TIME" type="LONG" required="true"/>
+ <column name="PRIORITY" type="INTEGER" required="false"/>
+ <column name="STATE" type="VARCHAR2" size="16" required="true"/>
+ <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
+ <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/>
+ <column name="JOB_GROUP" type="VARCHAR2" size="80" required="false"/>
+ <column name="IS_STATEFUL" type="BOOLEAN" required="false"/>
+ <column name="REQUESTS_RECOVERY" type="BOOLEAN" required="false"/>
+
+ <!-- Quartz docs recommend these indexes. -->
+ <index name="RHQ_QRTZ_FIRED_TRGRS_TN_IDX">
+ <field ref="TRIGGER_NAME"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_TG_IDX">
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_IN_IDX">
+ <field ref="INSTANCE_NAME"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_JN_IDX">
+ <field ref="JOB_NAME"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_JG_IDX">
+ <field ref="JOB_GROUP"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_QRTZ_CALENDARS">
+ <column name="CALENDAR_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
+ <column name="CALENDAR" type="BLOB" required="true"/>
+ </table>
+
+ <table name="RHQ_QRTZ_PAUSED_TRIGGER_GRPS">
+ <column name="TRIGGER_GROUP" primarykey="true" type="VARCHAR2" size="80" required="true"/>
+ </table>
+
+ <table name="RHQ_QRTZ_SCHEDULER_STATE">
+ <column name="INSTANCE_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
+ <column name="LAST_CHECKIN_TIME" type="LONG" required="true"/>
+ <column name="CHECKIN_INTERVAL" type="LONG" required="true"/>
+ <column name="RECOVERER" type="VARCHAR2" size="80" required="false"/>
+ </table>
+
+ <table name="RHQ_QRTZ_LOCKS">
+ <column name="LOCK_NAME" primarykey="true" type="VARCHAR2" size="40" required="true"/>
+ <data LOCK_NAME="TRIGGER_ACCESS"/>
+ <data LOCK_NAME="JOB_ACCESS"/>
+ <data LOCK_NAME="CALENDAR_ACCESS"/>
+ <data LOCK_NAME="STATE_ACCESS"/>
+ <data LOCK_NAME="MISFIRE_ACCESS"/>
+ </table>
+
+<!-- END: scheduler-schema.xml -->
+<!-- BEGIN: amps-schema.xml -->
+
+
+
+ <table name="RHQ_PLUGIN">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
+ <column name="VERSION" size="200" type="VARCHAR2" required="false"/>
+ <column name="ENABLED" type="BOOLEAN" required="true"/>
+ <column name="HELP" type="CLOB" required="false"/>
+ <column name="PATH" size="500" type="VARCHAR2" required="true"/>
+ <column name="MD5" size="100" type="VARCHAR2" required="true"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="CONTENT" type="BLOB" required="false"/>
+
+ <index name="RHQ_PLUGIN_NAME_IDX" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+<!-- END: amps-schema.xml -->
+<!-- BEGIN: measurement-schema.xml -->
+
+ <table name="RHQ_MEASUREMENT_DEF">
+
+ <!-- === required columns === -->
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
+ <column name="NAME" type="VARCHAR2" size="100" required="true"/>
+
+ <!-- === optional columns === -->
+ <!-- an OSGI version range - if null, the metric def applies to all versions of the associated resource type -->
+ <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
+ <column name="CATEGORY" type="SMALLINT"/>
+ <column name="UNITS" type="SMALLINT"/>
+ <column name="NUMERIC_TYPE" type="SMALLINT"/>
+ <column name="DISPLAY_TYPE" type="SMALLINT"/>
+ <column name="DATA_TYPE" type="SMALLINT"/>
+ <column name="RAW_NUMERIC_TYPE" type="SMALLINT"/>
+ <column name="DEFAULT_ON" type="BOOLEAN" default="false"/>
+ <column name="DEFAULT_INTERVAL" type="LONG" />
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DISPLAY_ORDER" type="INTEGER" default="1000"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="500"/>
+ <column name="DESTINATION_TYPE" type="VARCHAR2" size="100"/>
+
+ <column name="VERSION" type="INTEGER"/>
+ <!-- for optimistic locking -->
+
+ <!-- === business key (RESOURCE_TYPE_ID + NAME + RAW_NUMERIC_TYPE) === -->
+ <index name="RHQ_METRIC_DEF_KEY_IDX" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ <field ref="RAW_NUMERIC_TYPE"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_SCHED">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+
+ <column name="ENABLED" type="BOOLEAN" default="false"/>
+ <column name="MTIME" type="LONG" />
+ <column name="DEFINITION" type="INTEGER" references="RHQ_MEASUREMENT_DEF(ID)"/>
+ <column name="VERSION" type="INTEGER" />
+ <column name="COLL_INTERVAL" type="LONG" />
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE(ID)"/>
+ <index name="RHQ_MEAS_SCHED_UNIQ" unique="true">
+ <field ref="RESOURCE_ID"/>
+ <field ref="DEFINITION"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_BLINE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+
+ <column name="BL_USER_ENTERED" type="BOOLEAN" default="false" required="true"/>
+ <column name="BL_MIN" type="DOUBLE" required="true"/>
+ <column name="BL_MAX" type="DOUBLE" required="true"/>
+ <column name="BL_MEAN" type="DOUBLE" required="true"/>
+ <column name="BL_COMPUTE_TIME" type="LONG" required="true"/>
+ <column name="SCHEDULE_ID" type="INTEGER" required="true" references="RHQ_MEASUREMENT_SCHED(ID)"/>
+ <index name="RHQ_MEAS_BASELINE_CTIME_IDX">
+ <field ref="BL_COMPUTE_TIME"/>
+ </index>
+ <index name="RHQ_MEAS_BASELINE_SID_IDX">
+ <field ref="SCHEDULE_ID"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_NUM_1H" logging="false" cache="true"
+ tablespace="DEFAULT" storage-options="freelists 20">
+
+ <column name="TIME_STAMP" required="true" type="LONG"/>
+ <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
+ <column name="VALUE" required="false" type="DOUBLE"/>
+ <column name="MINVALUE" required="false" type="DOUBLE"/>
+ <column name="MAXVALUE" required="false" type="DOUBLE"/>
+
+ <constraint name="RHQ_MEAS_DATA_1H_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="RHQ_MEAS_DATA_1H_TIME_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_NUM_6H" logging="false" cache="true"
+ tablespace="DEFAULT" storage-options="freelists 20">
+
+ <column name="TIME_STAMP" required="true" type="LONG"/>
+ <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
+ <column name="VALUE" required="false" type="DOUBLE"/>
+ <column name="MINVALUE" required="false" type="DOUBLE"/>
+ <column name="MAXVALUE" required="false" type="DOUBLE"/>
+
+ <constraint name="RHQ_MEAS_DATA_6H_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="RHQ_MEAS_DATA_6H_TIME_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_NUM_1D" logging="false" cache="true"
+ tablespace="DEFAULT" storage-options="freelists 20">
+
+ <column name="TIME_STAMP" required="true" type="LONG"/>
+ <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
+ <column name="VALUE" required="false" type="DOUBLE"/>
+ <column name="MINVALUE" required="false" type="DOUBLE"/>
+ <column name="MAXVALUE" required="false" type="DOUBLE"/>
+
+ <constraint name="RHQ_MEAS_DATA_1D_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_TRAIT">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER" />
+ <column name="VALUE" type="VARCHAR2" size="4000" />
+ <constraint name="RHQ_MEAS_DATA_TRAIT_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+
+ <table name="RHQ_CALLTIME_DATA_KEY">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
+ <column name="CALL_DESTINATION" type="VARCHAR2" size="4000" required="true"/>
+ <index name="RHQ_CALLTIME_DATA_KEY_IDX" unique="true">
+ <field ref="SCHEDULE_ID"/>
+ <field ref="CALL_DESTINATION"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_CALLTIME_DATA_VALUE">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/>
+ <column name="BEGIN_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="true"/>
+ <column name="MINIMUM" type="DOUBLE" required="true"/>
+ <column name="MAXIMUM" type="DOUBLE" required="true"/>
+ <column name="TOTAL" type="DOUBLE" required="true"/>
+ <column name="COUNT" type="LONG" required="true"/>
+ </table>
+
+
+ <table name="RHQ_AVAILABILITY">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
+ <column name="START_TIME" type="LONG" required="true" />
+ <column name="END_TIME" type="LONG" required="false" />
+ <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
+ <index name="RHQ_AVAIL_RESOURCE_START_IDX">
+ <field ref="RESOURCE_ID"/>
+ <field ref="START_TIME"/>
+ </index>
+ <!-- only one null row can exist for any resource -->
+ <index name="RHQ_AVAIL_RESOURCE_END_IDX" condition="END_TIME IS NULL">
+ <field ref="RESOURCE_ID"/>
+ <field ref="END_TIME" />
+ </index>
+ </table>
+
+ <table name="RHQ_RESOURCE_AVAIL">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)" ondelete="cascade"/>
+ <column name="AVAILABILITY_TYPE" type="SMALLINT" required="false" />
+ <index name="RHQ_RESOURCE_AVAIL_IDX">
+ <field ref="RESOURCE_ID" />
+ </index>
+ </table>
+
+ <!-- !!!!! REMOVED !!!!! -->
+ <table name="RHQ_MEASUREMENT_OOB" obsolete="true">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
+ <column name="OCCURRED" type="LONG" required="true"/>
+ <column name="DIFF" type="DOUBLE" required="true"/>
+
+ <index name="RHQ_MEASUREMENT_OOB_IDX" unique="true">
+ <field ref="SCHEDULE_ID" />
+ <field ref="OCCURRED" />
+ </index>
+ </table>
+
+ <table name="RHQ_MEASUREMENT_OOB">
+ <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
+ <column name="TIME_STAMP" type="LONG" required="true"/>
+ <column name="OOB_FACTOR" type="INTEGER" required="true" />
+ <constraint name="RHQ_MEAS_OOB_ID_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_MEASUREMENT_OOB_TMP">
+ <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
+ <column name="TIME_STAMP" type="LONG" required="true"/>
+ <column name="OOB_FACTOR" type="INTEGER" required="true" />
+ <constraint name="RHQ_MEAS_OOB_TMP_ID_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_NUMBERS">
+ <column name="i" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true" />
+ </table>
+
+
+ <table name="RHQ_MEAS_DATA_NUM_R00">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R00_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R00_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R01">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R01_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R01_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R02">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R02_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R02_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R03">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R03_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R03_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R04">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R04_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R04_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R05">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R05_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R05_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R06">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R06_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R06_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R07">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R07_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R07_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R08">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R08_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R08_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R09">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R09_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R09_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R10">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R10_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R10_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R11">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R11_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R11_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R12">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R12_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R12_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R13">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R13_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R13_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R14">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R14_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R14_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: measurement-schema.xml -->
+<!-- BEGIN: content-schema.xml -->
+
+
+ <table name="RHQ_ARCHITECTURE">
+ <column name="ID" default="sequence-only" initial="100" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="50" type="VARCHAR2" required="true"/>
+ <index name="RHQ_ARCHITECTURE_NAME_IDX" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_CONTENT_SOURCE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="PLUGIN_NAME" size="100" type="VARCHAR2" required="false"/>
+ <!-- we might want this as part of natural key -->
+ <column name="DEFAULT_LAZY_LOAD" type="BOOLEAN" required="true"/>
+ <column name="DEFAULT_DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
+ <column name="DEFAULT_SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
+ <column name="API_CLASS" size="100" type="VARCHAR2" required="true"/>
+
+ <column name="SOURCE_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
+
+ <index name="RHQ_CONTENT_SOURCE_TYPE_IDX" unique="true">
+ <field ref="NAME"/>
+ <!-- <field ref="PLUGIN_NAME"/> -->
+ </index>
+ </table>
+
+ <table name="RHQ_CONTENT_SOURCE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="LAZY_LOAD" type="BOOLEAN" required="true"/>
+ <column name="DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
+ <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
+ <column name="LOAD_ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="CREATION_TIME" type="LONG" required="true"/>
+ <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
+
+ <column name="CONTENT_SOURCE_TYPE_ID" type="INTEGER" references="RHQ_CONTENT_SOURCE_TYPE" required="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+
+ <index name="RHQ_CONTENT_SOURCE_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="CONTENT_SOURCE_TYPE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_CHANNEL">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CREATION_TIME" type="LONG" required="true"/>
+ <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
+
+ <index name="RHQ_CHANNEL_IDX" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PACKAGE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CATEGORY" size="50" type="VARCHAR2" required="false"/>
+ <column name="DISCOVERY_INTERVAL" type="INTEGER" required="false"/>
+ <column name="IS_CREATION_DATA" type="BOOLEAN" required="true"/>
+ <column name="SUPPORTS_ARCHITECTURE" type="BOOLEAN" required="true"/>
+
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="true"/>
+ <column name="DEPLOYMENT_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
+ <column name="PACKAGE_EXTRA_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
+
+ <index name="RHQ_PACKAGE_TYPE_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="RESOURCE_TYPE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_PACKAGE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="CLASSIFICATION" size="200" type="VARCHAR2" required="false"/>
+
+ <column name="PACKAGE_TYPE_ID" type="INTEGER" references="RHQ_PACKAGE_TYPE" required="true"/>
+
+ <index name="RHQ_PACKAGE_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="PACKAGE_TYPE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PACKAGE_BITS">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="BITS" type="BLOB" required="false"/>
+ </table>
+
+ <table name="RHQ_PACKAGE_VERSION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
+ <column name="SHORT_DESCRIPTION" size="10000" type="CLOB" required="false"/>
+ <column name="LONG_DESCRIPTION" size="50000" type="CLOB" required="false"/>
+ <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_VERSION" size="500" type="VARCHAR2" required="false"/>
+ <column name="FILE_NAME" size="255" type="VARCHAR2" required="false"/>
+ <column name="FILE_SIZE" type="LONG" required="false"/>
+ <column name="FILE_MD5" size="32" type="VARCHAR2" required="false"/>
+ <column name="FILE_SHA256" size="64" type="VARCHAR2" required="false"/>
+ <column name="FILE_CREATION_TIME" type="LONG" required="false"/>
+ <column name="LICENSE_NAME" size="255" type="VARCHAR2" required="false"/>
+ <column name="LICENSE_VERSION" size="20" type="VARCHAR2" required="false"/>
+ <column name="METADATA" type="BLOB" required="false"/>
+
+ <column name="PACKAGE_ID" type="INTEGER" references="RHQ_PACKAGE" required="true"/>
+ <column name="ARCHITECTURE_ID" type="INTEGER" references="RHQ_ARCHITECTURE" required="true"/>
+ <column name="CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+ <column name="PACKAGE_BITS_ID" type="INTEGER" references="RHQ_PACKAGE_BITS" required="false"/>
+
+ <index name="RHQ_PACKAGE_VERSION_IDX" unique="true">
+ <field ref="PACKAGE_ID"/>
+ <field ref="VERSION"/>
+ <field ref="ARCHITECTURE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_CONTENT_REQ">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="REQUEST_TYPE" type="VARCHAR2" required="true" size="20"/>
+ <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
+ </table>
+
+ <table name="RHQ_INSTALLED_PACKAGE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="INSTALLATION_TIME" type="LONG" required="false"/>
+
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
+ <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="false"/>
+ </table>
+
+ <table name="RHQ_INSTALLED_PKG_HIST">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STATUS" type="VARCHAR2" size="24" required="true"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="HISTORY_TIMESTAMP" type="LONG" required="false"/>
+
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
+ <column name="DEPLOYMENT_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+ <column name="CONTENT_SERVICE_REQUEST_ID" type="INTEGER" references="RHQ_CONTENT_REQ" required="false"/>
+ </table>
+
+ <table name="RHQ_CONTENT_SRC_SYNC">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
+ <column name="START_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="false"/>
+ <column name="RESULTS" type="LONGVARCHAR" required="false"/>
+
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ </table>
+
+ <table name="RHQ_PACKAGE_INST_STEP">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STEP_KEY" type="VARCHAR2" size="500" required="true"/>
+ <column name="STEP_ORDER" type="INTEGER" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="4000" required="true"/>
+ <column name="ERROR_MSG" type="LONGVARCHAR" required="false"/>
+ <column name="RESULT" type="VARCHAR2" size="25" required="true"/>
+
+ <column name="INSTALLED_PKG_HIST_ID" type="INTEGER" references="RHQ_INSTALLED_PKG_HIST"/>
+ </table>
+
+ <table name="RHQ_CHANNEL_RESOURCE_MAP">
+ <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_CHANNEL_RESOURCE_MAP_KEY">
+ <primaryKey>
+ <field ref="CHANNEL_ID"/>
+ <field ref="RESOURCE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_CHANNEL_CONTENT_SRC_MAP">
+ <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_CHAN_CONTENT_SRC_MAP_KEY">
+ <primaryKey>
+ <field ref="CHANNEL_ID"/>
+ <field ref="CONTENT_SRC_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_CHANNEL_PKG_VERSION_MAP">
+ <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_CHANNEL_PKG_VER_MAP_KEY">
+ <primaryKey>
+ <field ref="CHANNEL_ID"/>
+ <field ref="PACKAGE_VERSION_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_PKG_VER_CONTENT_SRC_MAP">
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ <column name="LOCATION" type="VARCHAR2" size="4000" required="true"/>
+
+ <constraint name="RHQ_PKG_VER_CONTENT_SRC_KEY">
+ <primaryKey>
+ <field ref="PACKAGE_VERSION_ID"/>
+ <field ref="CONTENT_SRC_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_PKG_PRD_MAP">
+ <column name="PKG_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="PRD_ID" type="INTEGER" required="true" references="RHQ_PRD_VER"/>
+
+ <constraint name="RHQ_PKG_PRD_KEY">
+ <primaryKey>
+ <field ref="PKG_ID"/>
+ <field ref="PRD_ID"/>
+ </primaryKey>
+ </constraint>
+
+ </table>
+
+<!-- END: content-schema.xml -->
+<!-- BEGIN: resource-request-schema.xml -->
+
+
+ <table name="RHQ_CREATE_RES_HIST">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="PARENT_RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="CREATED_RESOURCE_NAME" type="VARCHAR2" size="500" required="false"/>
+ <column name="NEW_RESOURCE_KEY" type="VARCHAR2" required="false" size="500"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="INSTALLED_PACKAGE_ID" type="INTEGER" required="false" references="RHQ_INSTALLED_PACKAGE"/>
+ </table>
+
+ <table name="RHQ_DELETE_RES_HIST">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ </table>
+
+<!-- END: resource-request-schema.xml -->
+<!-- BEGIN: jms-schema.xml -->
+
+<!-- the schema matches that which would be automatically created by the JMS subsystem -->
+<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
+
+
+ <table name="JMS_MESSAGES">
+ <column name="MESSAGEID" required="true" type="INTEGER" />
+ <column name="DESTINATION" required="true" type="VARCHAR2" size="255" />
+ <column name="TXID" required="false" type="INTEGER" />
+ <column name="TXOP" required="false" type="CHAR" size="1" />
+ <column name="MESSAGEBLOB" required="false" type="BLOB" />
+
+ <constraint name="JMS_MESSAGES_PKEY">
+ <primaryKey>
+ <field ref="MESSAGEID"/>
+ <field ref="DESTINATION"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="JMS_MESSAGES_TXOP_TXID">
+ <field ref="TXOP"/>
+ <field ref="TXID"/>
+ </index>
+ <index name="JMS_MESSAGES_DESTINATION">
+ <field ref="DESTINATION"/>
+ </index>
+ </table>
+
+ <table name="JMS_TRANSACTIONS">
+ <column name="TXID" required="true" type="INTEGER" primarykey="true" />
+ </table>
+
+ <table name="JMS_USERS">
+ <column name="USERID" required="true" type="VARCHAR2" size="32" primarykey="true" />
+ <column name="PASSWD" required="true" type="VARCHAR2" size="32" />
+ <column name="CLIENTID" required="false" type="VARCHAR2" size="128" />
+ </table>
+
+ <table name="JMS_ROLES">
+ <column name="ROLEID" required="true" type="VARCHAR2" size="32" />
+ <column name="USERID" required="true" type="VARCHAR2" size="32" />
+
+ <constraint name="JMS_ROLES_PKEY">
+ <primaryKey>
+ <field ref="USERID"/>
+ <field ref="ROLEID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="JMS_SUBSCRIPTIONS">
+ <column name="CLIENTID" required="true" type="VARCHAR2" size="128" />
+ <column name="SUBNAME" required="true" type="VARCHAR2" size="128" />
+ <column name="TOPIC" required="true" type="VARCHAR2" size="255" />
+ <column name="SELECTOR" required="false" type="VARCHAR2" size="255" />
+
+ <constraint name="JMS_SUBSCRIPTIONS_PKEY">
+ <primaryKey>
+ <field ref="CLIENTID"/>
+ <field ref="SUBNAME"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: jms-schema.xml -->
+<!-- BEGIN: alert-schema.xml -->
+
+
+ <table name="RHQ_ALERT_DEFINITION">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="PARENT_ID" type="INTEGER" required="false"/>
+ <column name="GROUP_ALERT_DEF_ID" type="INTEGER" required="false"/>
+ <column name="DESCRIPTION" required="false" size="250" type="VARCHAR2"/>
+ <column name="PRIORITY" type="VARCHAR2" size="15" required="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="false"/>
+ <column name="RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP" required="false"/>
+ <column name="ENABLED" required="true" default="TRUE" type="BOOLEAN"/>
+
+ <column name="REQUIRED" required="true" type="SMALLINT"/>
+
+ <column name="RECOVERY_ID" type="INTEGER" required="true"/>
+ <!-- required, but 0 effectively means null -->
+ <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
+ <column name="NOTIFY_FILTERED" required="true" default="false" type="BOOLEAN"/>
+ <column name="CONTROL_FILTERED" required="true" default="FALSE" type="BOOLEAN"/>
+
+ <column name="DELETED" required="true" default="FALSE" type="BOOLEAN"/>
+ <column name="READ_ONLY" required="true" default="FALSE" type="BOOLEAN"/>
+
+ <column name="DAMPENING_CATEGORY" type="SMALLINT" required="true"/>
+ <column name="DAMPENING_VALUE" type="INTEGER"/>
+ <column name="DAMPENING_VALUE_UNITS" type="SMALLINT"/>
+ <column name="DAMPENING_PERIOD" type="INTEGER"/>
+ <column name="DAMPENING_PERIOD_UNITS" type="SMALLINT"/>
+
+ <column name="OPERATION_DEF_ID" type="INTEGER" references="RHQ_OPERATION_DEF(ID)"/>
+ </table>
+
+ <table name="RHQ_ALERT_DAMPEN_EVENT">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="EVENT_TYPE" required="true" type="SMALLINT"/>
+ <column name="EVENT_TIMESTAMP" required="true" type="LONG"/>
+
+ <index name="RHQ_DAMPENING_EVENT_TYPE_IDX">
+ <field ref="EVENT_TYPE"/>
+ </index>
+ <index name="RHQ_DAMPENING_EVENT_TS_IDX">
+ <field ref="EVENT_TIMESTAMP"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ALERT_CONDITION">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="TYPE" required="true" type="VARCHAR2" size="15"/>
+ <!--
+ <column name="REQUIRED" required="true" type="BOOLEAN"/>
+ -->
+ <column name="MEASUREMENT_DEFINITION_ID" required="false" type="INTEGER"/>
+ <column name="NAME" required="false" size="100" type="VARCHAR2"/>
+ <column name="COMPARATOR" required="false" size="2" type="VARCHAR2"/>
+ <column name="THRESHOLD" required="false" type="DOUBLE"/>
+ <!-- event-based conditions use OPTION_STATUS for the string match, so should be a decent length -->
+ <column name="OPTION_STATUS" required="false" size="256" type="VARCHAR2"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="TRIGGER_ID" required="false" type="INTEGER"/>
+ </table>
+
+ <table name="RHQ_ALERT" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true" logging="false">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="TRIGGERED_OPERATION" required="false" type="VARCHAR2" size="255"/>
+ <column name="RECOVERY_ID" type="INTEGER" required="true"/>
+ <!-- required, but 0 effectively means null -->
+ <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
+ <index name="RHQ_ALERT_IDX_TIME" unique="false">
+ <field ref="CTIME"/>
+ </index>
+ <index name="RHQ_ALERT_IDX_ALERTDEF" unique="false">
+ <field ref="ALERT_DEFINITION_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ALERT_NOTIF_LOG" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true" logging="false">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/>
+ <index name="RHQ_ALERT_IDX_ALERT" unique="true">
+ <field ref="ALERT_ID"/>
+ </index>
+ <column name="ROLES" required="false" size="200" type="VARCHAR2"/>
+ <column name="SUBJECTS" required="false" size="200" type="VARCHAR2"/>
+ <column name="EMAILS" required="false" size="200" type="VARCHAR2"/>
+ </table>
+
+ <table name="RHQ_ALERT_CONDITION_LOG" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true" logging="false">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="ALERT_ID" required="false" type="INTEGER" references="RHQ_ALERT(ID)"/>
+ <column name="CONDITION_ID" required="true" type="INTEGER" references="RHQ_ALERT_CONDITION(ID)"/>
+ <column name="VALUE" required="false" size="250" type="VARCHAR2"/>
+ <index name="RHQ_ALERT_COND_LOG_IDX_TIME">
+ <field ref="CTIME" />
+ </index>
+ <index name="RHQ_ALERT_COND_LOG_IDX_ALERT">
+ <field ref="ALERT_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ALERT_NOTIFICATION" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true" logging="false">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NOTIFICATION_TYPE" required="true" size="20" type="VARCHAR2"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE(ID)"/>
+ <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT(ID)"/>
+ <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
+ <column name="SNMP_HOST" size="100" type="VARCHAR2"/>
+ <column name="SNMP_PORT" type="INTEGER"/>
+ <column name="SNMP_OID" size="250" type="VARCHAR2"/>
+ </table>
+
+<!-- END: alert-schema.xml -->
+<!-- BEGIN: event-schema.xml -->
+
+
+ <!-- metadata -->
+
+ <table name="RHQ_EVENT_DEF">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
+
+ <column name="NAME" type="VARCHAR2" size="100" required="true"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+
+ <index name="RHQ_EVENT_DEF_IDX" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- instance data -->
+
+ <table name="RHQ_EVENT_SOURCE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="EVENT_DEF_ID" type="INTEGER" required="true" references="RHQ_EVENT_DEF(ID)"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
+
+ <column name="LOCATION" required="true" size="2000" type="VARCHAR2"/>
+
+ <index name="RHQ_EVENT_SOURCE_IDX" unique="true">
+ <field ref="EVENT_DEF_ID"/>
+ <field ref="RESOURCE_ID"/>
+ <field ref="LOCATION"/>
+ </index>
+ </table>
+
+ <table name="RHQ_EVENT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="EVENT_SOURCE_ID" type="INTEGER" required="true" references="RHQ_EVENT_SOURCE(ID)"/>
+
+ <column name="TIMESTAMP" required="true" type="LONG"/>
+ <column name="SEVERITY" required="true" size="20" type="VARCHAR2"/>
+ <column name="DETAIL" required="true" size="4000" type="VARCHAR2"/>
+ <index name="RHQ_EVENT_IDX" unique="false">
+ <field ref="EVENT_SOURCE_ID"/>
+ <field ref="TIMESTAMP"/>
+ </index>
+ </table>
+
+<!-- END: event-schema.xml -->
+</dbsetup>
diff --git a/pom.xml b/pom.xml
index 7c866dc..753577f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,39 +85,6 @@
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.2</jna.version>
- <!-- defaults for datasource used by integration tests -
- these may be overridden in ~/.m2/settings.xml -->
- <rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.test.ds.connection-url>
- <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
- <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class>
- <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name>
- <rhq.test.ds.password>rhqadmin</rhq.test.ds.password>
- <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping>
- <rhq.test.ds.server-name>127.0.0.1</rhq.test.ds.server-name>
- <rhq.test.ds.port>5432</rhq.test.ds.port>
- <rhq.test.ds.db-name>rhq</rhq.test.ds.db-name>
- <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>
- <rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass>
- <rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
- <rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
-
- <!-- defaults for datasource used by the dev container build (see dev docs on the 'dev' profile) -
- these may be overridden in ~/.m2/settings.xml -->
- <rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqdev</rhq.dev.ds.connection-url>
- <rhq.dev.ds.driver-class>org.postgresql.Driver</rhq.dev.ds.driver-class>
- <rhq.dev.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.dev.ds.xa-datasource-class>
- <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
- <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
- <rhq.dev.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.dev.ds.password.encrypted>
- <rhq.dev.ds.type-mapping>PostgreSQL</rhq.dev.ds.type-mapping>
- <rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
- <rhq.dev.ds.port>5432</rhq.dev.ds.port>
- <rhq.dev.ds.db-name>rhqdev</rhq.dev.ds.db-name>
- <rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.dev.ds.hibernate-dialect>
- <rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.dev.quartz.driverDelegateClass>
- <rhq.dev.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE</rhq.dev.quartz.selectWithLockSQL>
- <rhq.dev.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.dev.quartz.lockHandlerClass>
-
<!-- default port numbers for RHQ server -->
<rhq.server.http.port>7080</rhq.server.http.port>
<rhq.server.https.port>7443</rhq.server.https.port>
commit b75aca89d96e1421a26003dca674b290a849365f
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue May 11 14:42:19 2010 -0400
BZ-588568, BZ-589268: i)Fixed order of hibernate query to eliminate wierd sql syntax issuues ii)modified content repo named query to include resource type name in search.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 23186e5..510a729 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -459,7 +459,7 @@ import org.rhq.core.domain.util.Summary;
+ " WHERE rc.repo.id = :repoId ) " //
+ " AND (:category = res.resourceType.category OR :category IS NULL) " //
+ " AND (res.inventoryStatus = :inventoryStatus) " //
- + " AND (:search is null OR UPPER(res.name) LIKE :search ESCAPE :escapeChar) "),
+ + " AND (UPPER(res.name) LIKE :search ESCAPE :escapeChar) OR (UPPER(res.resourceType.name) LIKE :search ESCAPE :escapeChar) OR :search is null"),
@NamedQuery(name = Resource.QUERY_GET_AVAILABLE_RESOURCES_FOR_RESOURCE_GROUP, query = "" //
+ "SELECT res " //
+ " FROM Resource AS res " //
@@ -1114,7 +1114,6 @@ public class Resource implements Comparable<Resource>, Serializable {
// @OneToMany(mappedBy = "resource", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
// private List<BundleResourceDeployment> resourceDeployments = new ArrayList<BundleResourceDeployment>();
-
@ManyToMany(mappedBy = "resources", fetch = FetchType.LAZY)
private Set<Tag> tags;
@@ -1707,9 +1706,10 @@ public class Resource implements Comparable<Resource>, Serializable {
}
tags.add(tag);
}
- public boolean removeTag (Tag tag) {
+
+ public boolean removeTag(Tag tag) {
if (tags != null) {
- return tags.remove (tag);
+ return tags.remove(tag);
} else {
return false;
}
commit 689941199bfcfac9c1551f6192562e91bd9a6553
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue May 11 20:35:42 2010 +0200
BZ 576230 - [apache] Saving Apache configuration from RHQ UI destroys all comments
I have changed the lens.
diff --git a/modules/plugins/apache/src/main/resources/httpd.aug b/modules/plugins/apache/src/main/resources/httpd.aug
index 668313b..0fddced 100644
--- a/modules/plugins/apache/src/main/resources/httpd.aug
+++ b/modules/plugins/apache/src/main/resources/httpd.aug
@@ -51,7 +51,7 @@ let sections (body:lens) = sec "Directory" body
(* FIXME: *)
(* - Nesting of sections *)
-let rec lns = ((directive | comment)* | sections lns)*
+let rec lns = (directive | comment | sections lns)*
let filter =
incl "/etc/httpd/conf/httpd.conf"
commit 9d65333e3e02dfddb3c6f7a53ea75f8c5d16d1ca
Merge: a1ac186... a04ec9c...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue May 11 14:17:59 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit a1ac18674d6fbe940d2e20fa9785b1d698c035a6
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue May 11 14:16:47 2010 -0400
get as5 plugin working w/ AS 6.0.0.M3 (fix for https://bugzilla.redhat.com/show_bug.cgi?id=591177); add comment in JBossAS5ConnectionTypeDescriptor that explains why getConnectionClasspathEntries() returns an empty array
(cherry picked from commit c1f50e8de159e9248f3b42c2c0ddd48d94426120)
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
index 3b51ec7..4174283 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
@@ -92,13 +92,18 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
}
private static final String[] CLIENT_JARS = new String[] {
+ // NOTE: The jbossall-client.jar aggregates a whole bunch of other jars from the client dir via its
+ // MANIFEST.MF Class-Path.
"client/jbossall-client.jar",
"client/trove.jar",
"client/javassist.jar",
"common/lib/jboss-security-aspects.jar",
"lib/jboss-managed.jar",
"lib/jboss-metatype.jar",
- "lib/jboss-dependency.jar"
+ "lib/jboss-dependency.jar",
+ // The below jars are required for JBoss AS 6.0 M1, M2, and M3.
+ "lib/jboss-classpool.jar",
+ "lib/jboss-classpool-scoped.jar"
};
private final Log log = LogFactory.getLog(this.getClass());
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossAS5ConnectionTypeDescriptor.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossAS5ConnectionTypeDescriptor.java
index 4a3a5c3..9fa3dea 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossAS5ConnectionTypeDescriptor.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossAS5ConnectionTypeDescriptor.java
@@ -25,58 +25,25 @@ package org.rhq.plugins.jbossas5.helper;
import org.mc4j.ems.connection.support.metadata.JBossConnectionTypeDescriptor;
/**
- * A connection type descriptor to support jnp connections to JBoss AS 5 through EMS.
+ * A connection type descriptor to support JNP connections to JBoss AS 5.x/6.x through EMS.
*
* @author Lukas Krejci
*/
public class JBossAS5ConnectionTypeDescriptor extends JBossConnectionTypeDescriptor {
-
private static final long serialVersionUID = 1L;
+ private static final String[] CONNECTION_CLASSPATH_ENTRIES = new String[0];
+
@Override
public String getRecongnitionPath() {
return "lib/jboss-main.jar";
}
+ // NOTE: We return an empty array, because this plugin uses RHQ's new plugin connection classloader facility
+ // (see org.rhq.core.pluginapi.inventory.ClassLoaderFacet), rather than EMS, to load JBoss AS client jars via
+ // a connection-scoped classloader.
@Override
public String[] getConnectionClasspathEntries() {
- // This is what Scott recommended using for JBAS 5.1:
- //
- // <classpath>
- // <classpathentry kind="src" path="src"/>
- // <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-common-core.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jnp-client.jar"/>
- // <classpathentry kind="var" path="JBOSS/lib/jboss-profileservice-spi.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-logging-jdk.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-logging-log4j.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/log4j.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-logging-spi.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-aop-client.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-remoting.jar"/>
- // <classpathentry kind="var" path="JBOSS/common/lib/jboss-security-aspects.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-aspect-jdk50-client.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/trove.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/javassist.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-mdr.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-security-spi.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jbosssx-client.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/jboss-javaee.jar"/>
- // <classpathentry kind="var" path="JBOSS/client/concurrent.jar"/>
- // <classpathentry kind="output" path="bin"/>
- // </classpath>
- return new String[0];
-
- /*return new String[] { "client/jboss-common-core.jar", "client/jnp-client.jar",
- "lib/jboss-profileservice-spi.jar", "client/jboss-logging-jdk.jar", "client/jboss-logging-jdk.jar",
- "client/log4j.jar", "client/jboss-logging-spi.jar", "client/jboss-aop-client.jar",
- "client/jboss-remoting.jar", "common/lib/jboss-security-aspects.jar",
- "client/jboss-aspect-jdk50-client.jar", "client/trove.jar", "client/javassist.jar", "client/jboss-mdr.jar",
- "client/jboss-security-spi.jar", "client/jbosssx-client.jar", "client/jboss-javaee.jar",
- "client/concurrent.jar", "client/jmx-invoker-adaptor-client.jar", "client/jboss-client.jar",
- "client/jboss-integration.jar", "client/jboss-serialization.jar",
- //this is to support hibernate plugin out of the box in jboss as 5
- "common/lib/hibernate-core.jar" };*/
+ return CONNECTION_CLASSPATH_ENTRIES;
}
-
}
commit a04ec9c6b0bed3029b8191254ab00ed61bae8b05
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 11 12:08:08 2010 +0200
BZ 591041 remove extra chars after the resource id
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml
index d3e987b..6e46aff 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml
@@ -197,7 +197,7 @@
}
if (theVal > -1) {
- targetField.value = theVal + "\n";
+ targetField.value = theVal;
window.close();
}
}
commit 7f8438f3d7a5d3d8c3512f2cf2d556a8e30f237e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 11 11:58:19 2010 +0200
Not all alert senders have cusom backing beans.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
index 3aaddde..5fc74c6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
@@ -146,12 +146,14 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
for (AlertNotification notification : toBeRemoved) {
CustomAlertSenderBackingBean bb = getBackingBeanForSender(notification.getSenderName(), notification
.getId());
- try {
- bb.internalCleanup();
- } catch (Throwable t) {
- LOG
- .error("removeNotifications, calling backingBean.internalCleanup() resulted in " + t.getMessage(),
- t);
+ if (bb!=null) { // Not all alert senders have custom backing beans
+ try {
+ bb.internalCleanup();
+ } catch (Throwable t) {
+ LOG
+ .error("removeNotifications, calling backingBean.internalCleanup() resulted in " + t.getMessage(),
+ t);
+ }
}
}
commit f8b6843c2d1d9ea66e37209950d8fd53ce744dd5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue May 11 11:51:57 2010 +0200
Filter property got renamed to 'search'
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml
index 9ab9398..d3e987b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml
@@ -32,7 +32,7 @@
<p/>
<h:panelGroup>
<h:outputLabel for="filter" value="Search: " />
- <h:inputText id="filter" value="#{BrowseResourcesUIBean.filter}"
+ <h:inputText id="filter" value="#{BrowseResourcesUIBean.search}"
onkeypress="return ignoreEnterKey(event);"
style="width: 600px;" />
<rich:suggestionbox id="suggest" for="filter"
commit 77727ea333737df15b5e32e4d3ddc1d5b34bb4cb
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 10 13:33:50 2010 -0400
remove use of nexus deprecated repo, which conflicts with the original jboss repo declared in the root pom
(cherry picked from commit e7770d955a8b0fffbdeb4a937db5cccc1b24731f)
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 266492d..7ed877c 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -27,6 +27,7 @@
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
</properties>
+
<dependencies>
<!-- the notorious util jar -->
@@ -224,6 +225,7 @@
</dependencies>
+
<build>
<finalName>rhq-core-domain-ejb3</finalName>
@@ -298,6 +300,7 @@
</plugins>
</build>
+
<profiles>
<profile>
@@ -403,17 +406,7 @@
</profiles>
- <repositories>
-
- <!-- This is needed for the old version of Hibernate that we use. -->
- <repository>
- <id>jboss-deprecated-repository</id>
- <name>JBoss Deprecated Maven Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+ <repositories>
<repository>
<id>codehaus</id>
@@ -424,6 +417,6 @@
</snapshots>
</repository>
- </repositories>
+ </repositories>
</project>
commit 739ccb1b2e3ba369580b956b7aaea4e18f503674
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 10 13:13:37 2010 -0400
remove use of nexus deprected repo, which was overriding the original jboss repo in the root pom, which has the same id
(cherry picked from commit 14ba96a455ec10be4fe1019b0ab47ed70646a36b)
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index f461b8e..1672828 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -19,6 +19,7 @@
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/gui/porta…</developerConnection>
</scm>
+
<properties>
<scm.module.path>modules/enterprise/gui/portal-war/</scm.module.path>
@@ -40,6 +41,7 @@
<product.help.doc.root>http://support.rhq-project.org/display/RHQ/</product.help.doc.root>
</properties>
+
<dependencies>
<!-- Internal Deps -->
@@ -392,6 +394,7 @@
</dependencies>
+
<build>
<finalName>rhq-portal</finalName>
<plugins>
@@ -472,6 +475,7 @@
</build>
+
<profiles>
<profile>
@@ -581,6 +585,7 @@
</profiles>
+
<repositories>
<repository>
@@ -590,22 +595,6 @@
<layout>legacy</layout>
</repository>
- <!-- This is needed for the org.jvnet:inflector dep.
- TODO: Publish the inflector artifact to the JBoss 3rd party repo. -->
- <repository>
- <id>jboss-deprecated-repository</id>
- <name>JBoss Deprecated Maven Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
</repositories>
</project>
commit 7f9620c8eaf07b001cac774982e2cf7279469282
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon May 10 10:39:38 2010 -0400
add old jboss repo as plugin repo, so jboss-packaging plugin can bo obtained from it
(cherry picked from commit 848bb5afaad36bc3c3e1653f6a9957b134a4756a)
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 4db329f..68deca1 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -1,4 +1,6 @@
-<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>
@@ -12,18 +14,14 @@
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
<packaging>pom</packaging>
- <name>RHQ Enterprise Server JBossAS Services</name>
- <description>parent POM for all JBossAS services</description>
+ <name>RHQ Enterprise Server JBoss AS SARs</name>
+ <description>parent POM for all JBoss AS SARs</description>
<scm>
<connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/sa…</connection>
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/sa…</developerConnection>
</scm>
- <properties>
- <scm.module.path>modules/enterprise/server/sars/</scm.module.path>
- </properties>
-
<build>
<plugins>
@@ -37,18 +35,20 @@
</plugins>
</build>
- <profiles>
+ <modules>
+ <module>agent-sar</module>
+ </modules>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>agent-sar</module>
- </modules>
- </profile>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-deprecated-repository</id>
+ <name>JBoss Deprecated</name>
+ <url>https://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
- </profiles>
+</project>
-</project>
\ No newline at end of file
commit 5f5c64bf492506d81e7f2045a77daefe9e328899
Merge: 922d303... 1cdcd06...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon May 10 11:13:45 2010 +0200
Merge branch 'master' into bugfixes
commit 1cdcd06385fae9025f2549043068b5b34e9e06a2
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon May 10 00:08:54 2010 -0400
[BZ 582991] Changing type of Alert.ackTime from long to Long to handle nulls in the database
This resolves the IllegalArgumentException that was getting thrown as a result of fetching
alerts that had a null value in the ack_time column.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java
index b676c05..593f223 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java
@@ -258,7 +258,7 @@ public class Alert implements Serializable {
private boolean willRecover;
@Column(name = "ACK_TIME")
- private long acknowledgeTime = -1;
+ private Long acknowledgeTime = -1L;
@Column(name = "ACK_SUBJECT")
private String acknowledgingSubject;
@@ -333,11 +333,11 @@ public class Alert implements Serializable {
this.triggeredOperation = triggeredOperation;
}
- public long getAcknowledgeTime() {
+ public Long getAcknowledgeTime() {
return acknowledgeTime;
}
- public void setAcknowledgeTime(long acknowledgeTime) {
+ public void setAcknowledgeTime(Long acknowledgeTime) {
this.acknowledgeTime = acknowledgeTime;
}
commit fba1e3a0bbf17dbad1182b0920e9ba78ee08b8c9
Merge: 4f3687c... 4d661b9...
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun May 9 11:29:41 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 4f3687ca986a83819880a354afab7a027aedc555
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun May 9 11:26:48 2010 -0400
[BZ 582991] Fixing property name references
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp
index a61bf07..8e00233 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp
@@ -40,20 +40,22 @@
<td class="BlockContent" colspan="2"><hq:dateFormatter time="false" value="${alert.ctime}"/></td>
</tr>
<c:choose>
- <c:when test="${not empty alert.ackBy}">
+ <c:when test="${not empty alert.acknowledgingSubject}">
<tr valign="top">
<td class="BlockLabel">Acknowledged by:</td>
<td class="BlockContent">
- <c:out value="${alert.ackBy.firstName}"/>
+ <c:out value="${alert.acknowledgingSubject}"/>
+ <%--
<c:out value=" "/>
- <c:out value="${alert.ackBy.lastName}"/>
+ <c:out value="${alert.acknowledgingSubject.lastName}"/>
<c:out value=" ("/>
- <c:out value="${alert.ackBy.name}"/>
+ <c:out value="${alert.acknowledgingSubject.name}"/>
<c:out value=")"/>
+ --%>
</td>
<td class="BlockLabel">Acknowledged at:</td>
<td class="BlockContent">
- <hq:dateFormatter time="false" value="${alert.ackTime}"/>
+ <hq:dateFormatter time="false" value="${alert.acknowledgeTime}"/>
</td>
</tr>
</c:when>
commit 4d661b9aec44282fea747d60def24e44d6461caa
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Fri May 7 16:31:33 2010 -0400
BZ-537236, BZ-584994: i)repo pagination control error. ii)ldap pagination control issues for pending and sorting columns.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
index 6cbbfce..1acc73b 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java
@@ -144,82 +144,21 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
//We cannot reuse the PageControl mechanism as there are no database calls to retrieve list
// must replicate paging using existing web params, formula etc.
-
- //determine count to return up to 15|30|45 and page index
- int returnAmount = pca.getPageSize();
- int returnIndex = pca.getPageNumber();
-
- //determine sort order
- PageOrdering sortOrder = pca.getPrimarySortOrder();
- if (sortOrder == null) {
- sortOrder = PageOrdering.ASC;
- pca.setPrimarySortOrder(sortOrder);//reset on pc
- }
-
- //determine which column to sort on
- String sortColumn = pca.getPrimarySortColumn();
- if (sortColumn == null) {
- sortColumn = "lg.name";
- pca.setPrimarySort(sortColumn, sortOrder);//reset on pc
- }
-
- //now sort based off these values and populate sizedAvailableGroups accordingly
- ArrayList<Map<String, String>> groupsValues = availableGroups.getValues();
-
- //store maps based off the keys and sort()
- Map<Integer, Map> groupLookup = new HashMap<Integer, Map>();
- TreeMap<String, Integer> groupNames = new TreeMap<String, Integer>();
- TreeMap<String, Integer> groupDescriptions = new TreeMap<String, Integer>();
- for (int i = 0; i < groupsValues.size(); i++) {
- Map<String, String> entry = groupsValues.get(i);
- Integer key = Integer.valueOf(i);
- groupLookup.put(key, entry);
- groupNames.put(entry.get("name"), key);
- groupDescriptions.put(entry.get("description"), key);
- }
-
- //do calculations to determine how many sorted values to return.
- int start, end;
- start = (int) (returnIndex * returnAmount);
- end = start + returnAmount;
PageList<Map<String, String>> sizedAvailableGroups = new PageList<Map<String, String>>();
+ sizedAvailableGroups = paginateLdapGroupData(sizedAvailableGroups, availableGroups, pca);
- //detect sort order
- boolean descending = false;
- if (sortOrder.DESC == sortOrder) {
- descending = true;
- }
- //use sort column to determine which list to use
- if (sortColumn.equalsIgnoreCase("lg.name")) {
- int i = 0;
- NavigableSet<String> keyList = groupNames.navigableKeySet();
- if (descending) {
- keyList = groupNames.descendingKeySet();
- }
- for (String key : keyList) {
- if ((i >= start) && (i < end)) {
- sizedAvailableGroups.add(groupLookup.get(groupNames.get(key)));
- }
- i++;
- }
- } else {
- int i = 0;
- NavigableSet<String> keyList = groupDescriptions.navigableKeySet();
- if (descending) {
- keyList = groupNames.descendingKeySet();
- }
- for (String key : keyList) {
- if ((i >= start) && (i < end)) {
- sizedAvailableGroups.add(groupLookup.get(groupDescriptions.get(key)));
- }
- i++;
- }
- }
//make sizedAvailableGroup the new reference to return.
availableGroups = sizedAvailableGroups;
//populate pagination elements for loaded elements.
- availableGroups.setTotalSize(groupLookup.size());
+ availableGroups.setTotalSize(availableGroupsSet.size());
availableGroups.setPageControl(pca);
+ //now do the same thing for Pending Groups.
+ PageList<Map<String, String>> pagedPendingGroups = new PageList<Map<String, String>>();
+ pagedPendingGroups = paginateLdapGroupData(pagedPendingGroups, pendingGroups, pcp);
+ pendingGroups = pagedPendingGroups;
+ //populate pagination elements for loaded elements.
+ pendingGroups.setTotalSize(pendingSet.size());
+ pendingGroups.setPageControl(pcp);
} catch (EJBException ejx) {
//this is the exception type thrown now that we use SLSB.Local methods
@@ -304,4 +243,99 @@ public class AddLdapGroupsFormPrepareAction extends TilesAction {
}
return ret;
}
+
+ /** Method duplicates pageControl/pagination mechanism for LdapGroup data. This data has not been moved into the
+ * database yet so the PageList and PageControl mechanism does not yet work properly.
+ * There are only two columns so the pagination code uses Maps and Sorted Lists for efficient sorting.
+ *
+ * @param pagedGroupData Pagelist of Maps to be populated.
+ * @param fullGroupData Full list of Maps available for paging
+ * @param pc the pagination control from the web session reflecting user selections.
+ * @return Pagelist includes datapoints matching pagination information passed in.
+ */
+ private PageList<Map<String, String>> paginateLdapGroupData(PageList<Map<String, String>> pagedGroupData,
+ PageList<Map<String, String>> fullGroupData, PageControl pc) {
+ if (pagedGroupData == null) { //
+ pagedGroupData = new PageList<Map<String, String>>();
+ }
+ if ((fullGroupData == null) || (fullGroupData.isEmpty())) {
+ return pagedGroupData;
+ }
+ if (pc == null) {
+ pc = new PageControl(0, 15);
+ }//npe defense
+
+ //determine count to return up to 15|30|45 and page index
+ int returnAmount = pc.getPageSize();
+ int returnIndex = pc.getPageNumber();
+
+ //determine sort order
+ PageOrdering sortOrder = pc.getPrimarySortOrder();
+ if (sortOrder == null) {
+ sortOrder = PageOrdering.ASC;
+ pc.setPrimarySortOrder(sortOrder);//reset on pc
+ }
+
+ //determine which column to sort on
+ String sortColumn = pc.getPrimarySortColumn();
+ if (sortColumn == null) {
+ sortColumn = "lg.name";
+ pc.setPrimarySort(sortColumn, sortOrder);//reset on pc
+ }
+
+ //now sort based off these values and populate sizedAvailableGroups accordingly
+ ArrayList<Map<String, String>> groupsValues = fullGroupData.getValues();
+
+ //store maps based off the keys and sort()
+ Map<Integer, Map> groupLookup = new HashMap<Integer, Map>();
+ TreeMap<String, Integer> groupNames = new TreeMap<String, Integer>();
+ TreeMap<String, Integer> groupDescriptions = new TreeMap<String, Integer>();
+ for (int i = 0; i < groupsValues.size(); i++) {
+ Map<String, String> entry = groupsValues.get(i);
+ Integer key = Integer.valueOf(i);
+ groupLookup.put(key, entry);
+ groupNames.put(entry.get("name"), key);
+ groupDescriptions.put(entry.get("description"), key);
+ }
+
+ //do calculations to determine how many sorted values to return.
+ int start, end;
+ start = (int) (returnIndex * returnAmount);
+ end = start + returnAmount;
+ // PageList<Map<String, String>> sizedAvailableGroups = new PageList<Map<String, String>>();
+
+ //detect sort order
+ boolean descending = false;
+ if (sortOrder.DESC == sortOrder) {
+ descending = true;
+ }
+ //use sort column to determine which list to use
+ if (sortColumn.equalsIgnoreCase("lg.name")) {
+ int i = 0;
+ NavigableSet<String> keyList = groupNames.navigableKeySet();
+ if (descending) {
+ keyList = groupNames.descendingKeySet();
+ }
+ for (String key : keyList) {
+ if ((i >= start) && (i < end)) {
+ pagedGroupData.add(groupLookup.get(groupNames.get(key)));
+ }
+ i++;
+ }
+ } else {
+ int i = 0;
+ NavigableSet<String> keyList = groupDescriptions.navigableKeySet();
+ if (descending) {
+ keyList = groupDescriptions.descendingKeySet();
+ }
+ for (String key : keyList) {
+ if ((i >= start) && (i < end)) {
+ pagedGroupData.add(groupLookup.get(groupDescriptions.get(key)));
+ }
+ i++;
+ }
+ }
+
+ return pagedGroupData;
+ }
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
index 24dcc63..55fdd56 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml
@@ -223,11 +223,11 @@
<h:panelGrid columns="1" width="100%">
- <ui:param name="repoContentProviderDataModel"
+ <ui:param name="repoContentProvidersDataModel"
value="#{RepoContentSourcesUIBean.dataModel}" />
<rich:dataTable id="repoContentProvidersDataTable"
rows="#{PageControl.RepoContentSourcesList.pageSize}"
- value="#{repoContentProviderDataModel}"
+ value="#{repoContentProvidersDataModel}"
var="contentprovideritem" width="100%"
columnsWidth="1%, 20%, 15%, 15%, 9%, 9%"
headerClass="tableRowHeader" footerClass="on-pager-footer"
commit 922d3034e078a0cee1d87e5284e08f49a9abaed1
Merge: 005e31c... 9963996...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri May 7 21:49:18 2010 +0200
Merge branch 'master' into bugfixes
commit 99639969a30c64aa8549575b7f1adc26b9b31a74
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu May 6 15:07:23 2010 -0400
[BZ 582991] Adding missing id sequence
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 1251944..4989546 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2683,6 +2683,8 @@
<schema-addColumn table="RHQ_SAVED_SEARCH" column="GLOBAL" columnType="BOOLEAN" />
<schema-alterColumn table="RHQ_SAVED_SEARCH" column="GLOBAL" nullable="FALSE" />
+ <schema-createSequence name="RHQ_SAVED_SEARCH_ID_SEQ" initial="10001" />
+
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Inserting global default saved search 'Downed Platforms'">
INSERT INTO rhq_saved_search (id, context, name, description, pattern, last_compute_time, subject_id, global)
commit 19c8f08897a9b8c75b883fb2206ee97c431989da
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu May 6 11:48:35 2010 -0400
[BZ 582991] undoing deletion of operation_def_id from rhq_alert_definition since it is still referenced
Based on some disucssion with heiko we do want to delete the operation_def_id, but we also
want to remove the corresponding AlertDefinition.operationDefinition field and its usages.
operationDefinition is still used however in some obsolete code that needs to be cleaned
up. We will try to address this later all in one fell swoop.
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index ac0d85c..1251944 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2091,7 +2091,6 @@
<schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="email_address" />
<schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="role_id" />
<schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="subject_id" />
- <schema-deleteColumn table="RHQ_ALERT_DEFINITION" column="operation_def_id" />
</schemaSpec>
<schemaSpec version="2.70.4">
<schema-deleteColumn table="RHQ_ALERT_NOTIF_LOG" column="roles" />
commit 88b808d3cf1e5fbb9e60208c1aea818d03ebfd48
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 5 16:16:28 2010 -0400
[BZ 582991] Fixing dbupgrade script so that values for context column match enum value
Based on the enum value hibernate is expecting to find the value 'RESOURCE' in
rhq_saved_search.context but instead was finding 'Resource'. Modifying upgrade script to
use all caps value to be consistent with enum. This is already done in the set up script.
Adding some default configuration for the surefire plugin. When running a test in core/domain
I was getting OutOfMemoryErrors. I am not sure what the heap settings are for the forked vm,
but it must be pretty low. Setting a default args line to pass to the forked vm that sets
the min heap size to 16 MB and the max heap size to 256 MB.
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index a5c7b5e..ac0d85c 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2687,21 +2687,21 @@
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Inserting global default saved search 'Downed Platforms'">
INSERT INTO rhq_saved_search (id, context, name, description, pattern, last_compute_time, subject_id, global)
- VALUES (1, 'Resource', 'Downed Platforms', 'All downed machines across the entire enterprise', 'down platform', 0, 1, true)
+ VALUES (1, 'RESOURCE', 'Downed Platforms', 'All downed machines across the entire enterprise', 'down platform', 0, 1, true)
</statement>
<statement targetDBVendor="oracle" desc="Inserting global default saved search 'Downed Platforms'">
INSERT INTO rhq_saved_search (id, context, name, description, pattern, last_compute_time, subject_id, global)
- VALUES (1, 'Resource', 'Downed Platforms', 'All downed machines across the entire enterprise', 'down platform', 0, 1, 1)
+ VALUES (1, 'RESOURCE', 'Downed Platforms', 'All downed machines across the entire enterprise', 'down platform', 0, 1, 1)
</statement>
</schema-directSQL>
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Inserting global default saved search 'Downed Servers'">
INSERT INTO rhq_saved_search (id, context, name, description, pattern, last_compute_time, subject_id, global)
- VALUES (2, 'Resource', 'Downed Servers', 'All downed servers across the entire enterprise', 'down server', 0, 1, true)
+ VALUES (2, 'RESOURCE', 'Downed Servers', 'All downed servers across the entire enterprise', 'down server', 0, 1, true)
</statement>
<statement targetDBVendor="oracle" desc="Inserting global default saved search 'Downed Servers'">
INSERT INTO rhq_saved_search (id, context, name, description, pattern, last_compute_time, subject_id, global)
- VALUES (2, 'Resource', 'Downed Servers', 'All downed servers across the entire enterprise', 'down server', 0, 1, 1)
+ VALUES (2, 'RESOURCE', 'Downed Servers', 'All downed servers across the entire enterprise', 'down server', 0, 1, 1)
</statement>
</schema-directSQL>
</schemaSpec>
diff --git a/pom.xml b/pom.xml
index 1fa70b8..7c866dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,6 +523,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
+ <configuration>
+ <argLine>-Xms16m -Xmx256m</argLine>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
commit 005e31c4285ed6880935641d6731e8a7e92f6306
Merge: 3b81982... 528d01e...
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Wed May 5 02:29:21 2010 +0200
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
commit 3b8198246a94eb9f36b85528e7e367f9fb82c27c
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Wed May 5 02:28:15 2010 +0200
BZ 566235 - Downloading of cumulative patches now works as stream.
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java
index 6ae79d5..9703975 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java
@@ -204,4 +204,16 @@ public interface ContentServerService {
* @return the size, in number of bytes, of the package version
*/
long getPackageBitsLength(int resourceId, PackageDetailsKey packageDetailsKey);
-}
\ No newline at end of file
+
+ /**
+ * Requests loading of lazy loaded package. By this method the package content will be
+ * loaded to server and ready to stream to the client.
+ *
+ * @param resourceId
+ * @param packageDetailsKey
+ * @return
+ */
+ @Timeout(90 * 60 * 1000L)
+ @LimitedConcurrency(CONCURRENCY_LIMIT_CONTENT_DOWNLOAD)
+ boolean preLoadRemoteContent(int resourceId, PackageDetailsKey packageDetailsKey);
+}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
index 6eae797..1e2f6c8 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java
@@ -264,6 +264,11 @@ public class ContentManager extends AgentService implements ContainerService, Co
OutputStream outputStream, boolean resourceExists) {
ContentContextImpl contextImpl = (ContentContextImpl) context; // this has to be of this type, we gave it to the plugin
ContentServerService serverService = getContentServerService();
+
+ //we need to load the content to server before we will start download the content
+ // it is because of timeout on remoteStreams
+ serverService.preLoadRemoteContent(contextImpl.getResourceId(), packageDetailsKey);
+
outputStream = remoteOutputStream(outputStream);
long count = 0;
if (resourceExists) {
@@ -699,4 +704,4 @@ public class ContentManager extends AgentService implements ContainerService, Co
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentServerServiceImpl.java
index b740924..d1c2dcc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentServerServiceImpl.java
@@ -140,4 +140,11 @@ public class ContentServerServiceImpl implements ContentServerService {
long size = manager.getPackageBitsLength(resourceId, packageDetailsKey);
return size;
}
-}
\ No newline at end of file
+
+ public boolean preLoadRemoteContent(int resourceId,
+ PackageDetailsKey packageDetailsKey) {
+ ContentSourceManagerLocal manager = LookupUtil.getContentSourceManager();
+ return manager.downloadPackageBits(resourceId,packageDetailsKey);
+
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
index 9d51839..755a88f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
@@ -19,13 +19,13 @@
package org.rhq.enterprise.server.content;
import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.sql.Blob;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -51,10 +51,10 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.hibernate.lob.BlobImpl;
+import org.hibernate.lob.SerializableBlob;
import org.jboss.annotation.ejb.TransactionTimeout;
import org.jboss.util.StringPropertyReplacer;
-
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.content.Advisory;
@@ -792,7 +792,7 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
@RequiredPermission(Permission.MANAGE_INVENTORY)
@TransactionAttribute(TransactionAttributeType.REQUIRED)
- @TransactionTimeout(45 * 60)
+ @TransactionTimeout(90 * 60)
public PackageBits downloadPackageBits(Subject subject, PackageVersionContentSource pvcs) {
PackageVersionContentSourcePK pk = pvcs.getPackageVersionContentSourcePK();
int contentSourceId = pk.getContentSource().getId();
@@ -830,9 +830,11 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
Connection conn = null;
PreparedStatement ps = null;
-
+ PreparedStatement ps2 = null;
try {
packageBits = new PackageBits();
+ //we need to save not null value so that we can in next step load the value as a Blob
+ packageBits.setBits(new String("a").getBytes());
entityManager.persist(packageBits);
PackageVersion pv = entityManager.find(PackageVersion.class, packageVersionId);
@@ -842,12 +844,32 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
if (pk.getContentSource().getDownloadMode() == DownloadMode.DATABASE) {
- PackageBits bits = entityManager.find(PackageBits.class, packageBits.getId());
- bits.setBits(StreamUtil.slurp(bitsStream));
-
- entityManager.merge(bits);
- entityManager.flush();
- bitsStream = null;
+ // bitsStream = null;
+ conn = dataSource.getConnection();
+ //we are loading the PackageBits saved in the previous step
+ //we need to lock the row which will be updated so we are using FOR UPDATE
+ ps = conn.prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ? FOR UPDATE");
+ ps.setInt(1, packageBits.getId());
+ ResultSet rs = ps.executeQuery();
+ if (rs != null) {
+ while (rs.next()) {
+ //We can not create a blob directly because BlobImpl from Hibernate is not acceptable
+ //for oracle and Connection.createBlob is not working on postgres.
+ //This blob will be not empty because we saved there a bytes from String("a").
+ Blob blb = rs.getBlob(1);
+
+ StreamUtil.copy(bitsStream, blb.setBinaryStream(1), true);
+ ps2 = conn.prepareStatement("UPDATE " + PackageBits.TABLE_NAME + " SET bits = ? where id = ?");
+ ps2.setBlob(1, blb);
+ ps2.setInt(2, packageBits.getId());
+ if (ps2.execute()) {
+ throw new Exception("Did not download the package bits to the DB for ");
+ }
+ ps2.close();
+ }
+ }
+ ps.close();
+ conn.close();
} else {
// store content to local file system
@@ -889,6 +911,15 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
+ "] on content source [" + contentSourceId + "]");
}
}
+
+ if (ps2 != null) {
+ try {
+ ps2.close();
+ } catch (Exception e) {
+ log.warn("Failed to close prepared statement for package bits [" + packageVersionLocation
+ + "] on content source [" + contentSourceId + "]");
+ }
+ }
if (conn != null) {
try {
@@ -1785,6 +1816,85 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return outputPackageVersionBitsRangeHelper(resourceId, packageDetailsKey, outputStream, startByte, endByte,
packageVersion.getId());
}
+
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ @TransactionTimeout(90 * 60)
+ public boolean downloadPackageBits(int resourceId, PackageDetailsKey packageDetailsKey){
+ Query query = entityManager.createNamedQuery(PackageVersion.QUERY_FIND_ID_BY_PACKAGE_DETAILS_KEY_AND_RES_ID);
+ query.setParameter("packageName", packageDetailsKey.getName());
+ query.setParameter("packageTypeName", packageDetailsKey.getPackageTypeName());
+ query.setParameter("architectureName", packageDetailsKey.getArchitectureName());
+ query.setParameter("version", packageDetailsKey.getVersion());
+ query.setParameter("resourceId", resourceId);
+ int packageVersionId = ((Integer) query.getSingleResult()).intValue();
+
+ Query queryA = entityManager.createNamedQuery(PackageBits.QUERY_PACKAGE_BITS_LOADED_STATUS_PACKAGE_VERSION_ID);
+ queryA.setParameter("id", packageVersionId);
+
+ LoadedPackageBitsComposite composite = (LoadedPackageBitsComposite) queryA.getSingleResult();
+
+ boolean packageBitsAreAvailable = composite.isPackageBitsAvailable();
+ if (packageBitsAreAvailable) {
+ // it says the package bits are available, but if its stored on the filesystem, we should
+ // make sure no one deleted the file. If the file is deleted, let's simply download it again.
+ if (!composite.isPackageBitsInDatabase()) {
+ try {
+ File bitsFile = getPackageBitsLocalFileAndCreateParentDir(composite.getPackageVersionId(),
+ composite.getFileName());
+ if (!bitsFile.exists()) {
+ log.warn("Package version [" + packageDetailsKey + "] has had its bits file [" + bitsFile
+ + "] deleted. Will attempt to download it again.");
+ packageBitsAreAvailable = false;
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("Package version [" + packageDetailsKey
+ + "] has had its bits file deleted but cannot download it again.", e);
+ }
+ }
+ }
+
+ PackageVersionContentSource pvcs = null; // will be non-null only if package bits were not originally available
+
+ if (!packageBitsAreAvailable) {
+ if (resourceId == -1) {
+ throw new IllegalStateException("Package bits must be inserted prior to the agent asking for them "
+ + "during a cotent-based resource creation");
+ }
+ // if we got here, the package bits have not been downloaded yet. This eliminates the
+ // possibility that the package version were directly uploaded by a user
+ // or auto-discovered by a resource and attached to a repo. So, that leaves
+ // the only possibility - the package version comes from a content source and therefore has
+ // a PackageVersionContentSource mapping. Let's find that mapping.
+ Query q2 = entityManager.createNamedQuery(PackageVersionContentSource.QUERY_FIND_BY_PKG_VER_ID_AND_RES_ID);
+ q2.setParameter("resourceId", resourceId);
+ q2.setParameter("packageVersionId", packageVersionId);
+ List<PackageVersionContentSource> pvcss = q2.getResultList();
+
+ // Note that its possible more than one content source can deliver a PV - if a resource is subscribed
+ // to repo(s) that contain multiple content sources that can deliver a PV, we just take
+ // the first one we find.
+
+ if (pvcss.size() == 0) {
+ throw new RuntimeException("Resource [" + resourceId + "] cannot access package version ["
+ + packageDetailsKey + "] - no content source exists to deliver it");
+ }
+
+ pvcs = pvcss.get(0);
+
+ try {
+ // Make it a true EJB call so we suspend our tx and get a new tx.
+ // This way, we start with a fresh tx timeout when downloading and this
+ // won't affect the time we are in in this method's tx (I hope that's how it works).
+ // This is because this method itself may take a long time to send the data to the output stream
+ // and we don't want out tx timing out due to the time it takes downloading.
+ PackageBits bits = null;
+ bits = contentSourceManager.downloadPackageBits(subjectManager.getOverlord(), pvcs);
+ }catch(Exception e){
+ return false;
+ }
+ }
+ return true;
+ }
@SuppressWarnings("unchecked")
private long outputPackageVersionBitsRangeHelper(int resourceId, PackageDetailsKey packageDetailsKey,
@@ -1885,9 +1995,29 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
if (composite.isPackageBitsInDatabase()) {
// this is DownloadMode.DATABASE - put the bits in the database
- PackageBits bits = entityManager.find(PackageBits.class, composite.getPackageBitsId());
- bitsStream = new ByteArrayInputStream(bits.getBits());
-
+ conn = dataSource.getConnection();
+ ps = conn.prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ?");
+
+ ps.setInt(1, composite.getPackageBitsId());
+ results = ps.executeQuery();
+ results.next();
+ Blob blob = results.getBlob(1);
+
+ long bytesRetrieved=0;
+ if (endByte < 0) {
+ if (startByte == 0) {
+ bytesRetrieved = StreamUtil.copy(blob.getBinaryStream(), outputStream, false);
+ }
+ } else {
+ long length = (endByte - startByte) + 1;
+ InputStream stream = blob.getBinaryStream(startByte, length);
+ bytesRetrieved = StreamUtil.copy(stream, outputStream, false);
+ }
+ log.debug("Retrieved and sent [" + bytesRetrieved + "] bytes for [" + packageDetailsKey + "]");
+ ps.close();
+ conn.close();
+ return bytesRetrieved;
+
} else {
// this is DownloadMode.FILESYSTEM - put the bits on the filesystem
File bitsFile = getPackageBitsLocalFileAndCreateParentDir(composite.getPackageVersionId(),
@@ -2122,3 +2252,4 @@ public class ContentSourceManagerBean implements ContentSourceManagerLocal {
return numBytes;
}
}
+
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
index 14d1bf6..f861764 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java
@@ -310,7 +310,18 @@ public interface ContentSourceManagerLocal {
* @param contentSource
*/
void downloadDistributionBits(Subject subject, ContentSource contentSource);
-
+
+ /**
+ * This will download the actual package bits for that package version from that content source's remote repository.
+ *
+ * @param resourceId
+ * @param packageDetailsKey
+ * @param packageVersionId
+ * @return
+ */
+ boolean downloadPackageBits(int resourceId, PackageDetailsKey packageDetailsKey);
+
+
/**
* Given a {@link PackageVersionContentSource} which contains the ID of a content source, an ID of a package
* version, and the location of that package version on the remote content source repo, this will download the
@@ -622,4 +633,4 @@ public interface ContentSourceManagerLocal {
* the given object are not valid
*/
ContentSource simpleCreateContentSource(Subject subject, ContentSource contentSource) throws ContentSourceException;
-}
\ No newline at end of file
+}
commit 528d01e22152f7d37a584816b2e798d779e27432
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue May 4 17:30:26 2010 -0400
[JOPR-419] Updating plugin to use correct defaults for bind address and server profile
Both EAP 5.0 and SOA-P 5.0 use the default profile as the default and use localhost as a
default bind address.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
index f107c04..3c43ac4 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
@@ -141,7 +141,7 @@ public class JBossInstallationInfo {
private static String getDefaultServerName(String serverVersion) {
ComparableVersion comparableVersion = new ComparableVersion(serverVersion);
- return (comparableVersion.compareTo(VERSION_4_2) >= 0) ? ANY_ADDRESS : LOCALHOST_ADDRESS; // TODO check
+ return (comparableVersion.compareTo(VERSION_4_2) >= 0) ? LOCALHOST_ADDRESS : ANY_ADDRESS;
}
@Override
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java
index 024bc41..818658b 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java
@@ -34,7 +34,7 @@ public enum JBossProductType {
AS("JBoss AS", "JBoss Application Server", "default"), // the public offering
EAP("JBoss EAP", "JBoss Enterprise Application Platform", "default"), // the customer offering
EWP("JBoss EWP", "JBoss Enterprise Web Platform", "default"), // the customer offering
- SOA("JBoss SOA-P", "JBoss Enterprise SOA Platform", "production"); // the customer SOA platform
+ SOA("JBoss SOA-P", "JBoss Enterprise SOA Platform", "default"); // the customer SOA platform
public final String NAME;
public final String DESCRIPTION;
commit c5920b60fd78a6468e32ef0c624eadeaad066255
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue May 4 12:30:31 2010 -0400
as5 plugin's getAvailability() now handles the case then AS5/AS6 instance is listening on an AS4 Server Resource's JNP URL (https://bugzilla.redhat.com/show_bug.cgi?id=588803)
(cherry picked from commit 6261da7f85ffbc00386495ffdf6e080871355237)
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
index 69d96d0..7effdd5 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java
@@ -30,6 +30,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -203,6 +205,8 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
private AvailabilityCollectorRunnable availCollector;
+ private boolean loggedHijackedJnpUrlError;
+
// ResourceComponent Implementation --------------------------------------------
public void start(ResourceContext context) throws Exception {
@@ -293,6 +297,8 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
}
this.connection = null;
}
+
+ this.loggedHijackedJnpUrlError = false;
}
public AvailabilityType getAvailability() {
@@ -305,26 +311,61 @@ public class JBossASServerComponent implements MeasurementFacet, OperationFacet,
private AvailabilityType getAvailabilityNow() {
try {
- EmsConnection connection = loadConnection();
- EmsBean bean = connection.getBean("jboss.system:type=ServerConfig");
-
- File serverHomeViaJNP = (File) bean.getAttribute("ServerHomeDir").refresh();
- if (this.configPath.getCanonicalPath().equals(serverHomeViaJNP.getCanonicalPath())) {
+ File serverHomeViaJnp = getServerHome();
+ if (this.configPath.getCanonicalPath().equals(serverHomeViaJnp.getCanonicalPath())) {
+ this.loggedHijackedJnpUrlError = false;
return AvailabilityType.UP;
} else {
- // a different server must have been started on our jnp url
- if (log.isDebugEnabled()) {
- log.debug("Availability check for JBAS resource with configPath [" + this.configPath
- + "] is trying to connect to a different running JBAS which is installed at ["
- + serverHomeViaJNP + "]. Returning AvailabilityType.DOWN for the former resource.");
+ // A different server must have been started on our JNP URL - this is definitely something about which
+ // the user should be informed.
+ if (!this.loggedHijackedJnpUrlError) {
+ String namingURL = this.resourceContext.getPluginConfiguration().
+ getSimpleValue(NAMING_URL_CONFIG_PROP, null);
+ String message = "Availability check for JBoss AS Resource with configPath [" + this.configPath
+ + "] has connected to a different running JBoss AS instance which is installed at ["
+ + serverHomeViaJnp + "] using namingURL [" + namingURL
+ + "] - returning AvailabilityType.DOWN...";
+ log.error(message);
+ this.loggedHijackedJnpUrlError = true;
+ // Throw an exception, so the PC can send the message to the Server for display in the GUI.
+ throw new RuntimeException(message);
}
+ return AvailabilityType.DOWN;
}
- return AvailabilityType.DOWN;
} catch (Exception e) {
return AvailabilityType.DOWN;
}
}
+ private File getServerHome() throws Exception {
+ EmsConnection connection = loadConnection();
+ EmsBean bean = connection.getBean("jboss.system:type=ServerConfig");
+ File serverHomeViaJnp;
+ EmsAttribute serverHomeDirAttrib = bean.getAttribute("ServerHomeDir");
+ if (serverHomeDirAttrib != null) {
+ serverHomeViaJnp = (File)serverHomeDirAttrib.refresh();
+ } else {
+ // We have a non-null MBean but a null ServerHomeDir attribute. This most likely means we're
+ // connected to a JBoss 5.x or 6.x instance, because in those versions the ServerConfig MBean no
+ // longer has a ServerHomeDir attribute. It instead has a ServerHomeLocation attribute, so give
+ // that a try, so getAvailabilityNow() can print a more intelligent warning.
+ EmsAttribute serverHomeLocationAttrib = bean.getAttribute("ServerHomeLocation");
+ URL serverHomeLocation = (URL) serverHomeLocationAttrib.refresh();
+ serverHomeViaJnp = toFile(serverHomeLocation);
+ }
+ return serverHomeViaJnp;
+ }
+
+ private static File toFile(URL url) {
+ File file;
+ try {
+ file = new File(url.toURI());
+ } catch(URISyntaxException e) {
+ file = new File(url.getPath());
+ }
+ return file;
+ }
+
// MeasurementFacet Implementation --------------------------------------------
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) {
commit 490814447771c665b71bef2ecd7ca0c0a60803f0
Merge: 98d7db9... 474584f...
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue May 4 17:10:06 2010 +0200
Merge branch 'master' into bugfixes
commit 474584f80d94f7ae934ed7515dccdd702bdb9384
Author: Joseph Marques <joseph(a)redhat.com>
Date: Tue May 4 09:41:38 2010 -0400
BZ-588700 - fix issue when trying to upgrade alert notifications
* should only dbupgrade operation-based alert notifications for those alert definitions that previously had associated operations
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
index 07c7590..8ff2ab5 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java
@@ -133,7 +133,8 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask {
private void upgradeOperationNotifications() throws SQLException {
String dataMapSQL = "" //
+ " SELECT def.id, def.operation_def_id" //
- + " FROM rhq_alert_definition def";
+ + " FROM rhq_alert_definition def" //
+ + " WHERE def.operation_def_id IS NOT NULL"; // not all alert definitions have operation notifications
List<Object[]> data = databaseType.executeSelectSql(connection, dataMapSQL);
commit 6d09c27b3dee045a909e820eaaa1ecb7e378906a
Author: Joseph Marques <joseph(a)redhat.com>
Date: Tue May 4 09:39:27 2010 -0400
fix performance when creating/updating alert definitions en masse
1) revamp mechanism from hibernate session manipulation to transactional boundary manipulation
2a) make aggregate (template & group) create/update NOT execute in transaction
2b) make individual/child create/update alert definition execute in their own transactions
2c) no longer continue create/update logic on exception, hault processing and show exception to the UI
2d) purge unmatched AlertDampeningEvents and AlertConditionLogs in its own transaction
3a) change cache loading/reloading so that the main logic occurs outside a transaction
3b) when the cache queries the DB, that will occur in a transaction
4) remove flush/clear methods, which are no longer needed with small transactions
5) implement more robust cache reloading, retrying on exceptions due to hibernate session consistency issues
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java
index d938a03..ba54373 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java
@@ -32,6 +32,7 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.hibernate.exception.ConstraintViolationException;
import org.rhq.core.domain.alert.AlertCondition;
import org.rhq.core.domain.alert.AlertConditionLog;
@@ -83,37 +84,58 @@ public class AlertConditionLogManagerBean implements AlertConditionLogManagerLoc
* outer-scoping transaction, which will operate on the results.
*/
try {
- AlertConditionLog alertConditionLog = this.getUnmatchedLogByAlertConditionId(alertConditionId);
-
- /*
- * No exceptions.
- *
- * This means that there was exactly one existing, unmatched, active alert condition. This is another
- * positive event associated against the same alertCondition, so we're going to use its data to update the
- * "ctime" and "value" properties.
- */
- alertConditionLog.setCtime(ctime);
- alertConditionLog.setValue(value);
- log.debug("Updating unmatched alert condition log: " + alertConditionLog);
-
- entityManager.merge(alertConditionLog); // update values, for
- } catch (NoResultException nre) // this is the expected case 90% of the time
- {
- // lookup the condition entity
- AlertCondition condition = entityManager.find(AlertCondition.class, alertConditionId);
-
- // persist the log entry
- AlertConditionLog conditionLog = new AlertConditionLog(condition, ctime);
- conditionLog.setValue(value);
-
- log.debug("Inserting unmatched alert condition log: " + conditionLog);
-
- entityManager.persist(conditionLog);
- entityManager.flush();
- } catch (NonUniqueResultException nure) {
- // serious bug in the processing logic
- log.debug("Found multiple unmatched results for alertConditionId of " + alertConditionId
- + " while performing activation. There should only be one.");
+ try {
+ AlertConditionLog alertConditionLog = this.getUnmatchedLogByAlertConditionId(alertConditionId);
+
+ /*
+ * No exceptions.
+ *
+ * This means that there was exactly one existing, unmatched, active alert condition. This is another
+ * positive event associated against the same alertCondition, so we're going to use its data to update the
+ * "ctime" and "value" properties.
+ */
+ alertConditionLog.setCtime(ctime);
+ alertConditionLog.setValue(value);
+ log.debug("Updating unmatched alert condition log: " + alertConditionLog);
+
+ entityManager.merge(alertConditionLog); // update values, for
+ entityManager.flush();
+ } catch (NoResultException nre) { // this is the expected case 90% of the time
+ // lookup the condition entity
+ AlertCondition condition = entityManager.find(AlertCondition.class, alertConditionId);
+ if (condition == null) {
+ // the associated AlertDefinition must have been updated, which removes all previous AlertConditions
+ }
+
+ // persist the log entry
+ AlertConditionLog conditionLog = new AlertConditionLog(condition, ctime);
+ conditionLog.setValue(value);
+
+ log.debug("Inserting unmatched alert condition log: " + conditionLog);
+
+ entityManager.persist(conditionLog);
+ entityManager.flush();
+ } catch (NonUniqueResultException nure) {
+ // serious bug in the processing logic
+ log.debug("Found multiple unmatched results for alertConditionId of " + alertConditionId
+ + " while performing activation. There should only be one.");
+ }
+ } catch (Throwable t) {
+ Throwable throwable = t;
+ boolean found = false;
+ while (throwable != null) {
+ if (throwable instanceof ConstraintViolationException) {
+ // we're trying to persist a log entry for an AlertCondition that was just deleted
+ log.debug("ConstraintViolationException thrown during AlertConditionLog persistence");
+ found = true;
+ break;
+ }
+ throwable = throwable.getCause();
+ }
+ if (!found) {
+ throw new RuntimeException(
+ "Could not insert log entry for AlertCondition[id=" + alertConditionId + "]", t);
+ }
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java
index 399d2e2..5bb5861 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java
@@ -77,6 +77,7 @@ public class AlertConditionManagerBean implements AlertConditionManagerLocal {
}
@SuppressWarnings("unchecked")
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public PageList<? extends AbstractAlertConditionCategoryComposite> getAlertConditionComposites(Subject user,
Integer agentId, AlertConditionCategory category, PageControl pageControl) {
if (authorizationManager.isOverlord(user) == false) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionException.java
index e6329df..1e2ed8c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionException.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionException.java
@@ -22,7 +22,7 @@ package org.rhq.enterprise.server.alert;
* @author Joseph Marques
*/
-public class AlertDefinitionException extends Exception {
+public class AlertDefinitionException extends RuntimeException {
private static final long serialVersionUID = 1L;
public AlertDefinitionException() {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
index 9a2e3e4..7dfad20 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
@@ -71,6 +71,8 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
@EJB
private AuthorizationManagerLocal authorizationManager;
+ @EJB
+ private AlertDefinitionManagerLocal alertDefinitionManager;
@EJB
private StatusManagerLocal agentStatusManager;
@@ -433,7 +435,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
AlertDefinition alertDefinition, boolean purgeInternals) throws InvalidAlertDefinitionException,
AlertDefinitionUpdateException {
if (purgeInternals) {
- purgeInternals(alertDefinitionId);
+ alertDefinitionManager.purgeInternals(alertDefinitionId);
}
/*
@@ -604,7 +606,8 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
}
}
- private void purgeInternals(int alertDefinitionId) {
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ public void purgeInternals(int alertDefinitionId) {
Query alertDampeningEventPurgeQuery = entityManager
.createNamedQuery(AlertDampeningEvent.QUERY_DELETE_BY_ALERT_DEFINITION_ID);
Query unmatchedAlertConditionLogPurgeQuery = entityManager
@@ -616,15 +619,17 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
int alertDampeningEventPurgeCount = alertDampeningEventPurgeQuery.executeUpdate();
int unmatchedAlertConditionLogPurgeCount = unmatchedAlertConditionLogPurgeQuery.executeUpdate();
- LOG.debug("Update to AlertDefinition[id=" + alertDefinitionId
- + " caused a purge of internal, dampening constructs.");
- if (alertDampeningEventPurgeCount > 0) {
- LOG.debug("Removed " + alertDampeningEventPurgeCount + " AlertDampeningEvent"
- + (alertDampeningEventPurgeCount == 1 ? "" : "s"));
- }
- if (unmatchedAlertConditionLogPurgeCount > 0) {
- LOG.debug("Removed " + unmatchedAlertConditionLogPurgeCount + " unmatched AlertConditionLog"
- + (unmatchedAlertConditionLogPurgeCount == 1 ? "" : "s"));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Update to AlertDefinition[id=" + alertDefinitionId
+ + " caused a purge of internal, dampening constructs.");
+ if (alertDampeningEventPurgeCount > 0) {
+ LOG.debug("Removed " + alertDampeningEventPurgeCount + " AlertDampeningEvent"
+ + (alertDampeningEventPurgeCount == 1 ? "" : "s"));
+ }
+ if (unmatchedAlertConditionLogPurgeCount > 0) {
+ LOG.debug("Removed " + unmatchedAlertConditionLogPurgeCount + " unmatched AlertConditionLog"
+ + (unmatchedAlertConditionLogPurgeCount == 1 ? "" : "s"));
+ }
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
index 4ea8b60..ec64487 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
@@ -70,6 +70,8 @@ public interface AlertDefinitionManagerLocal {
int purgeUnusedAlertDefinition();
+ void purgeInternals(int alertDefinitionId);
+
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
// The following are shared with the Remote Interface
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
index 3a9a56c..3aaddde 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
@@ -267,9 +267,7 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
return pluginmanager.getBackingBeanNameForSender(shortName);
}
- /**
- * {@inheritDoc}
- */
+ // TODO: jmarques - this no longer handles the group alert definition or alert template cases!!
public AlertNotification addAlertNotification(Subject user, int alertDefinitionId, String senderName,
Configuration configuration) {
@@ -315,9 +313,7 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
return notifications;
}
- /**
- * {@inheritDoc}
- */
+ // TODO: jmarques - this no longer handles the group alert definition or alert template cases!!
public void updateAlertNotification(AlertNotification notification) {
notification = entityManager.merge(notification);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
index 570df57..24cf476 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
@@ -22,6 +22,8 @@ import java.util.List;
import javax.ejb.EJB;
import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
@@ -48,7 +50,6 @@ import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException;
/**
* @author Joseph Marques
*/
-
@Stateless
public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
@@ -62,8 +63,6 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
@EJB
private AlertDefinitionManagerLocal alertDefinitionManager;
@EJB
- private AlertTemplateManagerLocal alertTemplateManager;
- @EJB
private ResourceTypeManagerLocal resourceTypeManager;
@EJB
private SubjectManagerLocal subjectManager;
@@ -109,35 +108,39 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
}
@RequiredPermission(Permission.MANAGE_SETTINGS)
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public int createAlertTemplate(Subject user, AlertDefinition alertTemplate, Integer resourceTypeId)
- throws InvalidAlertDefinitionException, ResourceTypeNotFoundException {
+ throws InvalidAlertDefinitionException, ResourceTypeNotFoundException, AlertDefinitionCreationException {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("createAlertTemplate: " + alertTemplate);
+ }
+
ResourceType type = resourceTypeManager.getResourceTypeById(user, resourceTypeId);
alertTemplate.setResourceType(type); // mark this as an alert "template" definition
- int alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null);
+ int alertTemplateId = 0;
+ try {
+ alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null);
+ } catch (Throwable t) {
+ throw new AlertDefinitionCreationException("Could not create template for " + type + " with template"
+ + alertTemplate.toSimpleString());
+ }
- int definitionCount = 0;
Subject overlord = subjectManager.getOverlord();
List<Integer> resourceIdsForType = getCommittedResourceIdsNeedingTemplateApplication(user, alertTemplateId,
resourceTypeId);
for (Integer resourceId : resourceIdsForType) {
try {
- // make sure we perform the system side-effects as the overlord
- updateAlertDefinitionsForResource(overlord, alertTemplate, resourceId);
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
- }
- } catch (AlertDefinitionCreationException adce) {
- /* should never happen because AlertDefinitionCreationException is only ever
- * thrown if updateAlertDefinitionsForResource isn't called as the overlord
- *
- * but we'll log it anyway, just in case, so it isn't just swallowed
- */
- LOG.error(adce);
+ // construct the child
+ AlertDefinition childAlertDefinition = new AlertDefinition(alertTemplate);
+ childAlertDefinition.setParentId(alertTemplate.getId());
+
+ // persist the child using overlord
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ } catch (Throwable t) {
+ throw new AlertDefinitionCreationException("Could not create child alert definition for Resource[id="
+ + resourceId + "] with template" + alertTemplate.toSimpleString());
}
}
@@ -147,13 +150,10 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
@SuppressWarnings("unchecked")
public void updateAlertDefinitionsForResource(Subject user, Integer resourceId)
throws AlertDefinitionCreationException, InvalidAlertDefinitionException {
- if (0 == resourceId) {
- throw new AlertDefinitionCreationException("Unexpected resourceId = 0");
- }
-
if (authorizationManager.isOverlord(user) == false) {
throw new AlertDefinitionCreationException(
- "Updating the alert definitions for a resource is an implicit system operation and must only be performed by the overlord");
+ "Updating the alert definitions for a resource is an implicit system operation; "
+ + "It can only be performed by the overlord");
}
// get list of AlertTemplates that should be, but haven't already been, applied to this resource
@@ -171,23 +171,18 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
List<AlertDefinition> unappliedTemplates = query.getResultList();
for (AlertDefinition template : unappliedTemplates) {
- alertTemplateManager.updateAlertDefinitionsForResource(user, template, resourceId);
- }
- }
+ // construct the child
+ AlertDefinition childAlertDefinition = new AlertDefinition(template);
+ childAlertDefinition.setParentId(template.getId());
- public void updateAlertDefinitionsForResource(Subject user, AlertDefinition alertTemplate, Integer resourceId)
- throws AlertDefinitionCreationException, InvalidAlertDefinitionException {
- if (authorizationManager.isOverlord(user) == false) {
- throw new AlertDefinitionCreationException("Updating the alert definitions for a resource "
- + "is an implicit system operation " + "and must only be performed by the overlord");
+ // persist the child, user is known to be overlord at this point for this system side-effect
+ try {
+ alertDefinitionManager.createAlertDefinition(user, childAlertDefinition, resourceId);
+ } catch (Throwable t) {
+ throw new AlertDefinitionCreationException("Failed to create child AlertDefinition for Resource[id="
+ + resourceId + "] with template " + template.toSimpleString());
+ }
}
-
- // construct the child
- AlertDefinition childAlertDefinition = new AlertDefinition(alertTemplate);
- childAlertDefinition.setParentId(alertTemplate.getId());
-
- // persist the child
- alertDefinitionManager.createAlertDefinition(user, childAlertDefinition, resourceId);
}
@RequiredPermission(Permission.MANAGE_SETTINGS)
@@ -227,84 +222,65 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
}
@RequiredPermission(Permission.MANAGE_SETTINGS)
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public AlertDefinition updateAlertTemplate(Subject user, AlertDefinition alertTemplate, boolean purgeInternals)
- throws InvalidAlertDefinitionException {
- AlertDefinition updatedTemplate = null;
+ throws InvalidAlertDefinitionException, AlertDefinitionUpdateException {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("updateAlertTemplate: " + alertTemplate);
+ }
+ // first update the actual alert template
+ AlertDefinition updated = null;
try {
- updatedTemplate = alertDefinitionManager.updateAlertDefinition(user, alertTemplate.getId(), alertTemplate,
+ updated = alertDefinitionManager.updateAlertDefinition(user, alertTemplate.getId(), alertTemplate,
purgeInternals); // do not allow direct undeletes of an alert definition
- } catch (AlertDefinitionUpdateException adue) {
- /* jmarques (Oct 10, 2007)
- *
- * this should never happen, there is currently no way to update a deleted alert template via the JON UI
- */
- LOG.error("Attempt to update a deleted template " + alertTemplate.toSimpleString());
+ } catch (Throwable t) {
+ throw new AlertDefinitionUpdateException("Failed to update a AlertTemplate "
+ + alertTemplate.toSimpleString(), t);
}
+ // overlord will be used for all system-side effects as a result of updating this alert template
Subject overlord = subjectManager.getOverlord();
- int definitionCount = 0;
- /*
- * update all of the definitions that were spawned from alert templates
- */
+ // update all of the definitions that were spawned from alert templates
List<Integer> alertDefinitions = getChildrenAlertDefinitionIds(overlord, alertTemplate.getId());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
+ }
for (Integer alertDefinitionId : alertDefinitions) {
try {
-
alertDefinitionManager
- .updateAlertDefinition(overlord, alertDefinitionId, alertTemplate, purgeInternals); // if the child is deleted, we will undelete is as part of the update
- } catch (AlertDefinitionUpdateException adue) {
- /* jmarques (Oct 10, 2007), as of this writing...
- *
- * this should not happen, because the call to getAlertDefinitionIdsByTemplateId only returns
- * non-deleted definitions.
- *
- * if a definition was deleted, then it will signify to the system that a new definition has to be
- * created in its place, which is what the call out to
- * getResourceIdsWithNoDefinitionFromThisTemplate is all about.
- *
- * but, it's conceivable that in the future an AlertDefinitionUpdateException can be thrown for other
- * reasons, so we want to catch that here and, at the very least, log it.
- */
- LOG.error("Attempt to update a deleted template " + alertTemplate.toSimpleString());
- }
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
+ .updateAlertDefinition(overlord, alertDefinitionId, alertTemplate, purgeInternals);
+ } catch (Throwable t) {
+ throw new AlertDefinitionUpdateException("Failed to update child AlertDefinition[id="
+ + alertDefinitionId + "] with template " + alertTemplate.toSimpleString(), t);
}
}
- /*
- * if the user deleted the alert definition spawned from a template, a cascade update will recreate it
- */
+ // if the user deleted the alert definition spawned from a template, a cascade update will recreate it
List<Integer> resourceIds = getCommittedResourceIdsNeedingTemplateApplication(overlord, alertTemplate.getId(),
- getResourceTypeIdAlertTemplateId(alertTemplate.getId()));
- try {
- for (Integer resourceId : resourceIds) {
- updateAlertDefinitionsForResource(overlord, alertTemplate, resourceId);
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
- }
+ getResourceTypeIdForAlertTemplateId(alertTemplate.getId()));
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Need to re-create alert definitions for the following resource ids: " + resourceIds);
+ }
+ for (Integer resourceId : resourceIds) {
+ try {
+ // construct the child
+ AlertDefinition childAlertDefinition = new AlertDefinition(alertTemplate);
+ childAlertDefinition.setParentId(alertTemplate.getId());
+
+ // persist the child
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ } catch (Throwable t) {
+ throw new AlertDefinitionUpdateException("Failed to re-create child AlertDefinition for Resource[id="
+ + resourceId + "] with template" + alertTemplate.toSimpleString(), t);
}
- } catch (AlertDefinitionCreationException adce) {
- /* should never happen because AlertDefinitionCreationException is only ever
- * thrown if updateAlertDefinitionsForResource isn't called as the overlord
- *
- * but we'll log it anyway, just in case, so it isn't just swallowed
- */
- LOG.error(adce);
}
- return updatedTemplate;
+ return updated;
}
- private int getResourceTypeIdAlertTemplateId(int alertTemplateId) {
+ private int getResourceTypeIdForAlertTemplateId(int alertTemplateId) {
Query query = entityManager.createQuery("" //
+ "SELECT template.resourceType.id " //
+ " FROM AlertDefinition template " //
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java
index bddbd2e..baa707f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java
@@ -34,18 +34,13 @@ import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException;
public interface AlertTemplateManagerLocal {
PageList<AlertDefinition> getAlertTemplates(Subject user, int resourceTypeId, PageControl pageControl);
- // Create operation always cascades
int createAlertTemplate(Subject user, AlertDefinition alertDefinition, Integer resourceTypeId)
- throws InvalidAlertDefinitionException, ResourceTypeNotFoundException;
+ throws InvalidAlertDefinitionException, ResourceTypeNotFoundException, AlertDefinitionCreationException;
// this is a system side-effect of template processing, and thus should only ever by called by the overlord user
void updateAlertDefinitionsForResource(Subject user, Integer resourceId) throws AlertDefinitionCreationException,
InvalidAlertDefinitionException;
- // this is a system side-effect of template processing, and thus should only ever by called by the overlord user
- void updateAlertDefinitionsForResource(Subject user, AlertDefinition alertTemplate, Integer resourceId)
- throws AlertDefinitionCreationException, InvalidAlertDefinitionException;
-
void removeAlertTemplates(Subject user, Integer[] alertTemplateIds);
void enableAlertTemplates(Subject user, Integer[] alertTemplateIds);
@@ -53,5 +48,5 @@ public interface AlertTemplateManagerLocal {
void disableAlertTemplates(Subject user, Integer[] alertTemplateIds);
AlertDefinition updateAlertTemplate(Subject user, AlertDefinition alertDefinition, boolean purgeInternals)
- throws InvalidAlertDefinitionException;
+ throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
index 0877550..a1b26d1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
@@ -42,7 +42,6 @@ import org.rhq.core.domain.util.PageOrdering;
import org.rhq.core.server.PersistenceUtility;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
/**
* @author Joseph Marques
@@ -57,8 +56,6 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
private EntityManager entityManager;
@EJB
- private AuthorizationManagerLocal authorizationManager;
- @EJB
private AlertDefinitionManagerLocal alertDefinitionManager;
@EJB
private SubjectManagerLocal subjectManager;
@@ -121,21 +118,6 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return modified;
}
- public void updateAlertDefinitionsForResource(Subject subject, AlertDefinition groupAlertDefinition,
- Integer resourceId) throws AlertDefinitionCreationException, InvalidAlertDefinitionException {
- if (authorizationManager.isOverlord(subject) == false) {
- throw new AlertDefinitionCreationException("Updating the alert definitions for a resource "
- + "is an implicit system operation and must only be performed by the overlord");
- }
-
- // construct the child
- AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
- childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
-
- // persist the child
- alertDefinitionManager.createAlertDefinition(subject, childAlertDefinition, resourceId);
- }
-
@SuppressWarnings("unchecked")
private List<Integer> getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(Subject subject,
int groupAlertDefinitionId, int resourceGroupId) {
@@ -148,35 +130,29 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return list;
}
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public int createGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
- Integer resourceGroupId) throws InvalidAlertDefinitionException {
+ Integer resourceGroupId) throws InvalidAlertDefinitionException, AlertDefinitionCreationException {
ResourceGroup group = entityManager.find(ResourceGroup.class, resourceGroupId);
groupAlertDefinition.setResourceGroup(group);
int groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null);
group = entityManager.merge(group);
- int definitionCount = 0;
Subject overlord = subjectManager.getOverlord();
List<Integer> resourceIdsForGroup = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(subject,
groupAlertDefinitionId, resourceGroupId);
for (Integer resourceId : resourceIdsForGroup) {
try {
- // make sure we perform the system side-effects as the overlord
- updateAlertDefinitionsForResource(overlord, groupAlertDefinition, resourceId);
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
- }
- } catch (AlertDefinitionCreationException adce) {
- /* should never happen because AlertDefinitionCreationException is only ever
- * thrown if updateAlertDefinitionsForResource isn't called as the overlord
- *
- * but we'll log it anyway, just in case, so it isn't just swallowed
- */
- LOG.error(adce);
+ // construct the child
+ AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
+ childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
+
+ // persist the child
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ } catch (Throwable t) {
+ throw new AlertDefinitionCreationException("Could not create alert definition child for Resource[id="
+ + resourceId + "] with group " + groupAlertDefinition.toSimpleString());
}
}
@@ -220,81 +196,59 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
return modified;
}
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public AlertDefinition updateGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
- boolean purgeInternals) throws InvalidAlertDefinitionException {
- AlertDefinition updatedTemplate = null;
+ boolean purgeInternals) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("updateGroupAlertDefinition: " + groupAlertDefinition);
+ }
+ // first update the actual alert group alert definition
+ AlertDefinition updated = null;
try {
- updatedTemplate = alertDefinitionManager.updateAlertDefinition(subject, groupAlertDefinition.getId(),
+ updated = alertDefinitionManager.updateAlertDefinition(subject, groupAlertDefinition.getId(),
groupAlertDefinition, purgeInternals); // do not allow direct undeletes of an alert definition
- } catch (AlertDefinitionUpdateException adue) {
- /* jmarques (Oct 10, 2007)
- *
- * this should never happen, there is currently no way to update a deleted alert template via the JON UI
- */
- LOG.error("Attempt to update a deleted groupAlertDefinition " + groupAlertDefinition.toSimpleString());
+ } catch (Throwable t) {
+ throw new AlertDefinitionUpdateException("Failed to update a GroupAlertDefinition: "
+ + groupAlertDefinition.toSimpleString(), t);
}
+ // overlord will be used for all system-side effects as a result of updating this alert template
Subject overlord = subjectManager.getOverlord();
- int definitionCount = 0;
- /*
- * update all of the definitions that were spawned from this groupAlertDefinition
- */
+ // update all of the definitions that were spawned from this group alert definition
List<Integer> alertDefinitions = getChildrenAlertDefinitionIds(overlord, groupAlertDefinition.getId());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
+ }
for (Integer alertDefinitionId : alertDefinitions) {
try {
-
alertDefinitionManager.updateAlertDefinition(overlord, alertDefinitionId, groupAlertDefinition,
- purgeInternals); // if the child is deleted, we will undelete is as part of the update
- } catch (AlertDefinitionUpdateException adue) {
- /* jmarques (Oct 10, 2007), as of this writing...
- *
- * this should not happen, because the call to getAlertDefinitionIdsByTemplateId only returns
- * non-deleted definitions.
- *
- * if a definition was deleted, then it will signify to the system that a new definition has to be
- * created in its place, which is what the call out to
- * getResourceIdsWithNoDefinitionFromThisTemplate is all about.
- *
- * but, it's conceivable that in the future an AlertDefinitionUpdateException can be thrown for other
- * reasons, so we want to catch that here and, at the very least, log it.
- */
- LOG.error("Attempt to update a deleted template " + groupAlertDefinition.toSimpleString());
- }
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
+ purgeInternals);
+ } catch (Throwable t) {
+ throw new AlertDefinitionUpdateException("Failed to update child AlertDefinition[id="
+ + alertDefinitionId + "] with group " + groupAlertDefinition.toSimpleString(), t);
}
}
- /*
- * if the subject deleted the alertDefinition spawned from a groupAlertDefinition, cascade update will recreate it
- */
+ // if the subject deleted the alertDefinition spawned from a groupAlertDefinition, cascade update will recreate it
List<Integer> resourceIds = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(overlord,
- groupAlertDefinition.getId(), getResourceGroupIdAlertTemplateId(groupAlertDefinition.getId()));
- try {
- for (Integer resourceId : resourceIds) {
- updateAlertDefinitionsForResource(overlord, groupAlertDefinition, resourceId);
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
- }
+ groupAlertDefinition.getId(), getResourceGroupIdForAlertDefinitionId(groupAlertDefinition.getId()));
+ for (Integer resourceId : resourceIds) {
+ try {
+ // construct the child
+ AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
+ childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
+
+ // persist the child
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ } catch (Throwable t) {
+ throw new AlertDefinitionUpdateException("Failed to re-create child AlertDefinition for Resource[id="
+ + resourceId + "] with group" + groupAlertDefinition.toSimpleString(), t);
}
- } catch (AlertDefinitionCreationException adce) {
- /* should never happen because AlertDefinitionCreationException is only ever
- * thrown if updateAlertDefinitionsForResource isn't called as the overlord
- *
- * but we'll log it anyway, just in case, so it isn't just swallowed
- */
- LOG.error(adce);
}
- return updatedTemplate;
+ return updated;
}
public void addGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourcesIdsToAdd) {
@@ -305,35 +259,21 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
List<AlertDefinition> groupAlertDefinitions = findGroupAlertDefinitions(subject, resourceGroupId, PageControl
.getUnlimitedInstance());
- int definitionCount = 0;
Subject overlord = subjectManager.getOverlord();
for (AlertDefinition groupAlertDefinition : groupAlertDefinitions) {
for (Integer resourceId : resourcesIdsToAdd) {
try {
- // make sure we perform the system side-effects as the overlord
- updateAlertDefinitionsForResource(overlord, groupAlertDefinition, resourceId);
-
- // rev2804 - flush/clear after 250 definitions for good performance
- if (++definitionCount % 250 == 0) {
- entityManager.flush();
- entityManager.clear();
- }
- } catch (AlertDefinitionCreationException adce) {
- /* should never happen because AlertDefinitionCreationException is only ever
- * thrown if updateAlertDefinitionsForResource isn't called as the overlord
- *
- * but we'll log it anyway, just in case, so it isn't just swallowed
- */
- LOG.error(adce);
- } catch (InvalidAlertDefinitionException iade) {
- /*
- * should never happen because the alert definitions we're creating already exist on the resourceGroup
- * as well as it's current resource members; children are spawned from the parent groupAlertDefinition,
- * and so should also be valid
- *
- * but we'll log it anyway, just in case, so it isn't just swallowed
- */
- LOG.error(iade);
+ // construct the child
+ AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
+ childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
+
+ // persist the child
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ } catch (Throwable t) {
+ throw new AlertDefinitionCreationException(
+ "Could not create child alert definition for Resource[id=" + resourceId
+ + "] under ResourceGroup[id=" + resourceGroupId + "] with group"
+ + groupAlertDefinition.toSimpleString());
}
}
}
@@ -381,7 +321,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
}
}
- private int getResourceGroupIdAlertTemplateId(int groupAlertDefinitionId) {
+ private int getResourceGroupIdForAlertDefinitionId(int groupAlertDefinitionId) {
Query query = entityManager.createQuery("" //
+ "SELECT groupAlertDefinition.resourceGroup.id " //
+ " FROM AlertDefinition groupAlertDefinition " //
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
index faafd0a..09f2d21 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
@@ -32,13 +32,8 @@ import org.rhq.core.domain.util.PageList;
public interface GroupAlertDefinitionManagerLocal {
PageList<AlertDefinition> findGroupAlertDefinitions(Subject subject, int resourceGroupId, PageControl pageControl);
- // Create operation always cascades
int createGroupAlertDefinitions(Subject subject, AlertDefinition alertDefinition, Integer resourceGroupId)
- throws InvalidAlertDefinitionException;
-
- // this is a system side-effect of group processing, and thus should only ever by called by the overlord user
- void updateAlertDefinitionsForResource(Subject subject, AlertDefinition alertTemplate, Integer resourceGroupId)
- throws AlertDefinitionCreationException, InvalidAlertDefinitionException;
+ throws InvalidAlertDefinitionException, AlertDefinitionCreationException;
int removeGroupAlertDefinitions(Subject subject, Integer[] groupAlertDefinitionIds);
@@ -47,7 +42,7 @@ public interface GroupAlertDefinitionManagerLocal {
int disableGroupAlertDefinitions(Subject subject, Integer[] groupAlertDefinitionIds);
AlertDefinition updateGroupAlertDefinitions(Subject subject, AlertDefinition groupAlertDefinition,
- boolean purgeInternals) throws InvalidAlertDefinitionException;
+ boolean purgeInternals) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
// methods requires to implement system side-effects as a result of modifying group membership or deleting groups
void addGroupAlertDefinitions(Subject subject, int groupId, int[] resourcesIdsToAdd);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java
index fd6d8d3..9916509 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java
@@ -43,7 +43,7 @@ import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal;
*/
@Stateless
-(a)TransactionAttribute(TransactionAttributeType.SUPPORTS)
+(a)TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public class AlertConditionCacheManagerBean implements AlertConditionCacheManagerLocal {
@SuppressWarnings("unused")
private static final Log log = LogFactory.getLog(AlertConditionCacheManagerBean.class);
@@ -51,9 +51,6 @@ public class AlertConditionCacheManagerBean implements AlertConditionCacheManage
@EJB
private ServerManagerLocal serverManager;
- @EJB
- private AlertConditionCacheManagerLocal alertConditionCacheManager;
-
public AlertConditionCacheStats checkConditions(MeasurementData... measurementData) {
AlertConditionCacheStats stats;
stats = AlertConditionCacheCoordinator.getInstance().checkConditions(measurementData);
@@ -84,21 +81,19 @@ public class AlertConditionCacheManagerBean implements AlertConditionCacheManage
return stats;
}
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public void reloadCachesForAgent(int agentId) {
AlertConditionCacheCoordinator.getInstance().reloadCachesForAgent(agentId);
}
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public void reloadGlobalCache() {
AlertConditionCacheCoordinator.getInstance().reloadGlobalCache();
}
public void reloadAllCaches() {
- alertConditionCacheManager.reloadGlobalCache();
+ reloadGlobalCache();
List<Agent> agents = serverManager.getAgents();
for (Agent agent : agents) {
- alertConditionCacheManager.reloadCachesForAgent(agent.getId());
+ reloadCachesForAgent(agent.getId());
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
index 2e37c34..b5469ea 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java
@@ -53,7 +53,6 @@ import org.rhq.enterprise.server.alert.engine.model.MeasurementNumericCacheEleme
import org.rhq.enterprise.server.alert.engine.model.MeasurementTraitCacheElement;
import org.rhq.enterprise.server.alert.engine.model.NumericDoubleCacheElement;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.common.EntityManagerFacadeLocal;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -69,7 +68,6 @@ class AgentConditionCache extends AbstractConditionCache {
private AlertConditionManagerLocal alertConditionManager;
private MeasurementDataManagerLocal measurementDataManager;
private SubjectManagerLocal subjectManager;
- private EntityManagerFacadeLocal entityManagerFacade;
private int agentId;
@@ -86,8 +84,6 @@ class AgentConditionCache extends AbstractConditionCache {
measurementDataManager = LookupUtil.getMeasurementDataManager();
subjectManager = LookupUtil.getSubjectManager();
- entityManagerFacade = LookupUtil.getEntityManagerFacade();
-
loadCachesForAgent(agentId);
}
@@ -132,9 +128,6 @@ class AgentConditionCache extends AbstractConditionCache {
insertAlertConditionComposite(agentId, nextComposite, stats);
}
- entityManagerFacade.flush();
- entityManagerFacade.clear();
-
rowsProcessed += alertConditions.size();
if (rowsProcessed >= alertConditions.getTotalSize()) {
break; // we've processed all data, we can stop now
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java
index 4d13534..0e869c1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java
@@ -24,6 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.persistence.EntityNotFoundException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -35,6 +37,7 @@ import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.operation.OperationHistory;
import org.rhq.enterprise.server.alert.engine.AlertConditionCacheStats;
import org.rhq.enterprise.server.alert.engine.model.AbstractCacheElement;
+import org.rhq.enterprise.server.cloud.StatusManagerLocal;
import org.rhq.enterprise.server.core.AgentManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -81,9 +84,11 @@ public final class AlertConditionCacheCoordinator {
private ReentrantReadWriteLock agentReadWriteLock;
private AgentManagerLocal agentManager;
+ private StatusManagerLocal statusManager;
private AlertConditionCacheCoordinator() {
agentManager = LookupUtil.getAgentManager();
+ statusManager = LookupUtil.getStatusManager();
globalCache = new GlobalConditionCache();
@@ -99,19 +104,65 @@ public final class AlertConditionCacheCoordinator {
public void reloadGlobalCache() {
try {
// simply "forget" about the old cache, let the JVM release the memory in time
+ log.debug("Start reloading global cache");
globalCache = new GlobalConditionCache();
- log.debug("Reloaded global cache");
+ log.debug("Finished reloading global cache");
} catch (Throwable t) {
- log.error("Error reloading global cache", t); // don't let any exceptions bubble up to the calling SLSB layer
+ try {
+ Throwable throwable = t;
+ boolean found = false;
+ while (throwable != null) {
+ if (throwable instanceof EntityNotFoundException) {
+ // we're trying to load a list of conditions at the very moment one is deleted out from under us
+ statusManager.markGlobalCache();
+ log.debug("EntityNotFoundException thrown during reload, resetting status bit for retry");
+ found = true;
+ break;
+ }
+ throwable = throwable.getCause();
+ }
+ if (!found) {
+ log.error("Error reloading global cache", t);
+ }
+ } catch (Throwable inner) {
+ // again, don't let any exceptions bubble up to the calling SLSB layer
+ log.error("Error while resetting agent status bit during failed global cache reload attempt", inner);
+ }
}
}
public void reloadCachesForAgent(int agentId) {
AgentConditionCache agentCache = null;
try {
+ if (log.isDebugEnabled()) {
+ log.debug("Start reloading cache for agent[id=" + agentId + "]");
+ }
agentCache = new AgentConditionCache(agentId);
+ if (log.isDebugEnabled()) {
+ log.debug("Finished reloading cache for agent[id=" + agentId + "]");
+ }
} catch (Throwable t) {
- log.error("Error reloading cache for agent[id=" + agentId + "]", t); // don't let any exceptions bubble up to the calling SLSB layer
+ try {
+ Throwable throwable = t;
+ boolean found = false;
+ while (throwable != null) {
+ if (throwable instanceof EntityNotFoundException) {
+ // we're trying to load a list of conditions at the very moment one is deleted out from under us
+ statusManager.updateByAgent(agentId);
+ log.debug("EntityNotFoundException thrown during reload, resetting status bit for retry");
+ found = true;
+ break;
+ }
+ throwable = throwable.getCause();
+ }
+ if (!found) {
+ log.error("Error reloading cache for agent[id=" + agentId + "]", t);
+ }
+ } catch (Throwable inner) {
+ // again, don't let any exceptions bubble up to the calling SLSB layer
+ log.error("Error while resetting agent status bit during failed cache reload attempt for agent[id="
+ + agentId + "]", inner);
+ }
}
if (agentCache != null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
index d38df76..dc4166f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
@@ -50,7 +50,6 @@ import org.rhq.enterprise.server.alert.engine.model.InvalidCacheElementException
import org.rhq.enterprise.server.alert.engine.model.ResourceConfigurationCacheElement;
import org.rhq.enterprise.server.alert.engine.model.ResourceOperationCacheElement;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
-import org.rhq.enterprise.server.common.EntityManagerFacadeLocal;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -64,7 +63,6 @@ class GlobalConditionCache extends AbstractConditionCache {
private AlertConditionManagerLocal alertConditionManager;
private SubjectManagerLocal subjectManager;
- private EntityManagerFacadeLocal entityManagerFacade;
public GlobalConditionCache() {
super();
@@ -75,7 +73,6 @@ class GlobalConditionCache extends AbstractConditionCache {
alertConditionManager = LookupUtil.getAlertConditionManager();
subjectManager = LookupUtil.getSubjectManager();
- entityManagerFacade = LookupUtil.getEntityManagerFacade();
loadCaches();
}
@@ -114,9 +111,6 @@ class GlobalConditionCache extends AbstractConditionCache {
insertAlertConditionComposite(nextComposite, stats);
}
- entityManagerFacade.flush();
- entityManagerFacade.clear();
-
rowsProcessed += alertConditions.size();
if (rowsProcessed >= alertConditions.getTotalSize()) {
break; // we've processed all data, we can stop now
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java
index 4c4dbd2..61655c9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java
@@ -115,7 +115,7 @@ public class StatusManagerBean implements StatusManagerLocal {
* this method is called, we only have the updated alert definition, thus it's not possible to intelligently
* know which of the two caches to reload; so, we need to reload them both to be sure the system is consistent
*/
- markGlobalCache();
+ markGlobalCache(); // use local references to execute in the same transaction
Query updateAgentQuery = entityManager.createNamedQuery(Agent.QUERY_UPDATE_STATUS_BY_RESOURCE);
updateAgentQuery.setParameter("resourceId", resourceId);
@@ -148,7 +148,7 @@ public class StatusManagerBean implements StatusManagerLocal {
* this method is called, we only have the updated alert definition, thus it's not possible to intelligently
* know which of the two caches to reload; so, we need to reload them both to be sure the system is consistent
*/
- markGlobalCache();
+ markGlobalCache(); // use local references to execute in the same transaction
Query updateAgentQuery = entityManager.createNamedQuery(Agent.QUERY_UPDATE_STATUS_BY_ALERT_DEFINITION);
updateAgentQuery.setParameter("alertDefinitionId", alertDefinitionId);
@@ -167,7 +167,8 @@ public class StatusManagerBean implements StatusManagerLocal {
}
}
- private void markGlobalCache() {
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ public void markGlobalCache() {
Query updateServerQuery = entityManager.createNamedQuery(Server.QUERY_UPDATE_STATUS_BY_NAME);
updateServerQuery.setParameter("identity", serverManager.getIdentity());
int serversUpdated = updateServerQuery.executeUpdate();
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerLocal.java
index 52ba90a..26322d2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerLocal.java
@@ -30,6 +30,8 @@ public interface StatusManagerLocal {
List<Integer> getAndClearAgentsWithStatusForServer(String serverName);
+ void markGlobalCache();
+
void updateByResource(int resourceId);
void updateByAlertDefinition(int alertDefinitionId);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java
index 4d2adee..2de7bad 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java
@@ -93,7 +93,7 @@ public class CacheConsistencyManagerBean implements CacheConsistencyManagerLocal
}
}
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void reloadServerCacheIfNeeded() {
// try reload the global cache separate from the agent caches for purposes of isolated failures
reloadGlobalCacheIfNeeded();
@@ -145,7 +145,7 @@ public class CacheConsistencyManagerBean implements CacheConsistencyManagerLocal
// otherwise print informational messages for poor-man's verification purposes
long startTime = System.currentTimeMillis();
for (Integer nextAgentId : agentIds) {
- log.debug("Agent[id=" + nextAgentId + " is stale ");
+ log.debug("Agent[id=" + nextAgentId + "] is stale ");
cacheManager.reloadCachesForAgent(nextAgentId);
}
long endTime = System.currentTimeMillis();
commit b338c7f5b3c3eada8b7e6d68ba529548e04529c9
Merge: 30625b5... 7d7c717...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon May 3 13:31:13 2010 -0400
Merge branch 'master-jay'
commit 98d7db9e8be3aa960292ca6b9072c1010a35a3d9
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Apr 30 14:57:29 2010 +0200
BZ 587325 - Singletons are no longer autogrouped in the resource and group left navigation trees.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java
index a68b1bf..c9b3eac 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java
@@ -205,10 +205,11 @@ public class FlyweightCache {
int id = original.getId();
String name = original.getName();
String plugin = original.getPlugin();
+ boolean singleton = original.isSingleton();
ResourceCategory category = original.getCategory();
ResourceSubCategory subCategory = original.getSubCategory();
- return constructResourceType(id, name, plugin, category, subCategory != null ? subCategory.getId() : null);
+ return constructResourceType(id, name, plugin, singleton, category, subCategory != null ? subCategory.getId() : null);
}
/**
@@ -223,12 +224,13 @@ public class FlyweightCache {
* @param id the resource type id
* @param name the resource type name
* @param plugin the resource type plugin
+ * @param singleton true if the resource type is a singleton
* @param category the resource type category
* @param subCategory the id of the resource type sub category or null
* @param cache the flyweight cache
* @return
*/
- public ResourceTypeFlyweight constructResourceType(int id, String name, String plugin, ResourceCategory category,
+ public ResourceTypeFlyweight constructResourceType(int id, String name, String plugin, boolean singleton, ResourceCategory category,
Integer subCategory) {
ResourceTypeFlyweight ret = getResourceTypes().get(id);
@@ -241,6 +243,7 @@ public class FlyweightCache {
ret.setId(id);
ret.setName(name);
ret.setPlugin(plugin);
+ ret.setSingleton(singleton);
ret.setCategory(category);
if (subCategory != null) {
ret.setSubCategory(getSubCategories().get(subCategory));
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java
index 3accee8..cae0efe 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java
@@ -39,6 +39,7 @@ public class ResourceTypeFlyweight implements Serializable {
private int id;
private String name;
private String plugin;
+ private boolean singleton;
private ResourceCategory category;
private ResourceSubCategoryFlyweight subCategory;
@@ -86,6 +87,14 @@ public class ResourceTypeFlyweight implements Serializable {
this.subCategory = subCategory;
}
+ public boolean isSingleton() {
+ return singleton;
+ }
+
+ public void setSingleton(boolean singleton) {
+ this.singleton = singleton;
+ }
+
@Override
public boolean equals(Object obj) {
if (this == obj)
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeModelUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeModelUIBean.java
index 97ff9a8..66ef285 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeModelUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeModelUIBean.java
@@ -100,7 +100,7 @@ public class ResourceGroupTreeModelUIBean {
Set<ResourceTreeNode> memberNodes = new HashSet<ResourceTreeNode>();
for (Integer member : members) {
- memberNodes.add(ResourceTreeModelUIBean.load(member.intValue(), resources, true));
+ memberNodes.add(ResourceTreeModelUIBean.load(member.intValue(), resources));
}
ResourceGroupTreeNode root = new ResourceGroupTreeNode(group, null);
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java
index 794dc61..2f1bd6f 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java
@@ -90,13 +90,13 @@ public class ResourceTreeModelUIBean {
start = System.currentTimeMillis();
monitorId = HibernatePerformanceMonitor.get().start();
- rootNode = load(rootResource.getId(), resources, true);
+ rootNode = load(rootResource.getId(), resources);
end = System.currentTimeMillis();
HibernatePerformanceMonitor.get().stop(monitorId, "ResourceTree tree construction");
log.debug("Constructed tree in " + (end - start));
}
- public static ResourceTreeNode load(int rootId, List<ResourceFlyweight> resources, boolean alwaysGroup) {
+ public static ResourceTreeNode load(int rootId, List<ResourceFlyweight> resources) {
ResourceFlyweight found = null;
for (ResourceFlyweight res : resources) {
if (res.getId() == rootId) {
@@ -105,12 +105,11 @@ public class ResourceTreeModelUIBean {
}
ResourceTreeNode root = new ResourceTreeNode(found);
long start = System.currentTimeMillis();
- load(root, alwaysGroup);
+ load(root);
return root;
}
- public static void load(ResourceTreeNode parentNode, boolean alwaysGroup) {
-
+ public static void load(ResourceTreeNode parentNode) {
if (parentNode.getData() instanceof ResourceFlyweight) {
ResourceFlyweight parentResource = (ResourceFlyweight) parentNode.getData();
@@ -119,76 +118,51 @@ public class ResourceTreeModelUIBean {
if (res.getResourceType().getSubCategory() != null) {
// These are children that have subcategories
// Split them by if they are a sub-sub category or just a category
- if (res.getResourceType().getSubCategory().getParentSubCategory() == null) {
- if (children.containsKey(res.getResourceType().getSubCategory())) {
- children.get(res.getResourceType().getSubCategory()).add(res);
- } else {
- ArrayList<ResourceFlyweight> list = new ArrayList<ResourceFlyweight>();
- list.add(res);
- children.put(res.getResourceType().getSubCategory(), list);
- }
- } else if (res.getResourceType().getSubCategory().getParentSubCategory() != null) {
- if (children.containsKey(res.getResourceType().getSubCategory().getParentSubCategory())) {
- children.get(res.getResourceType().getSubCategory().getParentSubCategory()).add(res);
- } else {
- ArrayList<ResourceFlyweight> list = new ArrayList<ResourceFlyweight>();
- list.add(res);
- children.put(res.getResourceType().getSubCategory().getParentSubCategory(), list);
- }
+ ResourceSubCategoryFlyweight categoryKey = res.getResourceType().getSubCategory().getParentSubCategory();
+ if (categoryKey == null) {
+ categoryKey = res.getResourceType().getSubCategory();
}
+ addToList(children, categoryKey, res);
} else {
// These are children without categories of the parent resource
// - Add them into groupings by their resource type
- if (children.containsKey(res.getResourceType())) {
- children.get(res.getResourceType()).add(res);
- } else {
- ArrayList<ResourceFlyweight> list = new ArrayList<ResourceFlyweight>();
- list.add(res);
- children.put(res.getResourceType(), list);
- }
+ addToList(children, res.getResourceType(), res);
}
}
-
- Set<String> dupResourceTypeNames = getDuplicateResourceTypeNames(children, alwaysGroup);
-
- for (Object rsc : children.keySet()) {
- if (rsc != null
- && (rsc instanceof ResourceSubCategoryFlyweight || children.get(rsc).size() > 1 || (alwaysGroup && children
- .get(rsc).size() == 1))) {
- double avail = 0;
- List<ResourceFlyweight> entries = children.get(rsc);
- for (ResourceFlyweight res : entries) {
- avail += res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? 1 : 0;
- }
- avail = avail / entries.size();
-
- AutoGroupCompositeFlyweight agc = null;
- if (rsc instanceof ResourceSubCategoryFlyweight) {
- agc = new AutoGroupCompositeFlyweight(avail, parentResource, (ResourceSubCategoryFlyweight) rsc, entries.size());
- } else if (rsc instanceof ResourceTypeFlyweight) {
- boolean isDupResourceTypeName = dupResourceTypeNames.contains(((ResourceTypeFlyweight) rsc).getName());
- agc = new AutoGroupCompositeFlyweight(avail, parentResource, (ResourceTypeFlyweight) rsc, entries.size(),
+
+ Set<String> dupResourceTypeNames = getDuplicateResourceTypeNames(children);
+
+ for(Map.Entry<Object, List<ResourceFlyweight>> entry : children.entrySet()) {
+ Object key = entry.getKey();
+ List<ResourceFlyweight> resources = entry.getValue();
+
+ double avail = 0;
+ for (ResourceFlyweight res : resources) {
+ avail += res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? 1 : 0;
+ }
+ avail = avail / resources.size();
+
+ Object nodeData = null;
+ if (key instanceof ResourceSubCategoryFlyweight) {
+ nodeData = new AutoGroupCompositeFlyweight(avail, parentResource, (ResourceSubCategoryFlyweight) key, resources.size());
+ } else if (key instanceof ResourceTypeFlyweight) {
+ ResourceTypeFlyweight typeKey = (ResourceTypeFlyweight) key;
+
+ if (typeKey.isSingleton()) {
+ nodeData = resources.get(0);
+ } else {
+ boolean isDupResourceTypeName = dupResourceTypeNames.contains(typeKey.getName());
+ nodeData = new AutoGroupCompositeFlyweight(avail, parentResource, typeKey, resources.size(),
isDupResourceTypeName);
}
- ResourceTreeNode node = new ResourceTreeNode(agc, parentNode);
- load(node, alwaysGroup);
-
- if (!recursivelyLocked(node)) {
- parentNode.getChildren().add(node);
- }
- } else {
- List<ResourceFlyweight> entries = children.get(rsc);
- for (ResourceFlyweight res : entries) {
- ResourceTreeNode node = new ResourceTreeNode(res, parentNode);
-
- load(node, alwaysGroup);
- if (!recursivelyLocked(node)) {
- parentNode.getChildren().add(node);
- }
- }
}
+ ResourceTreeNode node = new ResourceTreeNode(nodeData, parentNode);
+ load(node);
+ if (!recursivelyLocked(node)) {
+ parentNode.getChildren().add(node);
+ }
}
} else {
// #####################################################################################
@@ -207,72 +181,62 @@ public class ResourceTreeModelUIBean {
&& compositeParent.getParentResource().equals(res.getParentResource())) {
// A subSubCategory in a subcategory
- if (children.containsKey(res.getResourceType().getSubCategory())) {
- children.get(res.getResourceType().getSubCategory()).add(res);
- } else {
- ArrayList<ResourceFlyweight> list = new ArrayList<ResourceFlyweight>();
- list.add(res);
- children.put(res.getResourceType().getSubCategory(), list);
- }
+ addToList(children, res.getResourceType().getSubCategory(), res);
} else if (compositeParent.getSubcategory().equals(res.getResourceType().getSubCategory())
&& compositeParent.getParentResource().equals(res.getParentResource())) {
// Direct entries in a subcategory... now group them by autogroup (type)
- if (children.containsKey(res.getResourceType())) {
- children.get(res.getResourceType()).add(res);
- } else {
- ArrayList<ResourceFlyweight> list = new ArrayList<ResourceFlyweight>();
- list.add(res);
- children.put(res.getResourceType(), list);
- }
+ addToList(children, res.getResourceType(), res);
}
} else if (compositeParent.getResourceType() != null) {
if (compositeParent.getResourceType().equals(res.getResourceType())
&& compositeParent.getParentResource().getId() == res.getParentResource().getId()) {
- if (children.containsKey(res.getResourceType())) {
- children.get(res.getResourceType()).add(res);
- } else {
- ArrayList<ResourceFlyweight> list = new ArrayList<ResourceFlyweight>();
- list.add(res);
- children.put(res.getResourceType(), list);
- }
+
+ addToList(children, res.getResourceType(), res);
}
}
}
}
- for (Object rsc : children.keySet()) {
- if (rsc != null
- && (rsc instanceof ResourceSubCategoryFlyweight || ((children.get(rsc).size() > 1 || (alwaysGroup && children
- .get(rsc).size() == 1)) && ((AutoGroupCompositeFlyweight) parentNode.getData()).getSubcategory() != null))) {
+ AutoGroupCompositeFlyweight compositeParentNode = (AutoGroupCompositeFlyweight) parentNode.getData();
+
+ for (Map.Entry<Object, List<ResourceFlyweight>> entry : children.entrySet()) {
+ Object key = entry.getKey();
+ List<ResourceFlyweight> resources = entry.getValue();
+
+ if (compositeParentNode.getSubcategory() != null) {
double avail = 0;
- List<ResourceFlyweight> entries = children.get(rsc);
- for (ResourceFlyweight res : entries) {
+ for (ResourceFlyweight res : resources) {
avail += res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? 1 : 0;
}
- avail = avail / entries.size();
-
- AutoGroupCompositeFlyweight agc = null;
- if (rsc instanceof ResourceSubCategoryFlyweight) {
- agc = new AutoGroupCompositeFlyweight(avail, compositeParent.getParentResource(),
- (ResourceSubCategoryFlyweight) rsc, entries.size());
- } else if (rsc instanceof ResourceTypeFlyweight) {
- agc = new AutoGroupCompositeFlyweight(avail, compositeParent.getParentResource(), (ResourceTypeFlyweight) rsc,
- entries.size(), false);
+ avail = avail / resources.size();
+
+ Object nodeData = null;
+ if (key instanceof ResourceSubCategoryFlyweight) {
+ nodeData = new AutoGroupCompositeFlyweight(avail, compositeParent.getParentResource(),
+ (ResourceSubCategoryFlyweight) key, resources.size());
+ } else if (key instanceof ResourceTypeFlyweight) {
+ ResourceTypeFlyweight typeKey = (ResourceTypeFlyweight) key;
+ if (typeKey.isSingleton()) {
+ nodeData = resources.get(0);
+ } else {
+ nodeData = new AutoGroupCompositeFlyweight(avail, compositeParent.getParentResource(), typeKey,
+ resources.size(), false);
+ }
}
- ResourceTreeNode node = new ResourceTreeNode(agc, parentNode);
- load(node, alwaysGroup);
+ ResourceTreeNode node = new ResourceTreeNode(nodeData, parentNode);
+ load(node);
+
if (!recursivelyLocked(node)) {
parentNode.getChildren().add(node);
}
} else {
- List<ResourceFlyweight> entries = children.get(rsc);
- for (ResourceFlyweight res : entries) {
+ for (ResourceFlyweight res : resources) {
ResourceTreeNode node = new ResourceTreeNode(res, parentNode);
- load(node, alwaysGroup);
+ load(node);
if (!recursivelyLocked(node)) {
parentNode.getChildren().add(node);
}
- }
+ }
}
}
}
@@ -316,13 +280,11 @@ public class ResourceTreeModelUIBean {
this.nodeTitle = nodeTitle;
}
- private static Set<String> getDuplicateResourceTypeNames(Map<Object, List<ResourceFlyweight>> children, boolean alwaysGroup) {
- Set<String> resourceTypeNames = new HashSet();
- Set<String> dupResourceTypeNames = new HashSet();
+ private static Set<String> getDuplicateResourceTypeNames(Map<Object, List<ResourceFlyweight>> children) {
+ Set<String> resourceTypeNames = new HashSet<String>();
+ Set<String> dupResourceTypeNames = new HashSet<String>();
for (Object rsc : children.keySet()) {
- if (rsc != null
- && (rsc instanceof ResourceTypeFlyweight && (children.get(rsc).size() > 1 || (alwaysGroup && children.get(rsc)
- .size() == 1)))) {
+ if (rsc instanceof ResourceTypeFlyweight) {
String resourceTypeName = ((ResourceTypeFlyweight) rsc).getName();
if (resourceTypeNames.contains(resourceTypeName)) {
dupResourceTypeNames.add(resourceTypeName);
@@ -332,4 +294,15 @@ public class ResourceTreeModelUIBean {
}
return dupResourceTypeNames;
}
+
+ private static <K, V> void addToList(Map<K, List<V>> mapOfLists, K key, V value) {
+ List<V> list = mapOfLists.get(key);
+
+ if (list == null) {
+ list = new ArrayList<V>();
+ mapOfLists.put(key, list);
+ }
+
+ list.add(value);
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index 687585b..5fbbaa6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -1759,7 +1759,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
+ " SELECT res.id, res.uuid, res.name, res.resourceKey, " //
+ " parent.id, parent.name, " //
+ " currentAvail.availabilityType, " //
- + " type.id, type.name, type.plugin, type.category, " //
+ + " type.id, type.name, type.plugin, type.singleton, type.category, " //
+ " subCategory.id, subCategory.name, " //
+ " parentSubCategory.id, parentSubCategory.name " //
+ " FROM Resource res " //
@@ -1829,6 +1829,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
Integer typeId = (Integer) prefetched[i++];
String typeName = (String) prefetched[i++];
String typePlugin = (String) prefetched[i++];
+ Boolean typeSingleton = (Boolean) prefetched[i++];
ResourceCategory typeCategory = (ResourceCategory) prefetched[i++];
Integer subCategoryId = (Integer) prefetched[i++];
@@ -1843,7 +1844,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
}
//we don't need the resource type reference here, only in the cache
- flyweightCache.constructResourceType(typeId, typeName, typePlugin, typeCategory, subCategoryId);
+ flyweightCache.constructResourceType(typeId, typeName, typePlugin, typeSingleton, typeCategory, subCategoryId);
ResourceFlyweight resourceFlyweight = flyweightCache.constructResource(
resourceId, resourceName, resourceUuid, resourceKey, parentId, typeId, availType);
@@ -1863,7 +1864,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
+ " SELECT res.id, res.uuid, res.name, res.resourceKey, " //
+ " parent.id, parent.name, " //
+ " currentAvail.availabilityType, " //
- + " type.id, type.name, type.plugin, type.category, " //
+ + " type.id, type.name, type.plugin, type.singleton, type.category, " //
+ " subCategory.id, subCategory.name, " //
+ " parentSubCategory.id, parentSubCategory.name " //
+ " FROM Resource res " //
commit 76a0f63849f0ead3b959bcd7baed56680b8ce811
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Apr 29 18:32:26 2010 +0200
BZ 587317 - revert to using different icons for different resource types.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml
index 6eb65f5..4276b76 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml
@@ -92,10 +92,10 @@
</rich:treeNode>
<!-- Tree Node supporting context menu -->
<rich:treeNode type="Resource"
- icon="/images/icons/folder_closed_#{resourceTreeItem.data.currentAvailability.availabilityType == 'DOWN' ? 'down' : 'up'}_16.png"
+ icon="/images/icons/#{resourceTreeItem.data.resourceType.category}_#{resourceTreeItem.data.currentAvailability.availabilityType == 'DOWN' ? 'down' : 'up'}_16.png"
iconCollapsed="/images/icons/dir_closed.png"
iconExpanded="/images/icons/dir_open.png"
- iconLeaf="/images/icons/Service_#{resourceTreeItem.data.currentAvailability.availabilityType == 'DOWN' ? 'down' : 'up'}_16.png">
+ iconLeaf="/images/icons/#{resourceTreeItem.data.resourceType.category}_#{resourceTreeItem.data.currentAvailability.availabilityType == 'DOWN' ? 'down' : 'up'}_16.png">
<a4j:support event="oncontextmenu" reRender="resourceMenu" timeout="5000"
disableDefault="true" status="commonStatus" limitToList="true"
ajaxSingle="true" oncomplete="#{rich:component('resourceMenu')}.show(event, {})">
commit bb5e7a9d039d10ce308c5bcd811c4c1423330a7f
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Apr 29 15:27:19 2010 +0200
BZ 580928, BZ 587250 - RHQ server is identified as such in the resource name, jboss as (4 and 5) are called hostname:jnpPort instead of bindingAddress:jnpPort
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
index b02bd01..3b51ec7 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java
@@ -27,7 +27,9 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.URL;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -288,43 +290,51 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
namingPort = port;
}
- String configName = absoluteConfigPath.getName();
- String baseName = discoveryContext.getSystemInformation().getHostname();
String description = installInfo.getProductType().DESCRIPTION;
File deployDir = new File(absoluteConfigPath, "deploy");
File rhqInstallerWar = new File(deployDir, "rhq-installer.war");
File rhqInstallerWarUndeployed = new File(deployDir, "rhq-installer.war.rej");
boolean isRhqServer = rhqInstallerWar.exists() || rhqInstallerWarUndeployed.exists();
if (isRhqServer) {
- baseName += " RHQ Server, ";
description += " hosting the RHQ Server";
// We know this is an RHQ Server. Let's add an event source for its server log file, but disable it by default.
configureEventSourceForServerLogFile(pluginConfig);
}
- String name = bindAddress+ (namingPort ==null?"":":"+namingPort);
+ String name = formatServerName(bindAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), isRhqServer);
return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, installInfo.getVersion(),
description, pluginConfig, processInfo);
}
- /*
- private String formatServerName(String baseName, String bindingAddress, String jnpPort, String configName,
- JBossInstallationInfo installInfo) {
- baseName = baseName + " " + installInfo.getProductType().NAME + " " + installInfo.getVersion() + " "
- + configName;
-
- String details = null;
- if ((bindingAddress != null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) {
- details = bindingAddress + ":" + jnpPort;
- } else if ((bindingAddress == null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) {
- details = jnpPort;
- } else if (bindingAddress != null) {
- details = bindingAddress;
- }
- return baseName + ((details != null) ? (" (" + details + ")") : "");
-
+ public String formatServerName(String bindingAddress, String jnpPort, String hostname, boolean isRhq) {
+
+ if (isRhq) {
+ return hostname + " RHQ Server";
+ } else {
+ String hostnameToUse = hostname;
+
+ if (bindingAddress != null) {
+ try {
+ InetAddress bindAddr = InetAddress.getByName(bindingAddress);
+ if (!bindAddr.isAnyLocalAddress()) {
+ //if the binding address != 0.0.0.0
+ hostnameToUse = bindAddr.getHostName();
+ }
+ } catch (UnknownHostException e) {
+ //this should not happen?
+ log.warn("Unknown hostname passed in as the binding address for JBoss AS server discovery: "
+ + bindingAddress);
+ }
+ }
+
+ if (jnpPort != null && !jnpPort.equals(CHANGE_ME)) {
+ hostnameToUse += ":" + jnpPort;
+ }
+
+ return hostnameToUse;
+ }
}
-*/
+
private void configureEventSourceForServerLogFile(Configuration pluginConfig) {
File rhqLogFile = resolvePathRelativeToHomeDir(pluginConfig, "../logs/rhq-server-log4j.log");
if (rhqLogFile.exists() && !rhqLogFile.isDirectory()) {
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java
index b14027e..05483e4 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java
@@ -24,6 +24,8 @@ package org.rhq.plugins.jbossas;
import java.io.File;
import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -294,11 +296,9 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
}
String configName = absoluteConfigPath.getName();
- String baseName = discoveryContext.getSystemInformation().getHostname();
String description = installInfo.getProductType().DESCRIPTION;
- boolean isInServer = isEmbeddedInServer(absoluteConfigPath);
+ boolean isInServer = isRhqServer(absoluteConfigPath);
if (isInServer) {
- baseName += " RHQ Server, ";
description += " hosting the RHQ Server";
// RHQ-633 : We know this is an RHQ Server. Let's auto-configure for tracking its log file, which is not in
@@ -325,7 +325,7 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
}
}
}
- String name = formatServerName(baseName, bindingAddress, namingPort, configName, installInfo);
+ String name = formatServerName(bindingAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), isInServer);
return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, installInfo.getVersion(),
description, pluginConfiguration, processInfo);
@@ -335,7 +335,7 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
* @param absoluteConfigPath
* @return true if this plugin is in an Agent that is embedded in the Server
*/
- private boolean isEmbeddedInServer(File absoluteConfigPath) {
+ private boolean isRhqServer(File absoluteConfigPath) {
File deployDir = new File(absoluteConfigPath, "deploy");
File rhqInstallerWar = new File(deployDir, "rhq-installer.war");
File rhqInstallerWarUndeployed = new File(deployDir, "rhq-installer.war.rej");
@@ -403,8 +403,8 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
// Now set default values on any props that are still not set.
setPluginConfigurationDefaults(pluginConfiguration);
- String resourceName = formatServerName(context.getSystemInformation().getHostname(), bindAddress,
- jnpPort, configName, installInfo);
+ String resourceName = formatServerName(bindAddress, jnpPort,
+ context.getSystemInformation().getHostname(), isRhqServer(configDir));
DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), configDir
.getAbsolutePath(), resourceName, version,
"JBoss AS server that the RHQ Plugin Container is running within", pluginConfiguration, null);
@@ -420,16 +420,32 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma
return null;
}
- public String formatServerName(String baseName, String bindingAddress, String jnpPort, String configName,
- JBossInstallationInfo installInfo) {
-
- String details = null;
- if ((bindingAddress != null) && (jnpPort != null && !jnpPort.equals(CHANGE_ME))) {
- details = bindingAddress + ":" + jnpPort;
- } else
- details = bindingAddress;
-
- return details;
+ public String formatServerName(String bindingAddress, String jnpPort, String hostname, boolean isRhq) {
+
+ if (isRhq) {
+ return hostname + " RHQ Server";
+ } else {
+ String hostnameToUse = hostname;
+
+ if (bindingAddress != null) {
+ try {
+ InetAddress bindAddr = InetAddress.getByName(bindingAddress);
+ if (!bindAddr.isAnyLocalAddress()) {
+ //if the binding address != 0.0.0.0
+ hostnameToUse = bindAddr.getHostName();
+ }
+ } catch (UnknownHostException e) {
+ //this should not happen?
+ log.warn("Unknown hostname passed in as the binding address for JBoss AS server discovery: " + bindingAddress);
+ }
+ }
+
+ if (jnpPort != null && !jnpPort.equals(CHANGE_ME)) {
+ hostnameToUse += ":" + jnpPort;
+ }
+
+ return hostnameToUse;
+ }
}
private static String getJnpURL(JBossInstanceInfo cmdLine, File installHome, File configDir) {
1
0
modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 11 +++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 5eb7cc4cd03114b4d6e8ea2f2da851fad8bf9d7e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon May 24 14:44:40 2010 -0400
need to make sure we are getting non-zero back from the disk usage API
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
index 99793e5..f7185d7 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java
@@ -229,7 +229,16 @@ public class Deployer {
public DeploymentDiskUsage estimateDiskUsage() throws Exception {
final DeploymentDiskUsage diskUsage = new DeploymentDiskUsage();
- diskUsage.setMaxDiskUsable(this.deploymentData.getDestinationDir().getUsableSpace());
+ File partition = this.deploymentData.getDestinationDir();
+ long usableSpace = partition.getUsableSpace();
+ while (usableSpace == 0L && partition != null) {
+ partition = partition.getParentFile();
+ if (partition != null) {
+ usableSpace = partition.getUsableSpace();
+ }
+ }
+
+ diskUsage.setMaxDiskUsable(usableSpace);
Set<File> zipFiles = this.deploymentData.getZipFiles();
for (File zipFile : zipFiles) {
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java | 36 ++++++++--
3 files changed, 31 insertions(+), 8 deletions(-)
New commits:
commit 084b6c04727a4bb382815d46c5bf5a179cb22afc
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 14:13:35 2010 -0400
Fix null session login detection issue
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index abcec22..0d15b46 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -123,6 +123,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
GWTServiceLookup.getSubjectService().findSubjectsByCriteria(criteria, new AsyncCallback<PageList<Subject>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load user's subject", caught);
+ new LoginView().showLoginDialog();
}
public void onSuccess(PageList<Subject> result) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 68a544f..0eafbc6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -83,8 +83,6 @@ public class LoginView extends Canvas {
CoreGUI.checkLoginStatus();
}
});
- } else {
- CoreGUI.checkLoginStatus();
}
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java
index 7eadda6..7acfcbe 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java
@@ -35,8 +35,13 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.legacy.ParamConstants;
import org.rhq.enterprise.gui.legacy.WebUser;
import org.rhq.enterprise.gui.legacy.util.SessionUtils;
+import org.rhq.enterprise.server.auth.SessionManager;
+import org.rhq.enterprise.server.auth.SessionNotFoundException;
+import org.rhq.enterprise.server.auth.SessionTimeoutException;
/**
* @author Greg Hinkle
@@ -59,17 +64,36 @@ public class SessionAccessServlet extends HttpServlet {
*/
WebUser webUser = SessionUtils.getWebUser(session);
- if (webUser != null) {
- ServletOutputStream out = response.getOutputStream();
+ if (webUser != null && webUser.getSubject() != null) {
- String output =
- String.valueOf(webUser.getSubject().getId()) + ":" +
- String.valueOf(webUser.getSessionId());
+ // the web user exists, so update our SessionManager's session last-access-time
+ Subject subject = webUser.getSubject();
+ try {
- out.write(output.getBytes());
+ SessionManager.getInstance().getSubject(subject.getSessionId());
+
+ ServletOutputStream out = response.getOutputStream();
+
+ String output =
+ String.valueOf(webUser.getSubject().getId()) + ":" +
+ String.valueOf(webUser.getSessionId());
+
+
+ out.write(output.getBytes());
+
+
+ } catch (SessionNotFoundException snfe) {
+ session.removeAttribute(ParamConstants.USER_PARAM);
+ SessionUtils.setWebUser(session, null);
+ webUser = null;
+ } catch (SessionTimeoutException ste) {
+ session.removeAttribute(ParamConstants.USER_PARAM);
+ SessionUtils.setWebUser(session, null);
+ webUser = null;
+ }
}
}
}
1
0
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip |binary
2 files changed
New commits:
commit ea7bb8464d72fed58820734e859fb8304a6ccaa1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon May 24 13:58:20 2010 -0400
fix some typos in the test ant scripts
diff --git a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip
index 4d591cd..4254981 100644
Binary files a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip and b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip differ
diff --git a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip
index f206b7e..c6963b2 100644
Binary files a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip and b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip differ
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 75 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 45 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 42 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 74 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 200 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 55 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 59 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java | 16
11 files changed, 357 insertions(+), 222 deletions(-)
New commits:
commit f560b24cec2d9fc88a369554d197b111c0d8486a
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 13:44:45 2010 -0400
logout typo
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 9a84992..abcec22 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -221,7 +221,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
} else if (breadcrumbName.equals("Bundles")) {
canvas = new BundleTopView();
} else if (breadcrumbName.equals("LogOut")) {
- canvas = new LoginView();
+ canvas = new LoginView(true);
} else if (breadcrumbName.equals("Tag")) {
canvas = new TaggedView();
} else {
commit 5157d3bd8b21541f82f28670a267b160ae366d94
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 13:44:18 2010 -0400
allow gwt logout
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index b914a4b..9a84992 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -220,8 +220,8 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
canvas = new DashboardsView();
} else if (breadcrumbName.equals("Bundles")) {
canvas = new BundleTopView();
- /*} else if (breadcrumbName.equals("LogOut")) {
-// canvas = new LoginView();*/
+ } else if (breadcrumbName.equals("LogOut")) {
+ canvas = new LoginView();
} else if (breadcrumbName.equals("Tag")) {
canvas = new TaggedView();
} else {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 39f9066..68a544f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -53,17 +53,42 @@ import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
/**
* @author Greg Hinkle
*/
-public class LoginView {
+public class LoginView extends Canvas {
private Window window;
private DynamicForm form;
+
+ public LoginView() {
+ this(false);
+ }
+
+ public LoginView(boolean logout) {
+
+ if (logout && CoreGUI.getSessionSubject() != null) {
+ GWTServiceLookup.getSubjectService().logout(CoreGUI.getSessionSubject(), new AsyncCallback<Void>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to logout", caught);
+ CoreGUI.checkLoginStatus();
+ }
+
+ public void onSuccess(Void result) {
+ CoreGUI.checkLoginStatus();
+ }
+ });
+ } else {
+ CoreGUI.checkLoginStatus();
+ }
+
+ }
+
public void showLoginDialog() {
form = new DynamicForm();
@@ -72,7 +97,7 @@ public class LoginView {
CanvasItem logo = new CanvasItem();
- logo.setCanvas(new Img("header/rhq_logo_28px.png",80,28));
+ logo.setCanvas(new Img("header/rhq_logo_28px.png", 80, 28));
logo.setShowTitle(false);
HeaderItem header = new HeaderItem();
@@ -105,7 +130,7 @@ public class LoginView {
window = new Window();
window.setTitle("RHQ Login");
window.setWidth(400);
- window.setHeight(400);
+ window.setHeight(250);
window.setIsModal(true);
window.setShowModalMask(true);
window.setCanDragResize(true);
commit 276df89bafc0dbf4860275bdb90cf33882024cd5
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 13:29:22 2010 -0400
Improved tag editing and Table component
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 60e0aab..27f8b0b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -99,8 +99,9 @@ public class BundleDeploymentView extends VLayout implements BookmarkableView {
LinkItem bundleName = new LinkItem("bundle");
bundleName.setTitle("Bundle");
- bundleName.setTarget("#Bundles/Bundle/" + bundle.getId());
+ bundleName.setValue("#Bundles/Bundle/" + bundle.getId());
bundleName.setLinkTitle(bundle.getName());
+ bundleName.setTarget("_self");
CanvasItem tagItem = new CanvasItem("tag");
tagItem.setShowTitle(false);
@@ -119,6 +120,7 @@ public class BundleDeploymentView extends VLayout implements BookmarkableView {
});
}
});
+ tagEditor.setVertical(true);
tagItem.setCanvas(tagEditor);
tagItem.setRowSpan(4);
@@ -126,8 +128,11 @@ public class BundleDeploymentView extends VLayout implements BookmarkableView {
deployed.setValue(new Date(deployment.getCtime()));
LinkItem destinationGroup = new LinkItem("group");
- destinationGroup.setTarget("#ResourceGroup/" + deployment.getDestination().getGroup().getId());
+ destinationGroup.setTitle("Group");
+ destinationGroup.setValue("#ResourceGroup/" + deployment.getDestination().getGroup().getId());
destinationGroup.setLinkTitle(deployment.getDestination().getGroup().getName());
+ destinationGroup.setTarget("_self");
+
StaticTextItem path = new StaticTextItem("path", "Path");
path.setValue(deployment.getDestination().getDeployDir());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 48d9b47..80af8fe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -95,6 +95,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
bundleName.setTitle("Bundle");
bundleName.setValue("#Bundles/Bundle/" + bundle.getId());
bundleName.setLinkTitle(bundle.getName());
+ bundleName.setTarget("_self");
CanvasItem tagItem = new CanvasItem("tag");
tagItem.setShowTitle(false);
@@ -113,6 +114,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
});
}
});
+ tagEditor.setVertical(true);
tagItem.setCanvas(tagEditor);
tagItem.setRowSpan(4);
@@ -123,6 +125,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
destinationGroup.setTitle("Group");
destinationGroup.setValue("#ResourceGroup/" + destination.getGroup().getId());
destinationGroup.setLinkTitle(destination.getGroup().getName());
+ destinationGroup.setTarget("_self");
StaticTextItem path = new StaticTextItem("path", "Path");
path.setValue(destination.getDeployDir());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index d6ebef8..176305b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -43,11 +43,10 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
/**
* @author Greg Hinkle
*/
-public class BundlesListView extends VLayout {
-
- private Table table;
+public class BundlesListView extends Table {
public BundlesListView() {
+ super("Bundles");
setWidth100();
setHeight100();
}
@@ -56,35 +55,33 @@ public class BundlesListView extends VLayout {
protected void onInit() {
super.onInit();
- table = new Table("Bundles");
-
- table.setDataSource(new BundlesWithLatestVersionDataSource());
+ setDataSource(new BundlesWithLatestVersionDataSource());
- table.getListGrid().getField("id").setWidth("60");
- table.getListGrid().getField("name").setWidth("25%");
- table.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ getListGrid().getField("id").setWidth("60");
+ getListGrid().getField("name").setWidth("25%");
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
return "<a href=\"#Bundles/Bundle/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
}
});
- table.getListGrid().getField("description").setWidth("25%");
- table.getListGrid().getField("latestVersion").setWidth("25%");
- table.getListGrid().getField("versionsCount").setWidth("*");
+ getListGrid().getField("description").setWidth("25%");
+ getListGrid().getField("latestVersion").setWidth("25%");
+ getListGrid().getField("versionsCount").setWidth("*");
- table.getListGrid().setSelectionType(SelectionStyle.SIMPLE);
- table.getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX);
+ getListGrid().setSelectionType(SelectionStyle.SIMPLE);
+// getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX);
- table.addTableAction("New", Table.SelectionEnablement.ALWAYS, null, new TableAction() {
+ addTableAction("New", Table.SelectionEnablement.ALWAYS, null, new TableAction() {
public void executeAction(ListGridRecord[] selection) {
new BundleCreateWizard().startBundleWizard();
}
});
- table.addTableAction("Delete", Table.SelectionEnablement.ANY, "Are You Sure?", new TableAction() {
+ addTableAction("Delete", Table.SelectionEnablement.ANY, "Are You Sure?", new TableAction() {
public void executeAction(ListGridRecord[] selections) {
- BundlesWithLatestVersionDataSource ds = (BundlesWithLatestVersionDataSource) table.getDataSource();
+ BundlesWithLatestVersionDataSource ds = (BundlesWithLatestVersionDataSource) getDataSource();
for (ListGridRecord selection : selections) {
BundleGWTServiceAsync bundleManager = GWTServiceLookup.getBundleService();
final BundleWithLatestVersionComposite object = ds.copyValues(selection);
@@ -105,14 +102,14 @@ public class BundlesListView extends VLayout {
// can change this back to SINGLE selection when we feel like it. currently allowing the wizard to
// select the bundle.
- table.addTableAction("Deploy", Table.SelectionEnablement.ALWAYS, null, new TableAction() {
+ addTableAction("Deploy", Table.SelectionEnablement.ALWAYS, null, new TableAction() {
public void executeAction(ListGridRecord[] selection) {
if (selection.length == 0) {
new BundleDeployWizard().startBundleWizard();
return;
}
- BundlesWithLatestVersionDataSource ds = (BundlesWithLatestVersionDataSource) table.getDataSource();
+ BundlesWithLatestVersionDataSource ds = (BundlesWithLatestVersionDataSource) getDataSource();
final BundleWithLatestVersionComposite object = ds.copyValues(selection[0]);
BundleCriteria bc = new BundleCriteria();
bc.addFilterId(object.getBundleId());
@@ -135,16 +132,13 @@ public class BundlesListView extends VLayout {
});
}
});
-
- addMember(table);
-
}
public void setCriteria(Criteria criteria) {
- this.table.getListGrid().fetchData(criteria);
+ this.getListGrid().fetchData(criteria);
}
public int getMatches() {
- return this.table.getListGrid().getTotalRows();
+ return this.getListGrid().getTotalRows();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index 0ce4c53..c678d6f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -125,6 +125,7 @@ public class BundleVersionView extends VLayout implements BookmarkableView {
});
}
});
+ tagEditor.setVertical(true);
tagItem.setCanvas(tagEditor);
tagItem.setRowSpan(4);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 02f2013..6ff4f0c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -55,6 +55,7 @@ public class Table extends VLayout {
private static final SelectionEnablement DEFAULT_SELECTION_ENABLEMENT = SelectionEnablement.ALWAYS;
+ private HLayout titleLayout;
private HTMLFlow title;
private Canvas titleComponent;
@@ -64,6 +65,9 @@ public class Table extends VLayout {
private Label tableInfo;
private String[] excludedFieldNames;
+
+ private boolean showFooter = true;
+
/**
* Specifies how many rows must be selected in order for a {@link TableAction} button to be enabled.
*/
@@ -157,6 +161,7 @@ public class Table extends VLayout {
super.onInit();
+
// NOTE: It is essential that we wait to hide any excluded fields until after super.onDraw() is called, since
// super.onDraw() is what actually adds the fields to the ListGrid (based on what fields are defined in
// the underlying datasource).
@@ -166,7 +171,7 @@ public class Table extends VLayout {
}
}
- HLayout titleLayout = new HLayout();
+ titleLayout = new HLayout();
titleLayout.setAutoHeight();
titleLayout.setAlign(VerticalAlignment.BOTTOM);
titleLayout.addMember(title);
@@ -176,9 +181,6 @@ public class Table extends VLayout {
titleLayout.addMember(titleComponent);
}
- addMember(titleLayout);
- addMember(listGrid);
- addMember(footer);
tableInfo.setWrap(false);
@@ -295,6 +297,28 @@ public class Table extends VLayout {
}
}
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+
+ removeMembers(getMembers());
+
+ addMember(titleLayout);
+ addMember(listGrid);
+ if (showFooter) {
+ addMember(footer);
+ }
+ }
+
+ public boolean isShowFooter() {
+ return showFooter;
+ }
+
+ public void setShowFooter(boolean showFooter) {
+ this.showFooter = showFooter;
+ }
+
private int totalWidth;
private ArrayList<Integer> fieldSizes = new ArrayList<Integer>();
private boolean autoSizing = false;
@@ -362,28 +386,30 @@ public class Table extends VLayout {
private void refreshTableInfo() {
- int count = this.listGrid.getSelection().length;
- for (TableActionInfo tableAction : tableActions) {
- boolean enabled;
- switch (tableAction.enablement) {
- case ALWAYS:
- enabled = true;
- break;
- case ANY:
- enabled = (count >= 1);
- break;
- case SINGLE:
- enabled = (count == 1);
- break;
- case MULTIPLE:
- enabled = (count > 1);
- break;
- default:
- throw new IllegalStateException("Unhandled SelectionEnablement: " + tableAction.enablement.name());
+ if (showFooter) {
+ int count = this.listGrid.getSelection().length;
+ for (TableActionInfo tableAction : tableActions) {
+ boolean enabled;
+ switch (tableAction.enablement) {
+ case ALWAYS:
+ enabled = true;
+ break;
+ case ANY:
+ enabled = (count >= 1);
+ break;
+ case SINGLE:
+ enabled = (count == 1);
+ break;
+ case MULTIPLE:
+ enabled = (count > 1);
+ break;
+ default:
+ throw new IllegalStateException("Unhandled SelectionEnablement: " + tableAction.enablement.name());
+ }
+ tableAction.actionButton.setDisabled(!enabled);
}
- tableAction.actionButton.setDisabled(!enabled);
+ this.tableInfo.setContents("Total: " + listGrid.getTotalRows() + " (" + count + " selected)");
}
- this.tableInfo.setContents("Total: " + listGrid.getTotalRows() + " (" + count + " selected)");
}
// -------------- Inner utility class -------------
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
index dd63fca..6219504 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
@@ -32,13 +32,21 @@ import java.util.Set;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Widget;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.types.TextMatchStyle;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.Dialog;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.events.HoverEvent;
+import com.smartgwt.client.widgets.events.HoverHandler;
+import com.smartgwt.client.widgets.events.MouseOutEvent;
+import com.smartgwt.client.widgets.events.MouseOutHandler;
+import com.smartgwt.client.widgets.events.MouseOverEvent;
+import com.smartgwt.client.widgets.events.MouseOverHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.ComboBoxItem;
import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
@@ -49,6 +57,7 @@ import com.smartgwt.client.widgets.form.fields.events.KeyPressEvent;
import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.Layout;
+import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.criteria.TagCriteria;
@@ -126,122 +135,159 @@ public class TagEditorView extends Layout {
tagLayout.setHeight(18);
//tagLayout.set
- HTMLFlow tagString = new HTMLFlow(tag.toString());
+ HTMLFlow tagString = new HTMLFlow(
+ "<a href=\"#Tag/" + tag.toString() + "\">" +
+ tag.toString() + "</a>");
tagString.setAutoWidth();
+
tagLayout.addMember(tagString);
- if (editing) {
- Img remove = new Img("[skin]/images/actions/remove.png", 16, 16);
+
+ if (!readOnly) {
+ final LayoutSpacer spacer = new LayoutSpacer();
+ spacer.setHeight(16);
+ spacer.setWidth(16);
+
+ final Img remove = new Img("[skin]/images/actions/remove.png", 16, 16);
remove.setTooltip("Click to remove this tag");
remove.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
tags.remove(tag);
save();
-// TagEditorView.this.setup();
}
});
tagLayout.addMember(remove);
+ tagLayout.addMember(spacer);
+ remove.hide();
+
+ tagLayout.addMouseOverHandler(new MouseOverHandler() {
+ public void onMouseOver(MouseOverEvent mouseOverEvent) {
+ remove.show();
+ spacer.hide();
+ }
+ });
+ tagLayout.addMouseOutHandler(new MouseOutHandler() {
+ public void onMouseOut(MouseOutEvent mouseOutEvent) {
+ spacer.show();
+ remove.hide();
+ }
+ });
+
}
- tagLayout.setHeight(32);
+ tagLayout.setHeight(16);
layout.addMember(tagLayout);
-//
-// Canvas spacer = new Canvas();
-// spacer.setWidth(8);
-// layout.addMember(spacer);
+
+ }
+
+
+ if (!readOnly) {
+ final Img modeImg = new Img("[skin]/images/actions/add.png", 16, 16);
+
+ modeImg.setTooltip("Click to edit tags");
+ modeImg.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+
+ showTagInput(modeImg.getAbsoluteLeft(), modeImg.getAbsoluteTop());
+ }
+ });
+ layout.addMember(modeImg);
}
- HLayout editLayout = new HLayout();
- editLayout.setHeight(32);
- if (editing) {
- form = new DynamicForm();
- final ComboBoxItem tagInput = new ComboBoxItem("tag");
- tagInput.setShowTitle(false);
- tagInput.setHideEmptyPickList(true);
+ layout.setAutoWidth();
+ addMember(layout);
+
+ markForRedraw();
+ }
+
+
+ private void showTagInput(int left, int top) {
+ form = new DynamicForm();
+ final Dialog dialog = new Dialog();
+
+ final ComboBoxItem tagInput = new ComboBoxItem("tag");
+ tagInput.setShowTitle(false);
+ tagInput.setHideEmptyPickList(true);
// tagInput.setOptionDataSource(new TaggingDataSource());
- TagCriteria criteria = new TagCriteria();
- criteria.addSortNamespace(PageOrdering.ASC);
- criteria.addSortSemantic(PageOrdering.ASC);
- criteria.addSortName(PageOrdering.ASC);
- GWTServiceLookup.getTagService().findTagsByCriteria(criteria,
- new AsyncCallback<PageList<Tag>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load tags", caught);
- }
+ TagCriteria criteria = new TagCriteria();
+ criteria.addSortNamespace(PageOrdering.ASC);
+ criteria.addSortSemantic(PageOrdering.ASC);
+ criteria.addSortName(PageOrdering.ASC);
+ GWTServiceLookup.getTagService().findTagsByCriteria(criteria,
+ new AsyncCallback<PageList<Tag>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to load tags", caught);
+ }
- public void onSuccess(PageList<Tag> result) {
- String[] values = new String[result.size()];
- int i = 0;
- for (Tag tag : result) {
- values[i++] = tag.toString();
- }
- tagInput.setValueMap(values);
+ public void onSuccess(PageList<Tag> result) {
+ String[] values = new String[result.size()];
+ int i = 0;
+ for (Tag tag : result) {
+ values[i++] = tag.toString();
}
- });
+ tagInput.setValueMap(values);
+ }
+ });
- tagInput.setValueField("tag");
- tagInput.setDisplayField("tag");
- tagInput.setType("comboBox");
- tagInput.setTextMatchStyle(TextMatchStyle.SUBSTRING);
- tagInput.setTooltip("Enter a tag in the format \"(namespace:)(semantic=)tagname\" (e.g. it:env=QA, or owner=John)");
- /*tagInput.addBlurHandler(new BlurHandler() {
- public void onBlur(BlurEvent blurEvent) {
+ tagInput.setValueField("tag");
+ tagInput.setDisplayField("tag");
+ tagInput.setType("comboBox");
+ tagInput.setTextMatchStyle(TextMatchStyle.SUBSTRING);
+ tagInput.setTooltip("Enter a tag in the format \"(namespace:)(semantic=)tagname\" (e.g. it:env=QA, or owner=John)");
+ /*tagInput.addBlurHandler(new BlurHandler() {
+ public void onBlur(BlurEvent blurEvent) {
+ String tag = form.getValueAsString("tag");
+ if (tag != null) {
+ Tag newTag = new Tag(tag);
+ tags.add(newTag);
+ save();
+// TagEditorView.this.setup();
+ }
+ }
+ });*/
+ tagInput.addKeyPressHandler(new KeyPressHandler() {
+ public void onKeyPress(KeyPressEvent event) {
+ if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
String tag = form.getValueAsString("tag");
if (tag != null) {
Tag newTag = new Tag(tag);
tags.add(newTag);
save();
-// TagEditorView.this.setup();
- }
- }
- });*/
- tagInput.addKeyPressHandler(new KeyPressHandler() {
- public void onKeyPress(KeyPressEvent event) {
- if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
- String tag = form.getValueAsString("tag");
- if (tag != null) {
- Tag newTag = new Tag(tag);
- tags.add(newTag);
- save();
+ dialog.destroy();
// TagEditorView.this.setup();
- }
}
}
- });
-
- form.setFields(tagInput);
+ }
+ });
- editLayout.addMember(form);
- }
+ form.setFields(tagInput);
+ dialog.setIsModal(true);
+ dialog.setShowHeader(false);
+ dialog.setShowEdges(false);
+ dialog.setEdgeSize(10);
+ dialog.setWidth(200);
+ dialog.setHeight(30);
- if (!readOnly) {
- Img modeImg = new Img("[skin]/images/actions/" + (editing ? "approve" : "edit") + ".png", 16, 16);
- modeImg.setTooltip(editing ? "Click to save edits" : "Click to edit tags");
- modeImg.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent clickEvent) {
-
- if (editing) {
- save();
- }
- editing = !editing;
- TagEditorView.this.setup();
- }
- });
- editLayout.addMember(modeImg);
- }
+ dialog.setShowToolbar(false);
+ Map bodyDefaults = new HashMap();
+ bodyDefaults.put("layoutLeftMargin", 5);
+ bodyDefaults.put("membersMargin", 10);
+ dialog.setBodyDefaults(bodyDefaults);
- layout.addMember(editLayout);
+ dialog.addItem(form);
+ dialog.setDismissOnEscape(true);
+ dialog.setDismissOnOutsideClick(true);
- layout.setAutoWidth();
- addMember(layout);
+ dialog.show();
+ dialog.moveTo(left - 8, top - 4);
+ tagInput.focusInItem();
- markForRedraw();
}
private void save() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 8d8f371..61cd57f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import com.google.gwt.event.dom.client.KeyCodes;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.types.SelectionAppearance;
@@ -41,11 +42,9 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
/**
* @author Greg Hinkle
*/
-public class ResourceSearchView extends VLayout {
+public class ResourceSearchView extends Table {
private static final String DEFAULT_TITLE = "Resources";
- private Table table;
-
private ArrayList<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>();
/**
@@ -55,6 +54,10 @@ public class ResourceSearchView extends VLayout {
this(null);
}
+ public ResourceSearchView(String title, String[] excludeFields) {
+ this(null, title, null, excludeFields);
+ }
+
/**
* A Resource list filtered by a given criteria.
*/
@@ -62,10 +65,15 @@ public class ResourceSearchView extends VLayout {
this(criteria, DEFAULT_TITLE);
}
+ public ResourceSearchView(Criteria criteria, String title) {
+ this(criteria, title, null, null);
+ }
+
/**
* A Resource list filtered by a given criteria with the given title.
*/
- public ResourceSearchView(Criteria criteria, String title) {
+ public ResourceSearchView(Criteria criteria, String title, SortSpecifier[] sortSpecifier, String[] excludeFields) {
+ super(title, criteria, sortSpecifier, excludeFields);
setWidth100();
setHeight100();
@@ -78,13 +86,12 @@ public class ResourceSearchView extends VLayout {
final ResourceDatasource datasource = new ResourceDatasource();
- table = new Table(title, criteria);
- table.setTitleComponent(searchPanel);
- table.setDataSource(datasource);
+ setTitleComponent(searchPanel);
+ setDataSource(datasource);
- table.getListGrid().setSelectionType(SelectionStyle.SIMPLE);
- table.getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX);
- table.getListGrid().setResizeFieldsInRealTime(true);
+ getListGrid().setSelectionType(SelectionStyle.SIMPLE);
+// getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX);
+ getListGrid().setResizeFieldsInRealTime(true);
ListGridField idField = new ListGridField("id", "Id", 55);
idField.setType(ListGridFieldType.INTEGER);
@@ -102,24 +109,23 @@ public class ResourceSearchView extends VLayout {
ListGridField availabilityField = new ListGridField("currentAvailability", "Availability", 55);
availabilityField.setAlign(Alignment.CENTER);
- table.getListGrid().setFields(idField, nameField, descriptionField, typeNameField, pluginNameField,
- categoryField, availabilityField);
+ getListGrid().setFields(idField, nameField, descriptionField, typeNameField, pluginNameField,
+ categoryField, availabilityField);
- table.addTableAction("Uninventory", Table.SelectionEnablement.ANY,
- "Are you sure you want to delete # resources?", new TableAction() {
- public void executeAction(ListGridRecord[] selection) {
- table.getListGrid().removeSelectedData();
- }
- });
+ addTableAction("Uninventory", Table.SelectionEnablement.ANY,
+ "Are you sure you want to delete # resources?", new TableAction() {
+ public void executeAction(ListGridRecord[] selection) {
+ getListGrid().removeSelectedData();
+ }
+ });
- addMember(table);
searchBox.addKeyPressHandler(new KeyPressHandler() {
public void onKeyPress(KeyPressEvent event) {
if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
datasource.setQuery((String) searchBox.getValue());
- Criteria c = table.getListGrid().getCriteria();
+ Criteria c = getListGrid().getCriteria();
if (c == null) {
c = new Criteria();
}
@@ -127,7 +133,7 @@ public class ResourceSearchView extends VLayout {
c.addCriteria("name", (String) searchBox.getValue());
long start = System.currentTimeMillis();
- table.getListGrid().fetchData(c);
+ getListGrid().fetchData(c);
System.out.println("Loaded in: " + (System.currentTimeMillis() - start));
}
}
@@ -136,13 +142,8 @@ public class ResourceSearchView extends VLayout {
- public void setCriteria(Criteria criteria) {
- this.table.getListGrid().fetchData(criteria);
- }
-
-
public int getMatches() {
- return this.table.getListGrid().getTotalRows();
+ return this.getListGrid().getTotalRows();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index ec2c2c4..996c199 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -24,9 +24,12 @@ package org.rhq.enterprise.gui.coregui.client.report.tag;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.layout.SectionStack;
import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.tile.TileGrid;
+import com.smartgwt.client.widgets.tile.TileLayout;
import org.rhq.core.domain.criteria.TagCriteria;
import org.rhq.core.domain.tagging.Tag;
@@ -67,15 +70,24 @@ public class TaggedView extends VLayout implements BookmarkableView {
TagCloudView tagCloudView = new TagCloudView();
tagCloudView.setAutoHeight();
addMember(tagCloudView);
-
- sectionStack = new SectionStack();
- sectionStack.setHeight("*");
-
- sectionStack.addSection(getResourceStack());
-
- sectionStack.addSection(getBundleStack());
-
- addMember(sectionStack);
+//
+// sectionStack = new SectionStack();
+// sectionStack.setHeight("*");
+//
+// sectionStack.addSection(getResourceStack());
+//
+// sectionStack.addSection(getBundleStack());
+//
+// addMember(sectionStack);
+
+ TileLayout tileLayout = new TileLayout();
+ tileLayout.setWidth100();
+ tileLayout.setTileHeight(250);
+ tileLayout.setTileWidth(getWidth()/2 - 20);
+ addMember(tileLayout);
+
+ tileLayout.addTile(getResourceCanvas());
+ tileLayout.addTile(getBundleCanvas());
}
@@ -90,11 +102,11 @@ public class TaggedView extends VLayout implements BookmarkableView {
criteria.addCriteria("tagName", tag.getName());
- resourceView.setCriteria(criteria);
- bundlesView.setCriteria(criteria);
+ resourceView.refresh(criteria);
+ bundlesView.refresh(criteria);
- TagCriteria criteria = new TagCriteria();
+/* TagCriteria criteria = new TagCriteria();
criteria.addFilterNamespace(tag.getNamespace());
criteria.addFilterSemantic(tag.getSemantic());
criteria.addFilterName(tag.getName());
@@ -109,26 +121,19 @@ public class TaggedView extends VLayout implements BookmarkableView {
sectionStack.setSectionTitle(0, "Resources: " + tagReport.getResourceCount());
sectionStack.setSectionTitle(1, "Bundles: " + tagReport.getBundleCount());
}
- });
+ });*/
}
- private SectionStackSection getResourceStack() {
- resourceSection = new SectionStackSection();
- resourceSection.setTitle("Resources");
-
-
- resourceView = new ResourceSearchView();
- resourceSection.addItem(resourceView);
- return resourceSection;
+ private Canvas getResourceCanvas() {
+ resourceView = new ResourceSearchView("Tagged Resources", new String[]{"pluginName","category","currentAvailability"});
+ resourceView.setShowFooter(false);
+ return resourceView;
}
- private SectionStackSection getBundleStack() {
- bundleSection = new SectionStackSection();
- bundleSection.setTitle("Bundles");
-
+ private Canvas getBundleCanvas() {
bundlesView = new BundlesListView();
- bundleSection.addItem(bundlesView);
- return bundleSection;
+ bundlesView.setShowFooter(false);
+ return bundlesView;
}
public void renderView(ViewPath viewPath) {
commit af4d7854fc2408c76f31d610791e016240fb9409
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Mon May 24 13:28:57 2010 -0400
Relogin when the session has timed out
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 992b0c6..b914a4b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -152,40 +152,43 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
private void buildCoreUI() {
- this.rootCanvas = new RootCanvas();
- rootCanvas.setOverflow(Overflow.HIDDEN);
-
- // HTMLPane menuPane = new HTMLPane();
- // menuPane.setWidth100();
- // menuPane.setHeight(26);
- // menuPane.setContentsType(ContentsType.PAGE);
- // menuPane.setContentsURL("/rhq/common/menu/menu.xhtml");
- // menuPane.setZIndex(400000);
- // layout.addMember(menuPane);
-
- MenuBarView menuBarView = new MenuBarView();
- menuBarView.setWidth("100%");
- // WidgetCanvas menuCanvas = new WidgetCanvas(menuBarView);
- // menuCanvas.setTop(0);
- // menuCanvas.setWidth100();
- // menuCanvas.draw();
- rootCanvas.addMember(menuBarView);
-
- breadCrumbTrailPane = new BreadcrumbTrailPane();
- rootCanvas.addMember(breadCrumbTrailPane);
-
- DOM.setInnerHTML(RootPanel.get("Loading-Panel").getElement(), "");
-
- Canvas canvas = new Canvas(CONTENT_CANVAS_ID);
- canvas.setWidth100();
- canvas.setHeight100();
- rootCanvas.addMember(canvas);
-
- rootCanvas.addMember(new Footer());
-
- rootCanvas.draw();
-
- History.addValueChangeHandler(this);
+ // If the core gui is already built (eg. from previous login, just refire event)
+ if (this.rootCanvas == null) {
+ this.rootCanvas = new RootCanvas();
+ rootCanvas.setOverflow(Overflow.HIDDEN);
+
+ // HTMLPane menuPane = new HTMLPane();
+ // menuPane.setWidth100();
+ // menuPane.setHeight(26);
+ // menuPane.setContentsType(ContentsType.PAGE);
+ // menuPane.setContentsURL("/rhq/common/menu/menu.xhtml");
+ // menuPane.setZIndex(400000);
+ // layout.addMember(menuPane);
+
+ MenuBarView menuBarView = new MenuBarView();
+ menuBarView.setWidth("100%");
+ // WidgetCanvas menuCanvas = new WidgetCanvas(menuBarView);
+ // menuCanvas.setTop(0);
+ // menuCanvas.setWidth100();
+ // menuCanvas.draw();
+ rootCanvas.addMember(menuBarView);
+
+ breadCrumbTrailPane = new BreadcrumbTrailPane();
+ rootCanvas.addMember(breadCrumbTrailPane);
+
+ DOM.setInnerHTML(RootPanel.get("Loading-Panel").getElement(), "");
+
+ Canvas canvas = new Canvas(CONTENT_CANVAS_ID);
+ canvas.setWidth100();
+ canvas.setHeight100();
+ rootCanvas.addMember(canvas);
+
+ rootCanvas.addMember(new Footer());
+
+ rootCanvas.draw();
+
+ History.addValueChangeHandler(this);
+ }
History.fireCurrentHistoryState();
}
@@ -217,8 +220,8 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
canvas = new DashboardsView();
} else if (breadcrumbName.equals("Bundles")) {
canvas = new BundleTopView();
- /*} else if (breadcrumbName.equals("LogOut")) {
- // canvas = new LoginView();*/
+ /*} else if (breadcrumbName.equals("LogOut")) {
+// canvas = new LoginView();*/
} else if (breadcrumbName.equals("Tag")) {
canvas = new TaggedView();
} else {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 6136c85..39f9066 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -24,6 +24,7 @@ package org.rhq.enterprise.gui.coregui.client;
import java.util.HashMap;
+import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
@@ -47,6 +48,8 @@ import com.smartgwt.client.widgets.form.fields.SubmitItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
+import com.smartgwt.client.widgets.form.fields.events.KeyPressEvent;
+import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.auth.Subject;
@@ -67,6 +70,7 @@ public class LoginView {
form.setMargin(10);
form.setShowInlineErrors(false);
+
CanvasItem logo = new CanvasItem();
logo.setCanvas(new Img("header/rhq_logo_28px.png",80,28));
logo.setShowTitle(false);
@@ -77,13 +81,23 @@ public class LoginView {
TextItem user = new TextItem("user", "User");
user.setRequired(true);
+ user.setAttribute("canAutocomplete", true);
+ user.setAttribute("autoComplete", true);
PasswordItem password = new PasswordItem("password", "Password");
password.setRequired(true);
+ password.setAttribute("autocomplete", true);
final SubmitItem login = new SubmitItem("login", "Login");
login.setAlign(Alignment.CENTER);
login.setColSpan(2);
+ password.addKeyPressHandler(new KeyPressHandler() {
+ public void onKeyPress(KeyPressEvent event) {
+ if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
+ form.submit();
+ }
+ }
+ });
form.setFields(logo, header, user, password, login);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java
index f095e83..4456c1c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java
@@ -23,6 +23,8 @@ import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.rpc.impl.RequestCallbackAdapter;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+
/**
* @author Greg Hinkle
*/
@@ -32,6 +34,8 @@ public class MonitoringRequestCallback implements RequestCallback {
private String name;
private long start = System.currentTimeMillis();
+ private static final int STATUS_CODE_OK = 200;
+
private RequestCallback callback;
public MonitoringRequestCallback(String name, RequestCallback callback) {
@@ -51,8 +55,16 @@ public class MonitoringRequestCallback implements RequestCallback {
}
public void onResponseReceived(Request request, Response response) {
- RPCManager.getInstance().succeedCall(this);
- callback.onResponseReceived(request, response);
+ if (STATUS_CODE_OK == response.getStatusCode()) {
+
+ RPCManager.getInstance().succeedCall(this);
+ callback.onResponseReceived(request, response);
+ } else {
+ RPCManager.getInstance().failCall(this);
+ callback.onResponseReceived(request, response);
+
+ CoreGUI.checkLoginStatus();
+ }
}
1
0
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java | 360 ---------
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java | 23
modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java | 355 ---------
modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java | 104 --
modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 390 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java | 360 +++++++++
modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java | 355 +++++++++
modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java | 104 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java | 18
modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 390 ++++++++++
10 files changed, 1242 insertions(+), 1217 deletions(-)
New commits:
commit 6a31c12f691c2e41ec833e0ef667851b38e6a12a
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon May 24 13:44:22 2010 -0400
Removing scratch work that was accidentally committed
diff --git a/modules/core/domain/mvn.out b/modules/core/domain/mvn.out
deleted file mode 100644
index 492a5b3..0000000
--- a/modules/core/domain/mvn.out
+++ /dev/null
@@ -1,1714 +0,0 @@
-[INFO] Scanning for projects...
-[INFO] snapshot org.rhq:rhq-parent:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
-[INFO] ------------------------------------------------------------------------
-[INFO] Building RHQ Domain Model
-[INFO] task-segment: [clean, gwt:compile]
-[INFO] ------------------------------------------------------------------------
-[INFO] [clean:clean {execution: default-clean}]
-[INFO] Deleting /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target
-[INFO] snapshot org.rhq:rhq-core-util:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
-[INFO] [gwt:compile {execution: default-cli}]
-[INFO] using GWT jars from project dependencies : 2.0.0
-[WARNING] You should not declare gwt-dev as a project dependency. This may introduce complex dependency conflicts
-[INFO] auto discovered modules [org.rhq.core.RHQDomain]
-[INFO] establishing classpath list (scope = compile)
-[INFO] using GWT jars for specified version 2.0.0
-[INFO] using GWT jars for specified version 2.0.0
-[INFO] Compiling module org.rhq.core.RHQDomain
-[INFO] Validating newly compiled units
-[INFO] [ERROR] Errors in 'file:/Users/john/Development/redhat/imanage/rhq/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java'
-[INFO] [ERROR] Line 23: The import org.rhq.core.server.MeasurementConverter cannot be resolved
-[INFO] [ERROR] Line 165: MeasurementConverter cannot be resolved
-[INFO] [ERROR] Line 166: MeasurementConverter cannot be resolved
-[INFO] [ERROR] Line 174: MeasurementConverter cannot be resolved
-[INFO] Resolving org.rhq.core.domain.operation.GroupOperationScheduleEntity
-[INFO] Found type 'org.rhq.core.domain.operation.GroupOperationScheduleEntity'
-[INFO] Found type 'org.rhq.core.domain.operation.OperationScheduleEntity'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.operation.ScheduleJobId
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.operation.ScheduleJobId
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.content.RepoPackageVersion
-[INFO] Found type 'org.rhq.core.domain.content.RepoPackageVersion'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoPackageVersionPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoPackageVersionPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple'
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinition'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.criteria.RoleCriteria
-[INFO] Found type 'org.rhq.core.domain.criteria.RoleCriteria'
-[INFO] Found type 'org.rhq.core.domain.authz.Role'
-[INFO] Found type 'org.rhq.core.domain.resource.group.ResourceGroup'
-[INFO] Found type 'org.rhq.core.domain.resource.Resource'
-[INFO] Found type 'org.rhq.core.domain.content.ResourceRepo'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ResourceRepoPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ResourceRepoPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.Repo'
-[INFO] Found type 'org.rhq.core.domain.content.RepoContentSource'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoContentSourcePK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoContentSourcePK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoDistribution'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoDistributionPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoDistributionPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoAdvisory'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoAdvisoryPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoAdvisoryPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.PackageVersion'
-[INFO] Found type 'org.rhq.core.domain.content.ProductVersionPackageVersion'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ProductVersionPackageVersionPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ProductVersionPackageVersionPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoRepoGroup'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoGroupPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoGroupPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.content.RepoRepoRelationship'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoRelationshipPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoRelationshipPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.content.PackageVersionContentSource
-[INFO] Found type 'org.rhq.core.domain.content.PackageVersionContentSource'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.PackageVersionContentSourcePK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.PackageVersionContentSourcePK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.PropertyMap
-[INFO] Found type 'org.rhq.core.domain.configuration.PropertyMap'
-[INFO] Found type 'org.rhq.core.domain.configuration.Property'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.configuration.Configuration
-[INFO] Found type 'org.rhq.core.domain.configuration.Configuration'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Found type 'org.rhq.core.domain.configuration.PropertyList'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.Property
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.Property
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
-[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
-[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.ConfigurationDefinition.GroupComparator
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.ConfigurationDefinition'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.bundle.BundleVersionRepo
-[INFO] Found type 'org.rhq.core.domain.bundle.BundleVersionRepo'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.bundle.BundleVersionRepoPK
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.bundle.BundleVersionRepoPK
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionMap'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Resolving org.rhq.core.domain.resource.ResourceType
-[INFO] Found type 'org.rhq.core.domain.resource.ResourceType'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.resource.ResourceType
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.resource.ResourceType
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionList'
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
-[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
-[INFO] at java.security.AccessController.doPrivileged(Native Method)
-[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
-[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
-[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
-[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
-[INFO] at java.lang.Class.forName0(Native Method)
-[INFO] at java.lang.Class.forName(Class.java:247)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
-[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
-[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
-[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
-[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
-[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
-[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
-[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
-[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
-[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
-[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
-[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
-[INFO] Compiling 4 permutations
-[INFO] Compiling permutation 0...
-[INFO] Compiling permutation 2...
-[INFO] Compiling permutation 3...
-[INFO] Process output
-[INFO] Compiling permutation 1...
-[INFO] Compile of permutations succeeded
-[INFO] Linking into /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/rhq-core-domain-ejb3/org.rhq.core.RHQDomain. Writing extras to /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/extra/org.rhq.core.RHQDomain
-[INFO] Link succeeded
-[INFO] Compilation succeeded -- 36.634s
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 1 minute 12 seconds
-[INFO] Finished at: Mon May 24 10:12:35 EDT 2010
-[INFO] Final Memory: 32M/527M
-[INFO] ------------------------------------------------------------------------
commit 797f13a4df3a2c1798649557c9911682e3e0b9b8
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon May 24 13:39:22 2010 -0400
[BZ 586068] Moving formatting code out of core/domain to avoid problems with gwt
There are some classes and packages such as java.text that cannot be used in GWT code. One
of my previous commits refactored MeasurementOOBComposite to use MeasurementConverter which
has a dependency on java.text. I removed the formatting calls from MeausrementOOBComposite and
moved formmatting classes into server/jar. The formatting is now done in the SLSB method from
which the MeasurementOOBComposites are returned. The GWT-based formatter,
MeasurementConverterClient has been moved to coregui.
diff --git a/modules/core/domain/mvn.out b/modules/core/domain/mvn.out
new file mode 100644
index 0000000..492a5b3
--- /dev/null
+++ b/modules/core/domain/mvn.out
@@ -0,0 +1,1714 @@
+[INFO] Scanning for projects...
+[INFO] snapshot org.rhq:rhq-parent:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
+[INFO] ------------------------------------------------------------------------
+[INFO] Building RHQ Domain Model
+[INFO] task-segment: [clean, gwt:compile]
+[INFO] ------------------------------------------------------------------------
+[INFO] [clean:clean {execution: default-clean}]
+[INFO] Deleting /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target
+[INFO] snapshot org.rhq:rhq-core-util:3.0.0-SNAPSHOT: checking for updates from jboss-snapshots
+[INFO] [gwt:compile {execution: default-cli}]
+[INFO] using GWT jars from project dependencies : 2.0.0
+[WARNING] You should not declare gwt-dev as a project dependency. This may introduce complex dependency conflicts
+[INFO] auto discovered modules [org.rhq.core.RHQDomain]
+[INFO] establishing classpath list (scope = compile)
+[INFO] using GWT jars for specified version 2.0.0
+[INFO] using GWT jars for specified version 2.0.0
+[INFO] Compiling module org.rhq.core.RHQDomain
+[INFO] Validating newly compiled units
+[INFO] [ERROR] Errors in 'file:/Users/john/Development/redhat/imanage/rhq/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java'
+[INFO] [ERROR] Line 23: The import org.rhq.core.server.MeasurementConverter cannot be resolved
+[INFO] [ERROR] Line 165: MeasurementConverter cannot be resolved
+[INFO] [ERROR] Line 166: MeasurementConverter cannot be resolved
+[INFO] [ERROR] Line 174: MeasurementConverter cannot be resolved
+[INFO] Resolving org.rhq.core.domain.operation.GroupOperationScheduleEntity
+[INFO] Found type 'org.rhq.core.domain.operation.GroupOperationScheduleEntity'
+[INFO] Found type 'org.rhq.core.domain.operation.OperationScheduleEntity'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.operation.ScheduleJobId
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.operation.ScheduleJobId
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.content.RepoPackageVersion
+[INFO] Found type 'org.rhq.core.domain.content.RepoPackageVersion'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoPackageVersionPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoPackageVersionPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple'
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinition'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.criteria.RoleCriteria
+[INFO] Found type 'org.rhq.core.domain.criteria.RoleCriteria'
+[INFO] Found type 'org.rhq.core.domain.authz.Role'
+[INFO] Found type 'org.rhq.core.domain.resource.group.ResourceGroup'
+[INFO] Found type 'org.rhq.core.domain.resource.Resource'
+[INFO] Found type 'org.rhq.core.domain.content.ResourceRepo'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ResourceRepoPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ResourceRepoPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.Repo'
+[INFO] Found type 'org.rhq.core.domain.content.RepoContentSource'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoContentSourcePK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoContentSourcePK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoDistribution'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoDistributionPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoDistributionPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoAdvisory'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoAdvisoryPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoAdvisoryPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.PackageVersion'
+[INFO] Found type 'org.rhq.core.domain.content.ProductVersionPackageVersion'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.ProductVersionPackageVersionPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.ProductVersionPackageVersionPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoRepoGroup'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoGroupPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoGroupPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.content.RepoRepoRelationship'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.RepoRepoRelationshipPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.RepoRepoRelationshipPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:100)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.content.PackageVersionContentSource
+[INFO] Found type 'org.rhq.core.domain.content.PackageVersionContentSource'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.content.PackageVersionContentSourcePK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.content.PackageVersionContentSourcePK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.PropertyMap
+[INFO] Found type 'org.rhq.core.domain.configuration.PropertyMap'
+[INFO] Found type 'org.rhq.core.domain.configuration.Property'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:741)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.configuration.Configuration
+[INFO] Found type 'org.rhq.core.domain.configuration.Configuration'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertySimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertySimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.PropertyMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.PropertyMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:909)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Found type 'org.rhq.core.domain.configuration.PropertyList'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.Property
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.Property
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.access$200(TypeOracleMediator.java:78)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator$1.resolveClass(TypeOracleMediator.java:279)
+[INFO] at com.google.gwt.dev.javac.asm.ResolveTypeSignature.visitClassType(ResolveTypeSignature.java:140)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:184)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.parseType(SignatureReader.java:219)
+[INFO] at com.google.gwt.dev.asm.signature.SignatureReader.accept(SignatureReader.java:102)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveMethod(TypeOracleMediator.java:972)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:767)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.ConfigurationDefinition.GroupComparator
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.ConfigurationDefinition'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:792)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:698)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.bundle.BundleVersionRepo
+[INFO] Found type 'org.rhq.core.domain.bundle.BundleVersionRepo'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.bundle.BundleVersionRepoPK
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.bundle.BundleVersionRepoPK
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionMap'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Resolving org.rhq.core.domain.resource.ResourceType
+[INFO] Found type 'org.rhq.core.domain.resource.ResourceType'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.resource.ResourceType
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.resource.ResourceType
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:649)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [WARN] Ignoring unresolvable annotation type org.rhq.core.domain.util.Summary
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.util.Summary
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.getAnnotationClass(TypeOracleMediator.java:481)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:563)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveField(TypeOracleMediator.java:868)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:777)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] Resolving org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] Found type 'org.rhq.core.domain.configuration.definition.PropertyDefinitionList'
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionList
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] [ERROR] Annotation error: cannot resolve org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] java.lang.ClassNotFoundException: org.rhq.core.domain.configuration.definition.PropertyDefinitionMap
+[INFO] at java.net.URLClassLoader$1.run(URLClassLoader.java:200)
+[INFO] at java.security.AccessController.doPrivileged(Native Method)
+[INFO] at java.net.URLClassLoader.findClass(URLClassLoader.java:188)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:315)
+[INFO] at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:330)
+[INFO] at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
+[INFO] at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:398)
+[INFO] at java.lang.Class.forName0(Native Method)
+[INFO] at java.lang.Class.forName(Class.java:247)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:666)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotationValue(TypeOracleMediator.java:605)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.createAnnotation(TypeOracleMediator.java:399)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotation(TypeOracleMediator.java:568)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveAnnotations(TypeOracleMediator.java:583)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.resolveClass(TypeOracleMediator.java:724)
+[INFO] at com.google.gwt.dev.javac.TypeOracleMediator.addNewUnits(TypeOracleMediator.java:353)
+[INFO] at com.google.gwt.dev.javac.CompilationState.assimilateUnits(CompilationState.java:135)
+[INFO] at com.google.gwt.dev.javac.CompilationState.<init>(CompilationState.java:79)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.doBuildFrom(CompilationStateBuilder.java:284)
+[INFO] at com.google.gwt.dev.javac.CompilationStateBuilder.buildFrom(CompilationStateBuilder.java:181)
+[INFO] at com.google.gwt.dev.cfg.ModuleDef.getCompilationState(ModuleDef.java:280)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:502)
+[INFO] at com.google.gwt.dev.Precompile.precompile(Precompile.java:414)
+[INFO] at com.google.gwt.dev.Compiler.run(Compiler.java:201)
+[INFO] at com.google.gwt.dev.Compiler$1.run(Compiler.java:152)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.doRun(CompileTaskRunner.java:87)
+[INFO] at com.google.gwt.dev.CompileTaskRunner.runWithAppropriateLogger(CompileTaskRunner.java:81)
+[INFO] at com.google.gwt.dev.Compiler.main(Compiler.java:159)
+[INFO] [ERROR] Annotation error: expected class java.lang.Class, got null
+[INFO] Compiling 4 permutations
+[INFO] Compiling permutation 0...
+[INFO] Compiling permutation 2...
+[INFO] Compiling permutation 3...
+[INFO] Process output
+[INFO] Compiling permutation 1...
+[INFO] Compile of permutations succeeded
+[INFO] Linking into /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/rhq-core-domain-ejb3/org.rhq.core.RHQDomain. Writing extras to /Users/john/Development/redhat/imanage/rhq/modules/core/domain/target/extra/org.rhq.core.RHQDomain
+[INFO] Link succeeded
+[INFO] Compilation succeeded -- 36.634s
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 1 minute 12 seconds
+[INFO] Finished at: Mon May 24 10:12:35 EDT 2010
+[INFO] Final Memory: 32M/527M
+[INFO] ------------------------------------------------------------------------
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
deleted file mode 100644
index f78b62c..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
+++ /dev/null
@@ -1,360 +0,0 @@
- /*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
- package org.rhq.core.domain.measurement;
-
- import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
- import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
- import com.google.gwt.i18n.client.NumberFormat;
-
- import java.util.HashSet;
- import java.util.Set;
-
- public class MeasurementConverterClient {
- private static final int MAX_PRECISION_DIGITS = 4;
- private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
-
-
- private static NumberFormat getDefaultNumberFormat() {
- NumberFormat nf = NumberFormat.getFormat("0.0");
-
- return nf;
- }
-
- public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- MeasurementUnits originUnits = origin.getUnits();
- Double originValue = origin.getValue();
-
- return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
- }
-
- public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
- boolean wasNegative = false;
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementUnits baseUnit = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
-
- Double results = scale(valueAndUnits, targetUnits);
- if (wasNegative) {
- results = -results;
- }
-
- return results;
- }
-
- public static String format(String value, MeasurementUnits targetUnits) {
- if (targetUnits == null) {
- return value;
- } else {
- return value + targetUnits;
- }
- }
-
- /**
- * Formats the given array of double values: determines the necessary precision such that when formatted, they are
- * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
- * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
- * bounded for presentation considerations.
- *
- * @param values the values to be formatted
- * @param targetUnits the target units for the values
- * @param bestFit whether or not to use a normalized scale for the family of units
- *
- * @return the formatted values
- */
- public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
- if ((null == values) || (values.length == 0)) {
- return null;
- }
-
- MeasurementUnits originalUnits = targetUnits;
-
- /*
- * in the overwhelming majority of cases, you're going to want to apply a bestFit
- * to the passed data, but it's not required; it's perfectly possible to allow a
- * list of doubles to be formatted without being fit, in which case the targetUnits
- * will be part of the formatted display for each result element
- */
- if (bestFit) {
- // find bestFit units by taking the average
- Double average = 0.0;
-
- for (int i = 0, sz = values.length; i < sz; i++) {
- /*
- * adding fractional amount iterative leads to greater
- * error, but prevents overflow on large data sets
- */
- average += (values[i] / sz);
- }
-
- MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
- //noinspection UnnecessaryLocalVariable
- MeasurementUnits fittedUnits = fittedAverage.getUnits();
-
- /*
- * and change the local reference to targetUnits, so that the same logic
- * can be used both for the bestFit and non-bestFit computations
- */
- targetUnits = fittedUnits;
- }
-
- @SuppressWarnings("unused")
- Set<String> existingStrings; // technically this *is* unused because
- int precisionDigits = 0;
- boolean scaleWithMorePrecision = true;
- String[] results = new String[values.length];
- NumberFormat nf = getDefaultNumberFormat();
-
- /*
- * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
- *
- * increase the maxPrecisionDigits in the while condition
- * itself to ensure it gets done for every loop
- */
- while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
- /*
- * make the assumption that we no longer need to scale beyond this iteration
- */
- scaleWithMorePrecision = false;
-
- /*
- * we need to record the uniquely formatted values so we can determine
- */
- existingStrings = new HashSet<String>();
- nf = NumberFormat.getFormat(getFormat(0, precisionDigits));
-
- Double[] scaledValues = new Double[values.length];
-
- for (int i = 0; i < scaledValues.length; i++) {
- /*
- * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
- * Otherwise, apply standard multi-unit scaling.
- */
- if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
- scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
- } else {
- scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
- }
- }
-
- for (int i = 0; i < results.length; i++) {
- /*
- * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
- * we do this to see how many units we'll have to scale to afterwards (outside this
- * while loop) to make the array of values passed to us unique
- */
- String formatted = nf.format(scaledValues[i]);
-
- /*
- * check whether formatted value was in the set or not; if it was, we have to
- * loop, but only if we're not not already at our maximum precision
- */
- boolean wasNewElement = existingStrings.add(formatted);
-
- if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
- scaleWithMorePrecision = true;
- break;
- }
-
- results[i] = formatted;
- }
- }
-
- /*
- * we did the best we could in terms of trying to find a precision that adds the most
- * uniqueness to the given set of values, NOW tack on the formatted value for the units
- */
- for (int i = 0; i < results.length; i++) {
- results[i] = format(results[i], targetUnits);
- }
-
- return results;
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
- return format(value, targetUnits, bestFit, null, null);
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) {
- if (value == null || Double.isNaN(value)) {
- return NULL_OR_NAN_FORMATTED_VALUE;
- }
- if (bestFit) {
- MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
-
- value = valueAndUnits.getValue();
- targetUnits = valueAndUnits.getUnits();
- }
-
- // apply relative scale at presentation time
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- value = MeasurementUnits.scaleUp(value, targetUnits);
- }
-
- NumberFormat numberFormat =
- NumberFormat.getFormat(
- getFormat(
- minimumFractionDigits != null ? minimumFractionDigits : 1,
- maximumFractionDigits != null ? maximumFractionDigits : 1));
-
- String formatted = numberFormat.format(value);
-
- return format(formatted, targetUnits);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
- throws MeasurementConversionException {
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
-
- MeasurementUnits baseUnits = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
- Double scaledMagnitude = scale(valueAndUnits, targetUnits);
-
- return format(scaledMagnitude, targetUnits, bestFit);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
- return fit(origin, units, null, null);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
- MeasurementUnits highUnits) {
-
- // work-around for the various Chart descendants not properly setting their units field;
- if (null == units) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition, absolutely specified units don't scale to anything
- if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
- || (MeasurementUnits.Family.DURATION == units.getFamily())) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition relative-valued units are self-scaled (converted at formatting)
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // if the magnitude is zero, the best-fit also will spin around forever since it won't change
- if (Math.abs(origin) < 1e-9) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- boolean wasNegative = false;
-
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementNumericValueAndUnits currentValueAndUnits;
- MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
-
- // first, make the value smaller if it's too big
- int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
-
- do {
- currentValueAndUnits = nextValueAndUnits;
-
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
- if (nextOrdinal == maxOrdinal) {
- // we could theoretically get bigger, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
- if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as big as we can get, break out of the loop so we can return
- break;
- }
-
- Double smallerValue = scale(currentValueAndUnits, biggerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
- } while (nextValueAndUnits.getValue() > 1.0);
-
- // next, make the value bigger if it's too small
- int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
-
- while (currentValueAndUnits.getValue() < 1.0) {
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
- if (nextOrdinal == minOrdinal) {
- // we could theoretically get smaller, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
- if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as small as we can get, break out of the loop so we can return
- break;
- }
-
- Double biggerValue = scale(currentValueAndUnits, smallerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
-
- currentValueAndUnits = nextValueAndUnits;
- }
-
- if (wasNegative) {
- return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
- .getUnits());
- }
-
- return currentValueAndUnits;
- }
-
- public static String getFormat(int minDigits, int maxDigits) {
- StringBuilder buf = new StringBuilder("0.");
- for (int i = 0; i < minDigits;i++) {
- buf.append("0");
- }
- for (int i = 0; i < (maxDigits-minDigits);i++) {
- buf.append("#");
- }
- return buf.toString();
- }
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
index ecb0cd8..f32c07b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
@@ -47,6 +47,8 @@ public class MeasurementOOBComposite implements Serializable {
private MeasurementUnits units;
private String parentName;
private Integer parentId;
+ private String formattedOutlier;
+ private String formattedBaseband;
public MeasurementOOBComposite(String resourceName, int resourceId, String scheduleName, int scheduleId,
long timestamp, int definitionId, int factor, double blMin, double blMax, MeasurementUnits units,
@@ -107,6 +109,10 @@ public class MeasurementOOBComposite implements Serializable {
return timestamp;
}
+ public MeasurementUnits getUnits() {
+ return units;
+ }
+
public double getBlMin() {
return blMin;
}
@@ -160,20 +166,21 @@ public class MeasurementOOBComposite implements Serializable {
}
}
- /*
public String getFormattedBaseband() {
- String min = MeasurementConverter.format(blMin, units, true);
- String max = MeasurementConverter.format(blMax, units, true);
-
- String result = min + ", " + max;
+ return formattedBaseband;
+ }
- return result;
+ public void setFormattedBaseband(String formattedBaseband) {
+ this.formattedBaseband = formattedBaseband;
}
public String getFormattedOutlier() {
- return MeasurementConverter.format(outlier, units, true);
+ return formattedOutlier;
+ }
+
+ public void setFormattedOutlier(String formattedOutlier) {
+ this.formattedOutlier = formattedOutlier;
}
- */
@Override
public String toString() {
diff --git a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java
deleted file mode 100644
index 443964f..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementConverter.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.server;
-
-import java.text.NumberFormat;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
-public class MeasurementConverter {
- private static final int MAX_PRECISION_DIGITS = 4;
- private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
-
-
- private static NumberFormat getDefaultNumberFormat() {
- NumberFormat nf = NumberFormat.getNumberInstance();
-
- nf.setMinimumFractionDigits(1);
- nf.setMaximumFractionDigits(1);
-
- return nf;
- }
-
- public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- MeasurementUnits originUnits = origin.getUnits();
- Double originValue = origin.getValue();
-
- return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
- }
-
- public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
- boolean wasNegative = false;
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementUnits baseUnit = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
-
- Double results = scale(valueAndUnits, targetUnits);
- if (wasNegative) {
- results = -results;
- }
-
- return results;
- }
-
- public static String format(String value, MeasurementUnits targetUnits) {
- if (targetUnits == null) {
- return value;
- } else {
- return value + targetUnits;
- }
- }
-
- /**
- * Formats the given array of double values: determines the necessary precision such that when formatted, they are
- * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
- * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
- * bounded for presentation considerations.
- *
- * @param values the values to be formatted
- * @param targetUnits the target units for the values
- * @param bestFit whether or not to use a normalized scale for the family of units
- *
- * @return the formatted values
- */
- public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
- if ((null == values) || (values.length == 0)) {
- return null;
- }
-
- MeasurementUnits originalUnits = targetUnits;
-
- /*
- * in the overwhelming majority of cases, you're going to want to apply a bestFit
- * to the passed data, but it's not required; it's perfectly possible to allow a
- * list of doubles to be formatted without being fit, in which case the targetUnits
- * will be part of the formatted display for each result element
- */
- if (bestFit) {
- // find bestFit units by taking the average
- Double average = 0.0;
-
- for (int i = 0, sz = values.length; i < sz; i++) {
- /*
- * adding fractional amount iterative leads to greater
- * error, but prevents overflow on large data sets
- */
- average += (values[i] / sz);
- }
-
- MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
- //noinspection UnnecessaryLocalVariable
- MeasurementUnits fittedUnits = fittedAverage.getUnits();
-
- /*
- * and change the local reference to targetUnits, so that the same logic
- * can be used both for the bestFit and non-bestFit computations
- */
- targetUnits = fittedUnits;
- }
-
- @SuppressWarnings("unused")
- Set<String> existingStrings; // technically this *is* unused because
- int precisionDigits = 0;
- boolean scaleWithMorePrecision = true;
- String[] results = new String[values.length];
- NumberFormat nf = getDefaultNumberFormat();
-
- /*
- * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
- *
- * increase the maxPrecisionDigits in the while condition
- * itself to ensure it gets done for every loop
- */
- while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
- /*
- * make the assumption that we no longer need to scale beyond this iteration
- */
- scaleWithMorePrecision = false;
-
- /*
- * we need to record the uniquely formatted values so we can determine
- */
- existingStrings = new HashSet<String>();
- nf.setMinimumFractionDigits(0);
- nf.setMaximumFractionDigits(precisionDigits);
-
- Double[] scaledValues = new Double[values.length];
-
- for (int i = 0; i < scaledValues.length; i++) {
- /*
- * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
- * Otherwise, apply standard multi-unit scaling.
- */
- if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
- scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
- } else {
- scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
- }
- }
-
- for (int i = 0; i < results.length; i++) {
- /*
- * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
- * we do this to see how many units we'll have to scale to afterwards (outside this
- * while loop) to make the array of values passed to us unique
- */
- String formatted = nf.format(scaledValues[i]);
-
- /*
- * check whether formatted value was in the set or not; if it was, we have to
- * loop, but only if we're not not already at our maximum precision
- */
- boolean wasNewElement = existingStrings.add(formatted);
-
- if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
- scaleWithMorePrecision = true;
- break;
- }
-
- results[i] = formatted;
- }
- }
-
- /*
- * we did the best we could in terms of trying to find a precision that adds the most
- * uniqueness to the given set of values, NOW tack on the formatted value for the units
- */
- for (int i = 0; i < results.length; i++) {
- results[i] = format(results[i], targetUnits);
- }
-
- return results;
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
- return format(value, targetUnits, bestFit, null, null);
- }
-
- public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) {
- if (value == null || Double.isNaN(value)) {
- return NULL_OR_NAN_FORMATTED_VALUE;
- }
- if (bestFit) {
- MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
-
- value = valueAndUnits.getValue();
- targetUnits = valueAndUnits.getUnits();
- }
-
- // apply relative scale at presentation time
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- value = MeasurementUnits.scaleUp(value, targetUnits);
- }
-
- NumberFormat numberFormat = getDefaultNumberFormat();
- if (null != minimumFractionDigits) {
- numberFormat.setMinimumFractionDigits(minimumFractionDigits);
- }
- if (null != maximumFractionDigits) {
- numberFormat.setMaximumFractionDigits(maximumFractionDigits);
- }
- String formatted = numberFormat.format(value);
-
- return format(formatted, targetUnits);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
- throws MeasurementConversionException {
-
- return scaleAndFormat(origin, targetUnits, bestFit, null, null);
- }
-
- public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
- Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
-
- MeasurementUnits baseUnits = targetUnits.getBaseUnits();
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
- Double scaledMagnitude = scale(valueAndUnits, targetUnits);
-
- return format(scaledMagnitude, targetUnits, bestFit);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
- return fit(origin, units, null, null);
- }
-
- public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
- MeasurementUnits highUnits) {
-
- // work-around for the various Chart descendants not properly setting their units field;
- if (null == units) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition, absolutely specified units don't scale to anything
- if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
- || (MeasurementUnits.Family.DURATION == units.getFamily())) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // by definition relative-valued units are self-scaled (converted at formatting)
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- // if the magnitude is zero, the best-fit also will spin around forever since it won't change
- if (Math.abs(origin) < 1e-9) {
- return new MeasurementNumericValueAndUnits(origin, units);
- }
-
- boolean wasNegative = false;
-
- if (origin < 0) {
- wasNegative = true;
- origin = -origin;
- }
-
- MeasurementNumericValueAndUnits currentValueAndUnits;
- MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
-
- // first, make the value smaller if it's too big
- int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
-
- do {
- currentValueAndUnits = nextValueAndUnits;
-
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
- if (nextOrdinal == maxOrdinal) {
- // we could theoretically get bigger, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
- if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as big as we can get, break out of the loop so we can return
- break;
- }
-
- Double smallerValue = scale(currentValueAndUnits, biggerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
- } while (nextValueAndUnits.getValue() > 1.0);
-
- // next, make the value bigger if it's too small
- int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
-
- while (currentValueAndUnits.getValue() < 1.0) {
- int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
- if (nextOrdinal == minOrdinal) {
- // we could theoretically get smaller, but we don't have any units to represent that
- break;
- }
-
- MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
- if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
- // we're as small as we can get, break out of the loop so we can return
- break;
- }
-
- Double biggerValue = scale(currentValueAndUnits, smallerUnits);
-
- nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
-
- currentValueAndUnits = nextValueAndUnits;
- }
-
- if (wasNegative) {
- return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
- .getUnits());
- }
-
- return currentValueAndUnits;
- }
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java b/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
deleted file mode 100644
index 42cd8f3..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/server/MeasurementParser.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.core.server;
-
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author Greg Hinkle
- */
-public class MeasurementParser {
-
- private static final String NUMBER_OPTIONAL_UNIT_PATTERN_STRING = "([\\+\\-]?" + // number sign is optional but valid
- "[0-9\\.\\,]{1,})" + // followed by at least one magnitude identifier, capture number plus sign
- "([\\%a-z]*)"; // followed by an optional units identifier, capture entire suffix
- private static final Pattern NUMBER_OPTIONAL_UNIT_PATTERN;
- static {
- NUMBER_OPTIONAL_UNIT_PATTERN = Pattern.compile(NUMBER_OPTIONAL_UNIT_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
- }
-
- public static MeasurementNumericValueAndUnits parse(String input, MeasurementUnits targetUnits)
- throws MeasurementConversionException {
- input = input.replaceAll("\\s", ""); // our pattern assumes no whitespace
- Matcher matcher = NUMBER_OPTIONAL_UNIT_PATTERN.matcher(input);
-
- if (!matcher.matches()) {
- throw new MeasurementConversionException("The passed input '" + input + "' could not be parsed correctly "
- + "by the regular expression " + NUMBER_OPTIONAL_UNIT_PATTERN_STRING);
- }
-
- String magnitude = matcher.group(1);
- String units = matcher.group(2);
-
- MeasurementUnits fromUnits;
- if (units.equals("")) {
- /*
- * no units is valid, and we assume the passed targetUnits; however, we will
- * still need to check that the number is well-formed, so continue processing.
- */
- fromUnits = targetUnits;
- } else {
- fromUnits = MeasurementUnits.getUsingDisplayUnits(units, targetUnits.getFamily());
-
- if ((fromUnits == null) || (!fromUnits.isComparableTo(targetUnits))) {
- throw new MeasurementConversionException("The units in '" + input + "' were not valid, " + "expected '"
- + targetUnits.getFamily() + "' units, received '" + units + "' units");
- }
- }
-
- try {
- if (magnitude.startsWith("+")) {
- magnitude = magnitude.substring(1);
- }
-
- Number convertedMagnitude = DecimalFormat.getInstance().parse(magnitude);
- Double scaledMagnitude;
-
- // apply relative scale if applicable, otherwise perform standard scaling
- if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
- scaledMagnitude = MeasurementUnits.scaleDown(convertedMagnitude.doubleValue(), targetUnits);
- } else {
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(convertedMagnitude
- .doubleValue(), fromUnits);
- scaledMagnitude = MeasurementConverter.scale(valueAndUnits, targetUnits);
- }
-
- return new MeasurementNumericValueAndUnits(scaledMagnitude, targetUnits);
- } catch (ParseException pe) {
- throw new MeasurementConversionException("The magnitude in '" + input + "' did not parse correctly "
- + "as a valid, localized, stringified number ");
- }
-
- }
-
- public static MeasurementNumericValueAndUnits parse(String input, MeasurementSchedule targetSchedule)
- throws MeasurementConversionException {
- MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
-
- return parse(input, targetUnits);
- }
-}
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
deleted file mode 100644
index 0688c79..0000000
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.domain.util.units.test;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.testng.annotations.Test;
-
-import org.rhq.core.domain.measurement.MeasurementConverterClient;
-import org.rhq.core.domain.measurement.MeasurementUnits;
-import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
-import org.rhq.core.domain.measurement.util.MeasurementConversionException;
-import org.rhq.core.domain.test.AbstractEJB3Test;
-import org.rhq.core.server.MeasurementParser;
-
-// TODO two tests in here need to be re-enables once the GWT client issues are resolved
-@Test
-public class MeasurementConverterTest extends AbstractEJB3Test {
- private final double POSITIVE = 300;
- private final double NEGATIVE = -42;
-
- private final String[] WHITESPACE = new String[] { " ", "\f", "\n", "\r", "\t" };
-
- private ThreadLocal<Integer> precisionScalingTestCount = null;
-
- private void incrementPrecisionScalingTestCount() {
- if (precisionScalingTestCount == null) {
- precisionScalingTestCount = new ThreadLocal<Integer>() {
- @Override
- protected Integer initialValue() {
- return 0;
- }
- };
- }
- precisionScalingTestCount.set(precisionScalingTestCount.get() + 1);
- }
-
- @Test(groups = "integration.ejb3", enabled = false)
- // TODO fix me
- public void testPrecisionScaling() throws Exception {
-
- // if all values are equal, it will format to the max precision
-
- testPrecisionScaling(new double[] { 1.41, 1.41, 1.41, 1.41, 1.41 }, MeasurementUnits.NONE, new String[] {
- "1.41", "1.41", "1.41", "1.41", "1.41" }, MeasurementUnits.NONE);
-
- // if all values are unique, it won't need to format any of them to more digits
- testPrecisionScaling(new double[] { 1.41, 1.42, 1.43, 1.44, 1.45 }, MeasurementUnits.NONE, new String[] {
- "1.41", "1.42", "1.43", "1.44", "1.45" }, MeasurementUnits.NONE);
-
- // even if only two are equal, it will scale all the way to max precision looking for uniqueness
- testPrecisionScaling(new double[] { 1.4, 1.4, 1.5, 1.6, 1.7 }, MeasurementUnits.NONE, new String[] { "1.4",
- "1.4", "1.5", "1.6", "1.7" }, MeasurementUnits.NONE);
-
- // to final a "good looking" target scaling units, it will use the mathematical mean
- // NOTE: formatting doesn't round up/down, thus introducing error from cutting digits (256 -> 0.2KB [instead of 0.25KB])
- testPrecisionScaling(new double[] { 128, 256, 512, 1024, 8192 }, MeasurementUnits.BYTES, new String[] {
- "0.1KB", "0.2KB", "0.5KB", "1KB", "8KB" }, MeasurementUnits.KILOBYTES);
-
- // same test with negative numbers
- testPrecisionScaling(new double[] { -128, -256, -512, -1024, -8192 }, MeasurementUnits.BYTES, new String[] {
- "-0.1KB", "-0.2KB", "-0.5KB", "-1KB", "-8KB" }, MeasurementUnits.KILOBYTES);
-
- // test self scaling relative units
- testPrecisionScaling(new double[] { 0.0, 0.065, 1.0, 0.123456 }, MeasurementUnits.PERCENTAGE, new String[] {
- "0%", "6.5%", "100%", "12.3%" }, MeasurementUnits.PERCENTAGE);
-
- // test self scaling relative units
- testPrecisionScaling(new double[] { 0.0621, 0.065, 0.0620, 0.6202 }, MeasurementUnits.PERCENTAGE, new String[] {
- "6.21%", "6.5%", "6.2%", "62.02%" }, MeasurementUnits.PERCENTAGE);
- }
-
- private void testPrecisionScaling(double[] values, MeasurementUnits units, String[] expectedResults,
- MeasurementUnits expectedUnits) {
- incrementPrecisionScalingTestCount();
-
- String[] results = MeasurementConverterClient.formatToSignificantPrecision(values, units, true);
- for (int i = 0; i < results.length; i++) {
- String expected = expectedResults[i];
- String actual = results[i];
-
- // The expected output is in Locale.US. Handle running the tests in a different default locale
- if (expected.contains(".") && (!Locale.getDefault().equals(Locale.US))) {
- Locale defaultLocale = Locale.getDefault();
- Locale.setDefault(Locale.US);
- MeasurementNumericValueAndUnits vu = MeasurementParser.parse(expected, expectedUnits);
- Locale.setDefault(defaultLocale);
- expected = MeasurementConverterClient.format(vu.getValue(), expectedUnits, false, null, 4);
- }
-
- assert actual.equals(expected) : "Test " + precisionScalingTestCount.get() + ": " + "Index " + i + ", "
- + "Expected " + expected + ", " + "Received " + actual + ", " + "Units " + units.getName();
- }
- }
-
- @Test(groups = "integration.ejb3", enabled = false)
- // TODO fix me
- public void testConversionSuccess() throws Exception {
- // test the straight-forward, non-whitespace cases
- for (MeasurementUnits units : MeasurementUnits.values()) {
- validateFormatConvert(POSITIVE, units);
- validateFormatConvert(NEGATIVE, units);
- }
-
- List<String> signVariations;
- List<String> magnitudeVariations;
- List<String> unitsVariations;
-
- // use the same NumberFormat that the MeasurementConverter uses, so that we get the correct expected results
- NumberFormat nf = DecimalFormat.getNumberInstance();
- nf.setMinimumFractionDigits(1);
- nf.setMaximumFractionDigits(1);
-
- // test a couple hundred thousand variations of whitespace around each positive number with units
- signVariations = getWhitespaceVariationsAroundSingleTokens("", "+");
- magnitudeVariations = getWhitespaceVariationsAroundSingleTokens(nf.format(POSITIVE));
- for (MeasurementUnits units : MeasurementUnits.values()) {
- unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
-
- // splice all combinations together and test conversion validity
- for (String signVariation : signVariations) {
- for (String magnitudeVariation : magnitudeVariations) {
- if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
- magnitudeVariation = nf.format(MeasurementUnits.scaleUp(nf.parse(magnitudeVariation.trim())
- .doubleValue(), units));
- }
-
- for (String unitVariation : unitsVariations) {
- String original = MeasurementConverterClient.format(POSITIVE, units, false);
- String toBeTested = magnitudeVariation.trim() + unitVariation.trim();
-
- assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
- + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
-
- validateConvert(POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
- }
- }
- }
- }
-
- // test a couple hundred thousand variations of whitespace around each negative number with units
- signVariations = getWhitespaceVariationsAroundSingleTokens("-");
- for (MeasurementUnits units : MeasurementUnits.values()) {
- unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
-
- for (String signVariation : signVariations) {
- for (String magnitudeVariation : magnitudeVariations) {
- if (units == MeasurementUnits.PERCENTAGE) {
- magnitudeVariation = nf.format(100 * nf.parse(magnitudeVariation.trim()).doubleValue());
- }
-
- for (String unitVariation : unitsVariations) {
- String original = MeasurementConverterClient.format(-POSITIVE, units, false);
- String toBeTested = "-" + magnitudeVariation.trim() + unitVariation.trim();
-
- assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
- + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
-
- validateConvert(-POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
- }
- }
- }
- }
- }
-
- @Test(groups = "integration.ejb3")
- public void testScalingSuccess() throws Exception {
- // Family.BYTES
- validateScaleAndInverse(1024.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.KILOBYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.MEGABYTES);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.GIGABYTES);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.MEGABYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.GIGABYTES);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.GIGABYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.TERABYTES);
- validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.PETABYTES);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.TERABYTES, 1.0, MeasurementUnits.PETABYTES);
-
- // Family.BITS
- validateScaleAndInverse(1024.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.KILOBITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.MEGABITS);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.GIGABITS);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.MEGABITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.GIGABITS);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.GIGABITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.TERABITS);
- validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.PETABITS);
-
- validateScaleAndInverse(1024.0, MeasurementUnits.TERABITS, 1.0, MeasurementUnits.PETABITS);
-
- // Family.DURATION
- validateScaleAndInverse(1000.0, MeasurementUnits.EPOCH_MILLISECONDS, 1.0, MeasurementUnits.EPOCH_SECONDS);
-
- // Family.TIME
- validateScaleAndInverse(1000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.SECONDS);
- validateScaleAndInverse(60000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.MINUTES);
- validateScaleAndInverse(3600000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.HOURS);
- validateScaleAndInverse(86400000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.DAYS);
-
- validateScaleAndInverse(60.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.MINUTES);
- validateScaleAndInverse(3600.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.HOURS);
- validateScaleAndInverse(86400.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.DAYS);
-
- validateScaleAndInverse(60.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.HOURS);
- validateScaleAndInverse(1440.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.DAYS);
-
- validateScaleAndInverse(24.0, MeasurementUnits.HOURS, 1.0, MeasurementUnits.DAYS);
- }
-
- private void validateScaleAndInverse(double fromValue, MeasurementUnits fromUnits, double toValue,
- MeasurementUnits toUnits) {
- validateScale(fromValue, fromUnits, toValue, toUnits);
- validateScale(toValue, toUnits, fromValue, fromUnits);
- }
-
- private void validateScale(double fromValue, MeasurementUnits fromUnits, double toValue, MeasurementUnits toUnits) {
- MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(fromValue, fromUnits);
- try {
- double derived = MeasurementConverterClient.scale(valueAndUnits, toUnits);
- assert Math.abs(toValue - derived) < 1e-9 : "Scale conversion error: " +
-
- "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
- + fromUnits + "', " +
-
- "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
- + toUnits + "', " +
-
- "Received value '" + derived + "'";
-
- } catch (MeasurementConversionException mce) {
- assert false : "Unexpected MeasurementConversionException: " +
-
- "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
- + fromUnits + "', " +
-
- "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
- + toUnits;
- }
- }
-
- private void validateFormatConvert(double value, MeasurementUnits units) {
- validateFormatConvert(value, value, units);
- }
-
- private void validateFormatConvert(double passedValue, double expectedValue, MeasurementUnits units) {
- try {
- String intermediate = MeasurementConverterClient.format(passedValue, units, false);
- MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
-
- assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
- + passedValue
- + "', "
- + "units input was '"
- + units.name()
- + "', "
- +
-
- "intermediate string was '"
- + intermediate
- + "', "
- +
-
- "Expected value '"
- + expectedValue
- + "', "
- + "with units of '"
- + units.name()
- + "', "
- + "displayed as '"
- + units
- + "', "
- +
-
- "Received value '"
- + results.getValue()
- + "', "
- + "with units of '"
- + results.getUnits().getName()
- + "', " + "displayed as '" + results.getUnits() + "'";
- } catch (MeasurementConversionException mce) {
- assert false : "Error during conversion: " + mce.getMessage();
- }
- }
-
- private void validateConvert(double value, String intermediate, MeasurementUnits units) {
- validateConvert(value, value, intermediate, units);
- }
-
- private void validateConvert(double passedValue, double expectedValue, String intermediate, MeasurementUnits units) {
- try {
- MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
-
- assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
- + passedValue
- + "', "
- + "units input was '"
- + units.name()
- + "', "
- +
-
- "intermediate string was '"
- + intermediate
- + "', "
- +
-
- "Expected value '"
- + expectedValue
- + "', "
- + "with units of '"
- + units.name()
- + "', "
- + "displayed as '"
- + units
- + "', "
- +
-
- "Received value '"
- + results.getValue()
- + "', "
- + "with units of '"
- + results.getUnits().getName()
- + "', " + "displayed as '" + results.getUnits() + "'";
- } catch (MeasurementConversionException mce) {
- assert false : "Error during conversion: " + mce.getMessage();
- }
- }
-
- private List<String> getWhitespaceVariationsAroundSingleTokens(String... tokens) {
- List<String> variations = new ArrayList<String>();
-
- for (String token : tokens) {
- for (String white : WHITESPACE) {
- variations.add(token);
- //variations.add( token + white );
- //variations.add( white + token );
- //variations.add( white + token + white );
-
- variations.add(token + white + white);
- //variations.add( white + white + token );
- //variations.add( white + white + token + white + white );
- }
- }
-
- return variations;
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
new file mode 100644
index 0000000..f78b62c
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java
@@ -0,0 +1,360 @@
+ /*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+ package org.rhq.core.domain.measurement;
+
+ import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+ import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+ import com.google.gwt.i18n.client.NumberFormat;
+
+ import java.util.HashSet;
+ import java.util.Set;
+
+ public class MeasurementConverterClient {
+ private static final int MAX_PRECISION_DIGITS = 4;
+ private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
+
+
+ private static NumberFormat getDefaultNumberFormat() {
+ NumberFormat nf = NumberFormat.getFormat("0.0");
+
+ return nf;
+ }
+
+ public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ MeasurementUnits originUnits = origin.getUnits();
+ Double originValue = origin.getValue();
+
+ return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
+ }
+
+ public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
+ boolean wasNegative = false;
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementUnits baseUnit = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
+
+ Double results = scale(valueAndUnits, targetUnits);
+ if (wasNegative) {
+ results = -results;
+ }
+
+ return results;
+ }
+
+ public static String format(String value, MeasurementUnits targetUnits) {
+ if (targetUnits == null) {
+ return value;
+ } else {
+ return value + targetUnits;
+ }
+ }
+
+ /**
+ * Formats the given array of double values: determines the necessary precision such that when formatted, they are
+ * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
+ * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
+ * bounded for presentation considerations.
+ *
+ * @param values the values to be formatted
+ * @param targetUnits the target units for the values
+ * @param bestFit whether or not to use a normalized scale for the family of units
+ *
+ * @return the formatted values
+ */
+ public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
+ if ((null == values) || (values.length == 0)) {
+ return null;
+ }
+
+ MeasurementUnits originalUnits = targetUnits;
+
+ /*
+ * in the overwhelming majority of cases, you're going to want to apply a bestFit
+ * to the passed data, but it's not required; it's perfectly possible to allow a
+ * list of doubles to be formatted without being fit, in which case the targetUnits
+ * will be part of the formatted display for each result element
+ */
+ if (bestFit) {
+ // find bestFit units by taking the average
+ Double average = 0.0;
+
+ for (int i = 0, sz = values.length; i < sz; i++) {
+ /*
+ * adding fractional amount iterative leads to greater
+ * error, but prevents overflow on large data sets
+ */
+ average += (values[i] / sz);
+ }
+
+ MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
+ //noinspection UnnecessaryLocalVariable
+ MeasurementUnits fittedUnits = fittedAverage.getUnits();
+
+ /*
+ * and change the local reference to targetUnits, so that the same logic
+ * can be used both for the bestFit and non-bestFit computations
+ */
+ targetUnits = fittedUnits;
+ }
+
+ @SuppressWarnings("unused")
+ Set<String> existingStrings; // technically this *is* unused because
+ int precisionDigits = 0;
+ boolean scaleWithMorePrecision = true;
+ String[] results = new String[values.length];
+ NumberFormat nf = getDefaultNumberFormat();
+
+ /*
+ * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
+ *
+ * increase the maxPrecisionDigits in the while condition
+ * itself to ensure it gets done for every loop
+ */
+ while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
+ /*
+ * make the assumption that we no longer need to scale beyond this iteration
+ */
+ scaleWithMorePrecision = false;
+
+ /*
+ * we need to record the uniquely formatted values so we can determine
+ */
+ existingStrings = new HashSet<String>();
+ nf = NumberFormat.getFormat(getFormat(0, precisionDigits));
+
+ Double[] scaledValues = new Double[values.length];
+
+ for (int i = 0; i < scaledValues.length; i++) {
+ /*
+ * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
+ * Otherwise, apply standard multi-unit scaling.
+ */
+ if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
+ scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
+ } else {
+ scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
+ }
+ }
+
+ for (int i = 0; i < results.length; i++) {
+ /*
+ * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
+ * we do this to see how many units we'll have to scale to afterwards (outside this
+ * while loop) to make the array of values passed to us unique
+ */
+ String formatted = nf.format(scaledValues[i]);
+
+ /*
+ * check whether formatted value was in the set or not; if it was, we have to
+ * loop, but only if we're not not already at our maximum precision
+ */
+ boolean wasNewElement = existingStrings.add(formatted);
+
+ if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
+ scaleWithMorePrecision = true;
+ break;
+ }
+
+ results[i] = formatted;
+ }
+ }
+
+ /*
+ * we did the best we could in terms of trying to find a precision that adds the most
+ * uniqueness to the given set of values, NOW tack on the formatted value for the units
+ */
+ for (int i = 0; i < results.length; i++) {
+ results[i] = format(results[i], targetUnits);
+ }
+
+ return results;
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
+ return format(value, targetUnits, bestFit, null, null);
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) {
+ if (value == null || Double.isNaN(value)) {
+ return NULL_OR_NAN_FORMATTED_VALUE;
+ }
+ if (bestFit) {
+ MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
+
+ value = valueAndUnits.getValue();
+ targetUnits = valueAndUnits.getUnits();
+ }
+
+ // apply relative scale at presentation time
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ value = MeasurementUnits.scaleUp(value, targetUnits);
+ }
+
+ NumberFormat numberFormat =
+ NumberFormat.getFormat(
+ getFormat(
+ minimumFractionDigits != null ? minimumFractionDigits : 1,
+ maximumFractionDigits != null ? maximumFractionDigits : 1));
+
+ String formatted = numberFormat.format(value);
+
+ return format(formatted, targetUnits);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
+ throws MeasurementConversionException {
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
+
+ MeasurementUnits baseUnits = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
+ Double scaledMagnitude = scale(valueAndUnits, targetUnits);
+
+ return format(scaledMagnitude, targetUnits, bestFit);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
+ return fit(origin, units, null, null);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
+ MeasurementUnits highUnits) {
+
+ // work-around for the various Chart descendants not properly setting their units field;
+ if (null == units) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition, absolutely specified units don't scale to anything
+ if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
+ || (MeasurementUnits.Family.DURATION == units.getFamily())) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition relative-valued units are self-scaled (converted at formatting)
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // if the magnitude is zero, the best-fit also will spin around forever since it won't change
+ if (Math.abs(origin) < 1e-9) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ boolean wasNegative = false;
+
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementNumericValueAndUnits currentValueAndUnits;
+ MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
+
+ // first, make the value smaller if it's too big
+ int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
+
+ do {
+ currentValueAndUnits = nextValueAndUnits;
+
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
+ if (nextOrdinal == maxOrdinal) {
+ // we could theoretically get bigger, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as big as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double smallerValue = scale(currentValueAndUnits, biggerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
+ } while (nextValueAndUnits.getValue() > 1.0);
+
+ // next, make the value bigger if it's too small
+ int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
+
+ while (currentValueAndUnits.getValue() < 1.0) {
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
+ if (nextOrdinal == minOrdinal) {
+ // we could theoretically get smaller, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as small as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double biggerValue = scale(currentValueAndUnits, smallerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
+
+ currentValueAndUnits = nextValueAndUnits;
+ }
+
+ if (wasNegative) {
+ return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
+ .getUnits());
+ }
+
+ return currentValueAndUnits;
+ }
+
+ public static String getFormat(int minDigits, int maxDigits) {
+ StringBuilder buf = new StringBuilder("0.");
+ for (int i = 0; i < minDigits;i++) {
+ buf.append("0");
+ }
+ for (int i = 0; i < (maxDigits-minDigits);i++) {
+ buf.append("#");
+ }
+ return buf.toString();
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java
new file mode 100644
index 0000000..443964f
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java
@@ -0,0 +1,355 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.server;
+
+import java.text.NumberFormat;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+public class MeasurementConverter {
+ private static final int MAX_PRECISION_DIGITS = 4;
+ private static final String NULL_OR_NAN_FORMATTED_VALUE = "--no data available--";
+
+
+ private static NumberFormat getDefaultNumberFormat() {
+ NumberFormat nf = NumberFormat.getNumberInstance();
+
+ nf.setMinimumFractionDigits(1);
+ nf.setMaximumFractionDigits(1);
+
+ return nf;
+ }
+
+ public static Double scale(MeasurementNumericValueAndUnits origin, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ MeasurementUnits originUnits = origin.getUnits();
+ Double originValue = origin.getValue();
+
+ return originValue * MeasurementUnits.calculateOffset(originUnits, targetUnits);
+ }
+
+ public static Double scale(Double origin, MeasurementUnits targetUnits) throws MeasurementConversionException {
+ boolean wasNegative = false;
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementUnits baseUnit = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnit);
+
+ Double results = scale(valueAndUnits, targetUnits);
+ if (wasNegative) {
+ results = -results;
+ }
+
+ return results;
+ }
+
+ public static String format(String value, MeasurementUnits targetUnits) {
+ if (targetUnits == null) {
+ return value;
+ } else {
+ return value + targetUnits;
+ }
+ }
+
+ /**
+ * Formats the given array of double values: determines the necessary precision such that when formatted, they are
+ * distinct and reasonable to look at. For example, for values { 1.45 1.46 1.47 1.48 1.49 } the desired precision is
+ * 2 - less precision loses significant digits, and more precision provides no added benefit. Max precision is
+ * bounded for presentation considerations.
+ *
+ * @param values the values to be formatted
+ * @param targetUnits the target units for the values
+ * @param bestFit whether or not to use a normalized scale for the family of units
+ *
+ * @return the formatted values
+ */
+ public static String[] formatToSignificantPrecision(double[] values, MeasurementUnits targetUnits, boolean bestFit) {
+ if ((null == values) || (values.length == 0)) {
+ return null;
+ }
+
+ MeasurementUnits originalUnits = targetUnits;
+
+ /*
+ * in the overwhelming majority of cases, you're going to want to apply a bestFit
+ * to the passed data, but it's not required; it's perfectly possible to allow a
+ * list of doubles to be formatted without being fit, in which case the targetUnits
+ * will be part of the formatted display for each result element
+ */
+ if (bestFit) {
+ // find bestFit units by taking the average
+ Double average = 0.0;
+
+ for (int i = 0, sz = values.length; i < sz; i++) {
+ /*
+ * adding fractional amount iterative leads to greater
+ * error, but prevents overflow on large data sets
+ */
+ average += (values[i] / sz);
+ }
+
+ MeasurementNumericValueAndUnits fittedAverage = fit(average, targetUnits);
+ //noinspection UnnecessaryLocalVariable
+ MeasurementUnits fittedUnits = fittedAverage.getUnits();
+
+ /*
+ * and change the local reference to targetUnits, so that the same logic
+ * can be used both for the bestFit and non-bestFit computations
+ */
+ targetUnits = fittedUnits;
+ }
+
+ @SuppressWarnings("unused")
+ Set<String> existingStrings; // technically this *is* unused because
+ int precisionDigits = 0;
+ boolean scaleWithMorePrecision = true;
+ String[] results = new String[values.length];
+ NumberFormat nf = getDefaultNumberFormat();
+
+ /*
+ * we scale at most to MAX_PRECISION_DIGITS to allow for presentation limits
+ *
+ * increase the maxPrecisionDigits in the while condition
+ * itself to ensure it gets done for every loop
+ */
+ while (scaleWithMorePrecision && (++precisionDigits <= MAX_PRECISION_DIGITS)) {
+ /*
+ * make the assumption that we no longer need to scale beyond this iteration
+ */
+ scaleWithMorePrecision = false;
+
+ /*
+ * we need to record the uniquely formatted values so we can determine
+ */
+ existingStrings = new HashSet<String>();
+ nf.setMinimumFractionDigits(0);
+ nf.setMaximumFractionDigits(precisionDigits);
+
+ Double[] scaledValues = new Double[values.length];
+
+ for (int i = 0; i < scaledValues.length; i++) {
+ /*
+ * For relative units apply the scale now, prior to the nf.format(), since we are not using format( Double...).
+ * Otherwise, apply standard multi-unit scaling.
+ */
+ if (MeasurementUnits.Family.RELATIVE == originalUnits.getFamily()) {
+ scaledValues[i] = MeasurementUnits.scaleUp(values[i], originalUnits);
+ } else {
+ scaledValues[i] = scale(new MeasurementNumericValueAndUnits(values[i], originalUnits), targetUnits);
+ }
+ }
+
+ for (int i = 0; i < results.length; i++) {
+ /*
+ * JUST get the formatted value, specifically DON'T tack on the formatted units yet;
+ * we do this to see how many units we'll have to scale to afterwards (outside this
+ * while loop) to make the array of values passed to us unique
+ */
+ String formatted = nf.format(scaledValues[i]);
+
+ /*
+ * check whether formatted value was in the set or not; if it was, we have to
+ * loop, but only if we're not not already at our maximum precision
+ */
+ boolean wasNewElement = existingStrings.add(formatted);
+
+ if ((!wasNewElement) && (precisionDigits < MAX_PRECISION_DIGITS)) {
+ scaleWithMorePrecision = true;
+ break;
+ }
+
+ results[i] = formatted;
+ }
+ }
+
+ /*
+ * we did the best we could in terms of trying to find a precision that adds the most
+ * uniqueness to the given set of values, NOW tack on the formatted value for the units
+ */
+ for (int i = 0; i < results.length; i++) {
+ results[i] = format(results[i], targetUnits);
+ }
+
+ return results;
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit) {
+ return format(value, targetUnits, bestFit, null, null);
+ }
+
+ public static String format(Double value, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) {
+ if (value == null || Double.isNaN(value)) {
+ return NULL_OR_NAN_FORMATTED_VALUE;
+ }
+ if (bestFit) {
+ MeasurementNumericValueAndUnits valueAndUnits = fit(value, targetUnits);
+
+ value = valueAndUnits.getValue();
+ targetUnits = valueAndUnits.getUnits();
+ }
+
+ // apply relative scale at presentation time
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ value = MeasurementUnits.scaleUp(value, targetUnits);
+ }
+
+ NumberFormat numberFormat = getDefaultNumberFormat();
+ if (null != minimumFractionDigits) {
+ numberFormat.setMinimumFractionDigits(minimumFractionDigits);
+ }
+ if (null != maximumFractionDigits) {
+ numberFormat.setMaximumFractionDigits(maximumFractionDigits);
+ }
+ String formatted = numberFormat.format(value);
+
+ return format(formatted, targetUnits);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementSchedule targetSchedule, boolean bestFit)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit)
+ throws MeasurementConversionException {
+
+ return scaleAndFormat(origin, targetUnits, bestFit, null, null);
+ }
+
+ public static String scaleAndFormat(Double origin, MeasurementUnits targetUnits, boolean bestFit,
+ Integer minimumFractionDigits, Integer maximumFractionDigits) throws MeasurementConversionException {
+
+ MeasurementUnits baseUnits = targetUnits.getBaseUnits();
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(origin, baseUnits);
+ Double scaledMagnitude = scale(valueAndUnits, targetUnits);
+
+ return format(scaledMagnitude, targetUnits, bestFit);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units) {
+ return fit(origin, units, null, null);
+ }
+
+ public static MeasurementNumericValueAndUnits fit(Double origin, MeasurementUnits units, MeasurementUnits lowUnits,
+ MeasurementUnits highUnits) {
+
+ // work-around for the various Chart descendants not properly setting their units field;
+ if (null == units) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition, absolutely specified units don't scale to anything
+ if ((MeasurementUnits.Family.ABSOLUTE == units.getFamily())
+ || (MeasurementUnits.Family.DURATION == units.getFamily())) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // by definition relative-valued units are self-scaled (converted at formatting)
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ if (MeasurementUnits.Family.TEMPERATURE == units.getFamily()) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ // if the magnitude is zero, the best-fit also will spin around forever since it won't change
+ if (Math.abs(origin) < 1e-9) {
+ return new MeasurementNumericValueAndUnits(origin, units);
+ }
+
+ boolean wasNegative = false;
+
+ if (origin < 0) {
+ wasNegative = true;
+ origin = -origin;
+ }
+
+ MeasurementNumericValueAndUnits currentValueAndUnits;
+ MeasurementNumericValueAndUnits nextValueAndUnits = new MeasurementNumericValueAndUnits(origin, units);
+
+ // first, make the value smaller if it's too big
+ int maxOrdinal = (highUnits != null) ? (highUnits.ordinal() + 1) : MeasurementUnits.values().length;
+
+ do {
+ currentValueAndUnits = nextValueAndUnits;
+
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() + 1;
+ if (nextOrdinal == maxOrdinal) {
+ // we could theoretically get bigger, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits biggerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (biggerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as big as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double smallerValue = scale(currentValueAndUnits, biggerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(smallerValue, biggerUnits);
+ } while (nextValueAndUnits.getValue() > 1.0);
+
+ // next, make the value bigger if it's too small
+ int minOrdinal = (lowUnits != null) ? (lowUnits.ordinal() - 1) : -1;
+
+ while (currentValueAndUnits.getValue() < 1.0) {
+ int nextOrdinal = currentValueAndUnits.getUnits().ordinal() - 1;
+ if (nextOrdinal == minOrdinal) {
+ // we could theoretically get smaller, but we don't have any units to represent that
+ break;
+ }
+
+ MeasurementUnits smallerUnits = MeasurementUnits.values()[nextOrdinal];
+ if (smallerUnits.getFamily() != currentValueAndUnits.getUnits().getFamily()) {
+ // we're as small as we can get, break out of the loop so we can return
+ break;
+ }
+
+ Double biggerValue = scale(currentValueAndUnits, smallerUnits);
+
+ nextValueAndUnits = new MeasurementNumericValueAndUnits(biggerValue, smallerUnits);
+
+ currentValueAndUnits = nextValueAndUnits;
+ }
+
+ if (wasNegative) {
+ return new MeasurementNumericValueAndUnits(-currentValueAndUnits.getValue(), currentValueAndUnits
+ .getUnits());
+ }
+
+ return currentValueAndUnits;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java
new file mode 100644
index 0000000..42cd8f3
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.server;
+
+import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Greg Hinkle
+ */
+public class MeasurementParser {
+
+ private static final String NUMBER_OPTIONAL_UNIT_PATTERN_STRING = "([\\+\\-]?" + // number sign is optional but valid
+ "[0-9\\.\\,]{1,})" + // followed by at least one magnitude identifier, capture number plus sign
+ "([\\%a-z]*)"; // followed by an optional units identifier, capture entire suffix
+ private static final Pattern NUMBER_OPTIONAL_UNIT_PATTERN;
+ static {
+ NUMBER_OPTIONAL_UNIT_PATTERN = Pattern.compile(NUMBER_OPTIONAL_UNIT_PATTERN_STRING, Pattern.CASE_INSENSITIVE);
+ }
+
+ public static MeasurementNumericValueAndUnits parse(String input, MeasurementUnits targetUnits)
+ throws MeasurementConversionException {
+ input = input.replaceAll("\\s", ""); // our pattern assumes no whitespace
+ Matcher matcher = NUMBER_OPTIONAL_UNIT_PATTERN.matcher(input);
+
+ if (!matcher.matches()) {
+ throw new MeasurementConversionException("The passed input '" + input + "' could not be parsed correctly "
+ + "by the regular expression " + NUMBER_OPTIONAL_UNIT_PATTERN_STRING);
+ }
+
+ String magnitude = matcher.group(1);
+ String units = matcher.group(2);
+
+ MeasurementUnits fromUnits;
+ if (units.equals("")) {
+ /*
+ * no units is valid, and we assume the passed targetUnits; however, we will
+ * still need to check that the number is well-formed, so continue processing.
+ */
+ fromUnits = targetUnits;
+ } else {
+ fromUnits = MeasurementUnits.getUsingDisplayUnits(units, targetUnits.getFamily());
+
+ if ((fromUnits == null) || (!fromUnits.isComparableTo(targetUnits))) {
+ throw new MeasurementConversionException("The units in '" + input + "' were not valid, " + "expected '"
+ + targetUnits.getFamily() + "' units, received '" + units + "' units");
+ }
+ }
+
+ try {
+ if (magnitude.startsWith("+")) {
+ magnitude = magnitude.substring(1);
+ }
+
+ Number convertedMagnitude = DecimalFormat.getInstance().parse(magnitude);
+ Double scaledMagnitude;
+
+ // apply relative scale if applicable, otherwise perform standard scaling
+ if (MeasurementUnits.Family.RELATIVE == targetUnits.getFamily()) {
+ scaledMagnitude = MeasurementUnits.scaleDown(convertedMagnitude.doubleValue(), targetUnits);
+ } else {
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(convertedMagnitude
+ .doubleValue(), fromUnits);
+ scaledMagnitude = MeasurementConverter.scale(valueAndUnits, targetUnits);
+ }
+
+ return new MeasurementNumericValueAndUnits(scaledMagnitude, targetUnits);
+ } catch (ParseException pe) {
+ throw new MeasurementConversionException("The magnitude in '" + input + "' did not parse correctly "
+ + "as a valid, localized, stringified number ");
+ }
+
+ }
+
+ public static MeasurementNumericValueAndUnits parse(String input, MeasurementSchedule targetSchedule)
+ throws MeasurementConversionException {
+ MeasurementUnits targetUnits = targetSchedule.getDefinition().getUnits();
+
+ return parse(input, targetUnits);
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
index c7e4ce4..0d68094 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java
@@ -54,6 +54,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.core.server.MeasurementConverter;
import org.rhq.core.server.PersistenceUtility;
import org.rhq.core.util.jdbc.JDBCUtil;
import org.rhq.enterprise.server.RHQConstants;
@@ -318,6 +319,8 @@ public class MeasurementOOBManagerBean implements MeasurementOOBManagerLocal {
}
+ applyFormatting(results);
+
return new PageList<MeasurementOOBComposite>(results, (int) totalCount, pc);
}
@@ -370,10 +373,25 @@ public class MeasurementOOBManagerBean implements MeasurementOOBManagerLocal {
long totalCount = (Long) countQuery.getSingleResult();
PageList<MeasurementOOBComposite> result = new PageList<MeasurementOOBComposite>(results, (int) totalCount, pc);
+ applyFormatting(result);
+
return result;
}
+ private void applyFormatting(List<MeasurementOOBComposite> composites) {
+ for (MeasurementOOBComposite oob : composites) {
+ oob.setFormattedOutlier(MeasurementConverter.format(oob.getOutlier(), oob.getUnits(), true));
+ formatBaseband(oob);
+ }
+ }
+
+ private void formatBaseband(MeasurementOOBComposite oob) {
+ String min = MeasurementConverter.format(oob.getBlMin(), oob.getUnits(), true);
+ String max = MeasurementConverter.format(oob.getBlMax(), oob.getUnits(), true);
+ oob.setFormattedBaseband(min + ", " + max);
+ }
+
/**
* Return the 1h numeric data for the passed primary keys (schedule, timestamp)
* @param pks Primary keys to look up
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
new file mode 100644
index 0000000..0688c79
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java
@@ -0,0 +1,390 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.domain.util.units.test;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.measurement.MeasurementConverterClient;
+import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
+import org.rhq.core.domain.measurement.util.MeasurementConversionException;
+import org.rhq.core.domain.test.AbstractEJB3Test;
+import org.rhq.core.server.MeasurementParser;
+
+// TODO two tests in here need to be re-enables once the GWT client issues are resolved
+@Test
+public class MeasurementConverterTest extends AbstractEJB3Test {
+ private final double POSITIVE = 300;
+ private final double NEGATIVE = -42;
+
+ private final String[] WHITESPACE = new String[] { " ", "\f", "\n", "\r", "\t" };
+
+ private ThreadLocal<Integer> precisionScalingTestCount = null;
+
+ private void incrementPrecisionScalingTestCount() {
+ if (precisionScalingTestCount == null) {
+ precisionScalingTestCount = new ThreadLocal<Integer>() {
+ @Override
+ protected Integer initialValue() {
+ return 0;
+ }
+ };
+ }
+ precisionScalingTestCount.set(precisionScalingTestCount.get() + 1);
+ }
+
+ @Test(groups = "integration.ejb3", enabled = false)
+ // TODO fix me
+ public void testPrecisionScaling() throws Exception {
+
+ // if all values are equal, it will format to the max precision
+
+ testPrecisionScaling(new double[] { 1.41, 1.41, 1.41, 1.41, 1.41 }, MeasurementUnits.NONE, new String[] {
+ "1.41", "1.41", "1.41", "1.41", "1.41" }, MeasurementUnits.NONE);
+
+ // if all values are unique, it won't need to format any of them to more digits
+ testPrecisionScaling(new double[] { 1.41, 1.42, 1.43, 1.44, 1.45 }, MeasurementUnits.NONE, new String[] {
+ "1.41", "1.42", "1.43", "1.44", "1.45" }, MeasurementUnits.NONE);
+
+ // even if only two are equal, it will scale all the way to max precision looking for uniqueness
+ testPrecisionScaling(new double[] { 1.4, 1.4, 1.5, 1.6, 1.7 }, MeasurementUnits.NONE, new String[] { "1.4",
+ "1.4", "1.5", "1.6", "1.7" }, MeasurementUnits.NONE);
+
+ // to final a "good looking" target scaling units, it will use the mathematical mean
+ // NOTE: formatting doesn't round up/down, thus introducing error from cutting digits (256 -> 0.2KB [instead of 0.25KB])
+ testPrecisionScaling(new double[] { 128, 256, 512, 1024, 8192 }, MeasurementUnits.BYTES, new String[] {
+ "0.1KB", "0.2KB", "0.5KB", "1KB", "8KB" }, MeasurementUnits.KILOBYTES);
+
+ // same test with negative numbers
+ testPrecisionScaling(new double[] { -128, -256, -512, -1024, -8192 }, MeasurementUnits.BYTES, new String[] {
+ "-0.1KB", "-0.2KB", "-0.5KB", "-1KB", "-8KB" }, MeasurementUnits.KILOBYTES);
+
+ // test self scaling relative units
+ testPrecisionScaling(new double[] { 0.0, 0.065, 1.0, 0.123456 }, MeasurementUnits.PERCENTAGE, new String[] {
+ "0%", "6.5%", "100%", "12.3%" }, MeasurementUnits.PERCENTAGE);
+
+ // test self scaling relative units
+ testPrecisionScaling(new double[] { 0.0621, 0.065, 0.0620, 0.6202 }, MeasurementUnits.PERCENTAGE, new String[] {
+ "6.21%", "6.5%", "6.2%", "62.02%" }, MeasurementUnits.PERCENTAGE);
+ }
+
+ private void testPrecisionScaling(double[] values, MeasurementUnits units, String[] expectedResults,
+ MeasurementUnits expectedUnits) {
+ incrementPrecisionScalingTestCount();
+
+ String[] results = MeasurementConverterClient.formatToSignificantPrecision(values, units, true);
+ for (int i = 0; i < results.length; i++) {
+ String expected = expectedResults[i];
+ String actual = results[i];
+
+ // The expected output is in Locale.US. Handle running the tests in a different default locale
+ if (expected.contains(".") && (!Locale.getDefault().equals(Locale.US))) {
+ Locale defaultLocale = Locale.getDefault();
+ Locale.setDefault(Locale.US);
+ MeasurementNumericValueAndUnits vu = MeasurementParser.parse(expected, expectedUnits);
+ Locale.setDefault(defaultLocale);
+ expected = MeasurementConverterClient.format(vu.getValue(), expectedUnits, false, null, 4);
+ }
+
+ assert actual.equals(expected) : "Test " + precisionScalingTestCount.get() + ": " + "Index " + i + ", "
+ + "Expected " + expected + ", " + "Received " + actual + ", " + "Units " + units.getName();
+ }
+ }
+
+ @Test(groups = "integration.ejb3", enabled = false)
+ // TODO fix me
+ public void testConversionSuccess() throws Exception {
+ // test the straight-forward, non-whitespace cases
+ for (MeasurementUnits units : MeasurementUnits.values()) {
+ validateFormatConvert(POSITIVE, units);
+ validateFormatConvert(NEGATIVE, units);
+ }
+
+ List<String> signVariations;
+ List<String> magnitudeVariations;
+ List<String> unitsVariations;
+
+ // use the same NumberFormat that the MeasurementConverter uses, so that we get the correct expected results
+ NumberFormat nf = DecimalFormat.getNumberInstance();
+ nf.setMinimumFractionDigits(1);
+ nf.setMaximumFractionDigits(1);
+
+ // test a couple hundred thousand variations of whitespace around each positive number with units
+ signVariations = getWhitespaceVariationsAroundSingleTokens("", "+");
+ magnitudeVariations = getWhitespaceVariationsAroundSingleTokens(nf.format(POSITIVE));
+ for (MeasurementUnits units : MeasurementUnits.values()) {
+ unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
+
+ // splice all combinations together and test conversion validity
+ for (String signVariation : signVariations) {
+ for (String magnitudeVariation : magnitudeVariations) {
+ if (MeasurementUnits.Family.RELATIVE == units.getFamily()) {
+ magnitudeVariation = nf.format(MeasurementUnits.scaleUp(nf.parse(magnitudeVariation.trim())
+ .doubleValue(), units));
+ }
+
+ for (String unitVariation : unitsVariations) {
+ String original = MeasurementConverterClient.format(POSITIVE, units, false);
+ String toBeTested = magnitudeVariation.trim() + unitVariation.trim();
+
+ assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
+ + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
+
+ validateConvert(POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
+ }
+ }
+ }
+ }
+
+ // test a couple hundred thousand variations of whitespace around each negative number with units
+ signVariations = getWhitespaceVariationsAroundSingleTokens("-");
+ for (MeasurementUnits units : MeasurementUnits.values()) {
+ unitsVariations = getWhitespaceVariationsAroundSingleTokens(units.toString());
+
+ for (String signVariation : signVariations) {
+ for (String magnitudeVariation : magnitudeVariations) {
+ if (units == MeasurementUnits.PERCENTAGE) {
+ magnitudeVariation = nf.format(100 * nf.parse(magnitudeVariation.trim()).doubleValue());
+ }
+
+ for (String unitVariation : unitsVariations) {
+ String original = MeasurementConverterClient.format(-POSITIVE, units, false);
+ String toBeTested = "-" + magnitudeVariation.trim() + unitVariation.trim();
+
+ assert original.equals(toBeTested) : "Error constructing whitespace string: " + "Expected '"
+ + original + "', " + "Received '" + toBeTested + "' " + "for units '" + units.name() + "'";
+
+ validateConvert(-POSITIVE, signVariation + magnitudeVariation + unitVariation, units);
+ }
+ }
+ }
+ }
+ }
+
+ @Test(groups = "integration.ejb3")
+ public void testScalingSuccess() throws Exception {
+ // Family.BYTES
+ validateScaleAndInverse(1024.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.KILOBYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.MEGABYTES);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.GIGABYTES);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.MEGABYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.GIGABYTES);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.GIGABYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.TERABYTES);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.TERABYTES, 1.0, MeasurementUnits.PETABYTES);
+
+ // Family.BITS
+ validateScaleAndInverse(1024.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.KILOBITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.MEGABITS);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.GIGABITS);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1125899906842624.0, MeasurementUnits.BITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.MEGABITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.GIGABITS);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1099511627776.0, MeasurementUnits.KILOBITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.GIGABITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1073741824.0, MeasurementUnits.MEGABITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.TERABITS);
+ validateScaleAndInverse(1048576.0, MeasurementUnits.GIGABITS, 1.0, MeasurementUnits.PETABITS);
+
+ validateScaleAndInverse(1024.0, MeasurementUnits.TERABITS, 1.0, MeasurementUnits.PETABITS);
+
+ // Family.DURATION
+ validateScaleAndInverse(1000.0, MeasurementUnits.EPOCH_MILLISECONDS, 1.0, MeasurementUnits.EPOCH_SECONDS);
+
+ // Family.TIME
+ validateScaleAndInverse(1000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.SECONDS);
+ validateScaleAndInverse(60000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.MINUTES);
+ validateScaleAndInverse(3600000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.HOURS);
+ validateScaleAndInverse(86400000.0, MeasurementUnits.MILLISECONDS, 1.0, MeasurementUnits.DAYS);
+
+ validateScaleAndInverse(60.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.MINUTES);
+ validateScaleAndInverse(3600.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.HOURS);
+ validateScaleAndInverse(86400.0, MeasurementUnits.SECONDS, 1.0, MeasurementUnits.DAYS);
+
+ validateScaleAndInverse(60.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.HOURS);
+ validateScaleAndInverse(1440.0, MeasurementUnits.MINUTES, 1.0, MeasurementUnits.DAYS);
+
+ validateScaleAndInverse(24.0, MeasurementUnits.HOURS, 1.0, MeasurementUnits.DAYS);
+ }
+
+ private void validateScaleAndInverse(double fromValue, MeasurementUnits fromUnits, double toValue,
+ MeasurementUnits toUnits) {
+ validateScale(fromValue, fromUnits, toValue, toUnits);
+ validateScale(toValue, toUnits, fromValue, fromUnits);
+ }
+
+ private void validateScale(double fromValue, MeasurementUnits fromUnits, double toValue, MeasurementUnits toUnits) {
+ MeasurementNumericValueAndUnits valueAndUnits = new MeasurementNumericValueAndUnits(fromValue, fromUnits);
+ try {
+ double derived = MeasurementConverterClient.scale(valueAndUnits, toUnits);
+ assert Math.abs(toValue - derived) < 1e-9 : "Scale conversion error: " +
+
+ "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
+ + fromUnits + "', " +
+
+ "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
+ + toUnits + "', " +
+
+ "Received value '" + derived + "'";
+
+ } catch (MeasurementConversionException mce) {
+ assert false : "Unexpected MeasurementConversionException: " +
+
+ "From value '" + fromValue + "', " + "with units of '" + fromUnits.name() + "', " + "displayed as '"
+ + fromUnits + "', " +
+
+ "To value '" + toValue + "', " + "with units of '" + toUnits.name() + "', " + "displayed as '"
+ + toUnits;
+ }
+ }
+
+ private void validateFormatConvert(double value, MeasurementUnits units) {
+ validateFormatConvert(value, value, units);
+ }
+
+ private void validateFormatConvert(double passedValue, double expectedValue, MeasurementUnits units) {
+ try {
+ String intermediate = MeasurementConverterClient.format(passedValue, units, false);
+ MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
+
+ assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
+ + passedValue
+ + "', "
+ + "units input was '"
+ + units.name()
+ + "', "
+ +
+
+ "intermediate string was '"
+ + intermediate
+ + "', "
+ +
+
+ "Expected value '"
+ + expectedValue
+ + "', "
+ + "with units of '"
+ + units.name()
+ + "', "
+ + "displayed as '"
+ + units
+ + "', "
+ +
+
+ "Received value '"
+ + results.getValue()
+ + "', "
+ + "with units of '"
+ + results.getUnits().getName()
+ + "', " + "displayed as '" + results.getUnits() + "'";
+ } catch (MeasurementConversionException mce) {
+ assert false : "Error during conversion: " + mce.getMessage();
+ }
+ }
+
+ private void validateConvert(double value, String intermediate, MeasurementUnits units) {
+ validateConvert(value, value, intermediate, units);
+ }
+
+ private void validateConvert(double passedValue, double expectedValue, String intermediate, MeasurementUnits units) {
+ try {
+ MeasurementNumericValueAndUnits results = MeasurementParser.parse(intermediate, units);
+
+ assert (Math.abs(results.getValue() - expectedValue) < 1e-9 && results.getUnits() == units) : "double input was '"
+ + passedValue
+ + "', "
+ + "units input was '"
+ + units.name()
+ + "', "
+ +
+
+ "intermediate string was '"
+ + intermediate
+ + "', "
+ +
+
+ "Expected value '"
+ + expectedValue
+ + "', "
+ + "with units of '"
+ + units.name()
+ + "', "
+ + "displayed as '"
+ + units
+ + "', "
+ +
+
+ "Received value '"
+ + results.getValue()
+ + "', "
+ + "with units of '"
+ + results.getUnits().getName()
+ + "', " + "displayed as '" + results.getUnits() + "'";
+ } catch (MeasurementConversionException mce) {
+ assert false : "Error during conversion: " + mce.getMessage();
+ }
+ }
+
+ private List<String> getWhitespaceVariationsAroundSingleTokens(String... tokens) {
+ List<String> variations = new ArrayList<String>();
+
+ for (String token : tokens) {
+ for (String white : WHITESPACE) {
+ variations.add(token);
+ //variations.add( token + white );
+ //variations.add( white + token );
+ //variations.add( white + token + white );
+
+ variations.add(token + white + white);
+ //variations.add( white + white + token );
+ //variations.add( white + white + token + white + white );
+ }
+ }
+
+ return variations;
+ }
+
+}
1
0