[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml | 5 +---
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml | 7 ++----
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml | 11 ++++------
modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml | 5 +---
4 files changed, 12 insertions(+), 16 deletions(-)
New commits:
commit d38adb6b40ef0208b8c4c953b64d17a65e5b80b8
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 15 10:43:59 2010 +0100
Adjust values to follow the recent changes for minimum in the xsd
diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
index f338aed..db954f5 100644
--- a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
+++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml
@@ -2,12 +2,11 @@
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
-
+
<server name="testServer1">
<metric displayName="One" property="connectionCount1" displayType="detail" />
<metric displayName="Two" property="connectionCount2" displayType="detail" />
<metric displayName="Three" property="connectionCount3" displayType="detail" />
- <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="10000" />
+ <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="30000" />
</server>
</plugin>
-
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml
index 5a55a14..6ba4994 100644
--- a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml
+++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml
@@ -2,14 +2,13 @@
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
-
+
<server name="testServer1">
<metric displayName="One" property="connectionCount1" displayType="detail" />
<metric displayName="Two" property="connectionCount2" displayType="detail" />
<metric displayName="Three" property="connectionCount3" displayType="detail" />
- <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="10000" />
-
+ <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="30000" />
+
</server>
</plugin>
-
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml
index 83ab179..419e171 100644
--- a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml
+++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml
@@ -2,20 +2,19 @@
version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
-
+
<server name="testServer1">
<!-- one is gone -->
-
+
<!-- two stays as is-->
<metric displayName="Two" property="connectionCount2" displayType="detail" />
<!-- three is changed (display type) -->
<metric displayName="Three" property="connectionCount3" displayType="summary" />
<!-- four is new -->
<metric displayName="Four" property="connectionCount4" displayType="detail" />
- <!-- five is changed as well (defaultInterval) -->
- <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="20000" />
-
+ <!-- five is changed as well (defaultInterval) -->
+ <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="50000" />
+
</server>
</plugin>
-
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
index 494aa9f..614da65 100644
--- a/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
+++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml
@@ -2,7 +2,7 @@
version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin">
-
+
<platform name="myPlatform4">
<server name="testServer1">
<metric displayName="One" property="connectionCount1" displayType="detail" />
@@ -10,8 +10,7 @@
<server name="testServer2">
<metric displayName="Two" property="connectionCount2" displayType="detail" />
<metric displayName="Three" property="connectionCount3" displayType="detail" />
- <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="10000" />
+ <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="30000" />
</server>
</platform>
</plugin>
-
\ No newline at end of file
13 years, 6 months
[rhq] 5 commits - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 40 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java | 31 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java | 104 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java | 53 ++++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 9
modules/enterprise/gui/coregui/src/main/webapp/images/global/upload.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/global/upload_Disabled.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_16_Disabled.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_16_Disabled.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_16_Disabled.png |binary
12 files changed, 168 insertions(+), 79 deletions(-)
New commits:
commit 55fee749e142292c64870dae38cca0bc27ad321b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 14 23:02:45 2010 -0500
fixing more things to get the upload buttons to render appropriately
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
index 3a7f062..286e382 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
@@ -30,6 +30,8 @@ import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.FormItemIcon;
import com.smartgwt.client.widgets.form.fields.HiddenItem;
import com.smartgwt.client.widgets.form.fields.UploadItem;
+import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
@@ -185,9 +187,23 @@ public class FileUploadForm extends DynamicCallbackForm {
onDrawItems.add(fileUploadItem);
if (showUploadButton) {
- fileUploadItem.setEndRow(false);
+ // this intercepts an enable request and only allows it if there is a file selected
+ class EnableInterceptingButtonItem extends ButtonItem {
+ EnableInterceptingButtonItem(String name) {
+ super(name);
+ }
+
+ @Override
+ public void enable() {
+ String selectedFile = fileUploadItem.getValueAsString();
+ if (selectedFile != null && selectedFile.length() > 0) {
+ super.enable();
+ }
+ }
+ }
- uploadButton = new ButtonItem(MSG.view_upload_upload());
+ uploadButton = new EnableInterceptingButtonItem(MSG.view_upload_upload());
+ uploadButton.setDisabled(true);
uploadButton.setColSpan(1);
uploadButton.setStartRow(false);
uploadButton.setAutoFit(true);
@@ -197,6 +213,15 @@ public class FileUploadForm extends DynamicCallbackForm {
submitForm();
}
});
+
+ fileUploadItem.setEndRow(false);
+ fileUploadItem.addChangeHandler(new ChangeHandler() {
+ @Override
+ public void onChange(ChangeEvent changeEvent) {
+ uploadButton.setDisabled(false);
+ }
+ });
+
onDrawItems.add(uploadButton);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
index b147fe5..7bf4536 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
@@ -65,6 +65,7 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
setNumCols(4);
textFile = new UploadItem("textFile", MSG.view_upload_prompt_2());
+ textFile.setColSpan(1);
textFile.setEndRow(false);
textFile.setWrapTitle(false);
@@ -89,12 +90,15 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
uploadButton.setDisabled(true);
textFile.addChangeHandler(new ChangeHandler() {
+ @Override
public void onChange(ChangeEvent changeEvent) {
uploadButton.setDisabled(false);
+ uploadButton.setShowIcons(false);
}
});
uploadButton.addClickHandler(new ClickHandler() {
+ @Override
public void onClick(ClickEvent clickEvent) {
String selectedFile = textFile.getValueAsString();
if (selectedFile != null && selectedFile.length() > 0) {
@@ -103,6 +107,7 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
submitForm();
} else {
uploadButton.disable(); // no file selected, it shouldn't be able to be pressed
+ uploadButton.setShowIcons(false);
}
}
});
@@ -125,18 +130,26 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
*/
public void retrievalStatus(boolean ok) {
if (uploadButton != null) {
- FormItemIcon loadedIcon = new FormItemIcon();
+ String iconSrc;
+ Message msg;
+
if (ok) {
- loadedIcon.setSrc(ImageManager.getAvailabilityIcon(Boolean.TRUE));
- CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_success(), Severity.Info));
+ iconSrc = ImageManager.getAvailabilityIcon(Boolean.TRUE);
+ msg = new Message(MSG.view_upload_success(), Severity.Info);
} else {
- loadedIcon.setSrc(ImageManager.getAvailabilityIcon(Boolean.FALSE));
- CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_error_file(), Severity.Error));
+ iconSrc = ImageManager.getAvailabilityIcon(Boolean.FALSE);
+ msg = new Message(MSG.view_upload_error_file(), Severity.Error);
}
+
+ FormItemIcon loadedIcon = new FormItemIcon();
+ loadedIcon.setSrc(iconSrc);
loadedIcon.setWidth(16);
loadedIcon.setHeight(16);
uploadButton.setIcons(loadedIcon);
uploadButton.setShowIcons(true);
+ markForRedraw();
+
+ CoreGUI.getMessageCenter().notify(msg);
}
}
}
commit 9d4870731c6229c1469074cd2a4042c7969097ef
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 14 21:53:41 2010 -0500
this fixes a bunch of little things in the create wizard's first step.
makes sure components are disabled/greyed out at the appropriate times
and re-enabled at the appropriate times.
also adds a upload icon to make it purdy
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
index e13b67e..bdc647a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -24,6 +24,13 @@ public class ImageManager {
public static final String IMAGES_DIR = "images/";
/**
+ * Returns a generic "upload" icon.
+ */
+ public static String getUploadIcon() {
+ return "global/upload.png";
+ }
+
+ /**
* Returns a generic edit icon.
*/
public static String getEditIcon() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index 15f1afa..32df859 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -25,8 +25,8 @@ import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.FormSubmitFailedEvent;
import com.smartgwt.client.widgets.form.events.FormSubmitFailedHandler;
+import com.smartgwt.client.widgets.form.fields.ButtonItem;
import com.smartgwt.client.widgets.form.fields.CanvasItem;
-import com.smartgwt.client.widgets.form.fields.LinkItem;
import com.smartgwt.client.widgets.form.fields.TextAreaItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
@@ -36,6 +36,7 @@ import org.rhq.core.domain.bundle.BundleVersion;
import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.form.RadioGroupWithComponentsItem;
import org.rhq.enterprise.gui.coregui.client.components.upload.BundleDistributionFileUploadForm;
import org.rhq.enterprise.gui.coregui.client.components.upload.DynamicCallbackForm;
@@ -160,9 +161,9 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
recipeForm.setMargin(Integer.valueOf(20));
recipeForm.setShowInlineErrors(false);
- final LinkItem showUpload = new LinkItem("recipeUploadLink");
- showUpload.setValue(MSG.view_bundle_createWizard_clickToUploadRecipe());
- showUpload.setShowTitle(false);
+ final ButtonItem showUpload = new ButtonItem("recipeUploadLink", MSG
+ .view_bundle_createWizard_clickToUploadRecipe());
+ showUpload.setIcon(ImageManager.getUploadIcon());
final CanvasItem upload = new CanvasItem("recipeUploadCanvas");
upload.setShowTitle(false);
@@ -173,8 +174,9 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
showUpload.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- recipeForm.hideItem(showUpload.getName());
- recipeForm.showItem(upload.getName());
+ showUpload.hide();
+ upload.show();
+ recipeForm.markForRedraw();
}
});
@@ -190,8 +192,9 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
wizard.setRecipe(event.getResults());
recipe.setValue(event.getResults());
textFileRetrieverForm.retrievalStatus(true);
- recipeForm.showItem(showUpload.getName());
- recipeForm.hideItem(upload.getName());
+ showUpload.show();
+ upload.hide();
+ recipeForm.markForRedraw();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java
index 2fb9688..9412237 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java
@@ -28,6 +28,7 @@ import java.util.LinkedHashMap;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.ButtonItem;
import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.RadioGroupItem;
@@ -119,16 +120,32 @@ public class RadioGroupWithComponentsItem extends CanvasItem {
canvas.getItem(key).clearValue();
canvas.getItem(key).redraw();
}
- if (value != null && value instanceof DynamicForm) {
- if (!disabled.equals(value.isDisabled())) {
- value.setDisabled(disabled);
- for (FormItem item : ((DynamicForm) value).getFields()) {
- item.clearValue();
- item.redraw();
+ disableAllFormFields(value, disabled);
+ }
+ }
+
+ private void disableAllFormFields(Canvas value, Boolean disabled) {
+ if (value != null && value instanceof DynamicForm) {
+ for (FormItem item : ((DynamicForm) value).getFields()) {
+ if (item instanceof CanvasItem) {
+ // recursively drill down in case this is a dynamic form inside a dynamic form
+ disableAllFormFields(((CanvasItem) item).getCanvas(), disabled);
+ }
+
+ if (disabled) {
+ item.clearValue();
+ item.redraw();
+ if (item instanceof ButtonItem) {
+ item.disable();
+ }
+ } else {
+ if (item instanceof ButtonItem) {
+ item.enable();
}
- value.markForRedraw();
}
}
+ value.setDisabled(disabled);
+ value.markForRedraw();
}
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
index ee1d1de..3a7f062 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
@@ -191,6 +191,7 @@ public class FileUploadForm extends DynamicCallbackForm {
uploadButton.setColSpan(1);
uploadButton.setStartRow(false);
uploadButton.setAutoFit(true);
+ uploadButton.setIcon(ImageManager.getUploadIcon());
uploadButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
submitForm();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
index 3eae1f8..b147fe5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
@@ -66,8 +66,25 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
textFile = new UploadItem("textFile", MSG.view_upload_prompt_2());
textFile.setEndRow(false);
+ textFile.setWrapTitle(false);
- uploadButton = new ButtonItem("Upload");
+ // this intercepts an enable request and only allows it if there is a file selected
+ class EnableInterceptingButtonItem extends ButtonItem {
+ EnableInterceptingButtonItem(String name) {
+ super(name);
+ }
+
+ @Override
+ public void enable() {
+ String selectedFile = textFile.getValueAsString();
+ if (selectedFile != null && selectedFile.length() > 0) {
+ super.enable();
+ }
+ }
+ }
+
+ uploadButton = new EnableInterceptingButtonItem(MSG.view_upload_upload());
+ uploadButton.setIcon(ImageManager.getUploadIcon());
uploadButton.setStartRow(false);
uploadButton.setDisabled(true);
@@ -79,9 +96,14 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
uploadButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- uploadButton.setShowIcons(true);
- markForRedraw();
- submitForm();
+ String selectedFile = textFile.getValueAsString();
+ if (selectedFile != null && selectedFile.length() > 0) {
+ uploadButton.setShowIcons(true);
+ markForRedraw();
+ submitForm();
+ } else {
+ uploadButton.disable(); // no file selected, it shouldn't be able to be pressed
+ }
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index dc736de..0654519 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -989,7 +989,7 @@ view_bundle_createWizard_urlOption = URL
view_bundle_createWizard_uploadOption = Upload
view_bundle_createWizard_recipeOption = Recipe
view_bundle_createWizard_provideBundleDistro = Provide a Bundle Distribution
-view_bundle_createWizard_clickToUploadRecipe = Click to upload a recipe file
+view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file
view_bundle_createWizard_createFailure = Failed to create the bundle
view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}]
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/global/upload.png b/modules/enterprise/gui/coregui/src/main/webapp/images/global/upload.png
new file mode 100644
index 0000000..335a235
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/global/upload.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/global/upload_Disabled.png b/modules/enterprise/gui/coregui/src/main/webapp/images/global/upload_Disabled.png
new file mode 100644
index 0000000..dec31e9
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/global/upload_Disabled.png differ
commit e81a2719637d4f30e113f92b40f6c5be5db94fe5
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 14 19:26:17 2010 -0500
short circuit when no bundle file/recipe is supplied
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index d06ad6c..15f1afa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -203,6 +203,13 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
private void processUrl() {
String urlString = (String) this.urlTextItem.getValue();
+ if (urlString == null || urlString.trim().length() == 0) {
+ wizard.getView().showMessage(MSG.view_bundle_createWizard_enterUrl());
+ wizard.setBundleVersion(null);
+ setButtonsDisableMode(false);
+ return;
+ }
+
BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService();
bundleServer.createBundleVersionViaURL(urlString, new AsyncCallback<BundleVersion>() {
public void onSuccess(BundleVersion result) {
@@ -257,7 +264,16 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
}
private void processRecipe() {
- this.wizard.setRecipe((String) this.recipeForm.getItem("recipeText").getValue());
+ String recipeString = (String) this.recipeForm.getItem("recipeText").getValue();
+
+ if (recipeString == null || recipeString.trim().length() == 0) {
+ wizard.getView().showMessage(MSG.view_bundle_createWizard_enterRecipe());
+ wizard.setBundleVersion(null);
+ setButtonsDisableMode(false);
+ return;
+ }
+
+ this.wizard.setRecipe(recipeString);
BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService();
bundleServer.createBundleVersionViaRecipe(this.wizard.getRecipe(), new AsyncCallback<BundleVersion>() {
public void onSuccess(BundleVersion result) {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index ab5d9c0..dc736de 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -976,6 +976,8 @@ view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of
view_bundle_createWizard_noBundleTypesSupported = No bundle types are supported - you must deploy a valid plugin that supports bundle deployments
view_bundle_createWizard_noBundleTypesAvail = No bundle types are available
view_bundle_createWizard_loadBundleFileFailure = Cannot obtain bundle file information from server
+view_bundle_createWizard_enterUrl = Please enter a valid URL where the bundle distribution file can be downloaded from
+view_bundle_createWizard_enterRecipe = Please supply a valid recipe
view_bundle_createWizard_uploadInProgress = Upload is in progress... This can take several minutes for large files
view_bundle_createWizard_uploadStepName = Upload Bundle Files
view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle
commit 338008671aa986d0e67ada3ea1ce333fe5e7f484
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 14 19:17:17 2010 -0500
bz 616261 fix the broken icons
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
index e2ae778..ee1d1de 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
@@ -29,7 +29,6 @@ import com.smartgwt.client.widgets.form.fields.ButtonItem;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.FormItemIcon;
import com.smartgwt.client.widgets.form.fields.HiddenItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.UploadItem;
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
@@ -50,7 +49,6 @@ public class FileUploadForm extends DynamicCallbackForm {
private UploadItem fileUploadItem;
private ButtonItem uploadButton;
- private StaticTextItem icon;
private Boolean uploadResult;
private String uploadError;
@@ -148,18 +146,23 @@ public class FileUploadForm extends DynamicCallbackForm {
Object value = fileUploadItem.getValue();
if (value == null || value.toString().length() == 0) {
String message = MSG.view_upload_prompt_1(name);
- icon.setIcons(iconRed);
- icon.setTooltip(message);
+ changeIcon(iconRed, message);
setUploadError(message);
// note - don't even submit this definite failure
} else {
- icon.setIcons(iconLoading);
- icon.setTooltip(MSG.common_msg_loading());
+ changeIcon(iconLoading, MSG.common_msg_loading());
uploadInProgress = true;
super.submitForm();
}
}
+ protected void changeIcon(FormItemIcon icon, String tooltip) {
+ FormItem item = (this.showUploadButton) ? this.uploadButton : this.fileUploadItem;
+ item.setIcons(icon);
+ item.setIconPrompt(tooltip);
+ markForRedraw();
+ }
+
protected List<FormItem> getOnDrawItems() {
List<FormItem> onDrawItems = new ArrayList<FormItem>();
@@ -176,40 +179,37 @@ public class FileUploadForm extends DynamicCallbackForm {
onDrawItems.add(versionField);
fileUploadItem = new UploadItem("fileUploadItem", name);
- fileUploadItem.setEndRow(false);
fileUploadItem.setShowTitle(showNameLabel);
+ fileUploadItem.setWrapTitle(false);
+ fileUploadItem.setColSpan(1);
onDrawItems.add(fileUploadItem);
- uploadButton = new ButtonItem(MSG.view_upload_upload());
- uploadButton.setVisible(this.showUploadButton);
- uploadButton.setStartRow(false);
- uploadButton.setEndRow(false);
- uploadButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent clickEvent) {
- submitForm();
- }
- });
- onDrawItems.add(uploadButton);
+ if (showUploadButton) {
+ fileUploadItem.setEndRow(false);
+
+ uploadButton = new ButtonItem(MSG.view_upload_upload());
+ uploadButton.setColSpan(1);
+ uploadButton.setStartRow(false);
+ uploadButton.setAutoFit(true);
+ uploadButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ submitForm();
+ }
+ });
+ onDrawItems.add(uploadButton);
+ }
- icon = new StaticTextItem("icon");
- icon.setStartRow(false);
- icon.setShowTitle(false);
if (uploadResult != null) {
if (uploadResult.booleanValue()) {
- icon.setIcons(iconGreen);
- icon.setTooltip(MSG.view_upload_alreadyUploaded());
+ changeIcon(iconGreen, MSG.view_upload_alreadyUploaded());
} else {
String message = MSG.view_upload_tooltip_2();
- icon.setIcons(iconRed);
- icon.setTooltip(message);
+ changeIcon(iconRed, message);
setUploadError(message);
}
} else {
- icon.setIcons(iconGrey);
- icon.setTooltip(MSG.view_upload_tooltip_1());
+ changeIcon(iconGrey, (showUploadButton) ? MSG.view_upload_tooltip_1a() : MSG.view_upload_tooltip_1b());
}
- icon.setShowIcons(true);
- onDrawItems.add(icon);
return onDrawItems;
}
@@ -222,22 +222,15 @@ public class FileUploadForm extends DynamicCallbackForm {
String results = event.getResults();
if (processSubmitCompleteResults(results)) {
uploadResult = Boolean.TRUE;
- icon.setIcons(iconGreen);
- icon.setTooltip(MSG.view_upload_success());
+ changeIcon(iconGreen, MSG.view_upload_success());
CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_success(), results, Severity.Info));
- icon.hide();
- icon.show();
} else {
uploadResult = Boolean.FALSE;
String cause = "[" + name + "] " + parseCauseFromResponse(results);
- icon.setIcons(iconRed);
- icon.setTooltip(cause);
+ changeIcon(iconRed, cause);
setUploadError(cause);
- icon.setTooltip(cause);
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_upload_error_fileName(name), results, Severity.Error));
- icon.hide();
- icon.show();
}
}
};
@@ -250,12 +243,9 @@ public class FileUploadForm extends DynamicCallbackForm {
uploadResult = Boolean.FALSE;
String cause = MSG.view_upload_error_fileName_2(name);
- icon.setIcons(iconRed);
- icon.setTooltip(cause);
+ changeIcon(iconRed, cause);
setUploadError(cause);
CoreGUI.getMessageCenter().notify(new Message(cause, Severity.Error));
- icon.hide();
- icon.show();
}
};
}
@@ -265,13 +255,7 @@ public class FileUploadForm extends DynamicCallbackForm {
super.onDraw();
List<FormItem> onDrawItems = getOnDrawItems();
- int numCols = 0;
- for (FormItem fi : onDrawItems) {
- if (!(fi instanceof HiddenItem)) {
- ++numCols;
- }
- }
- setNumCols(numCols);
+ setNumCols(((this.showUploadButton) ? 2 : 1) + ((this.showNameLabel) ? 1 : 0));
setItems(onDrawItems.toArray(new FormItem[onDrawItems.size()]));
// push the form handler so it executes first if the form creator has also added a handler
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index f5d15c3..ab5d9c0 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1105,9 +1105,10 @@ view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid fil
view_upload_error_packageVersionFile = Error uploading Package Version File
view_upload_error_results = Error uploading file, unexpected results: [{0}]
view_upload_inProgress = Can not submit, upload is currently in progress
-view_upload_prompt_1 = [{0}] File to Upload
+view_upload_prompt_1 = Please select a file to upload [{0}]
view_upload_prompt_2 = File to Upload
-view_upload_tooltip_1 = Select a file to upload, then click Upload or Next
+view_upload_tooltip_1a = Select a file to upload, then click Upload or Next
+view_upload_tooltip_1b = Select a file to upload, then click Next
view_upload_tooltip_2 = File upload had previously failed
view_upload_success = File successfully uploaded
view_upload_upload = Upload
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_16_Disabled.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_16_Disabled.png
new file mode 100644
index 0000000..4131950
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_16_Disabled.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_16_Disabled.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_16_Disabled.png
new file mode 100644
index 0000000..666da45
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_16_Disabled.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_16_Disabled.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_16_Disabled.png
new file mode 100644
index 0000000..8e1ff7d
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_16_Disabled.png differ
commit 131052fc2f6c294910d93323699a0a5ff0b6d832
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 14 15:49:10 2010 -0500
fix the concise message - make it small, the full error msg is the details
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java
index a5490bf..6b90111 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java
@@ -226,8 +226,7 @@ public class BundleUploadDataStep extends AbstractWizardStep {
if (sendToMessageCenter) {
CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_bundle_createWizard_failedToUploadDistroFile() + ": " + errorMessage,
- Severity.Error));
+ new Message(MSG.view_bundle_createWizard_failedToUploadDistroFile(), errorMessage, Severity.Error));
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index b776302..d06ad6c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -293,8 +293,7 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
if (sendToMessageCenter) {
CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_bundle_createWizard_failedToUploadDistroFile() + ": " + errorMessage,
- Severity.Error));
+ new Message(MSG.view_bundle_createWizard_failedToUploadDistroFile(), errorMessage, Severity.Error));
}
}
}
13 years, 6 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 14 +++++-----
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 5 ++-
2 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit a70b0b2c11e7b7be8f27013f18c3e060ebfb6028
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 21:07:29 2010 +0100
Catch a possible NPE and prevent explict call to start as this is done in AbstractEJB3Test and also re-arrange for cleanup.
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 e43e3f9..19b2e8e 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
@@ -48,7 +48,6 @@ import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
-import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementDataRequest;
import org.rhq.core.domain.measurement.ResourceMeasurementScheduleRequest;
@@ -113,15 +112,16 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
public void afterClass() throws Exception {
unprepareForTestAgents();
unprepareScheduler();
- }
-
- @BeforeTest
- public void beforeTest() throws Exception {
- startTest();
- // cleanup anything left over from a previous, interrupted run.
cleanupTest();
}
+// @BeforeTest
+// public void beforeTest() throws Exception {
+//// startTest(); Done in super.@BeforeMethod already ??
+// // cleanup anything left over from a previous, interrupted run.
+// cleanupTest();
+// }
+
protected ResourceType getResourceType(String typeName) {
return getResourceType(typeName, PLUGIN_NAME);
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 1bd4600..c75e462 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -144,7 +144,10 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
}
}
- start = stats.getQueryExecutionCount();
+ if (stats!=null)
+ start = stats.getQueryExecutionCount();
+ else
+ start = 0;
}
public static Connection getConnection() throws SQLException {
13 years, 6 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit a3c0dd9e67de3c26858840e4ba9bf2ba567732ef
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 17:53:13 2010 +0100
Pull into one method that is executed ahead of the test
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java
index cd2291d..a2936db 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java
@@ -8,7 +8,6 @@ import javax.persistence.Query;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
@@ -42,15 +41,12 @@ public class MeasurementViewManagerTest extends AbstractEJB3Test {
}
@BeforeMethod
- public void beforeSuite() throws Exception {
+ public void init() throws Exception {
viewManager = LookupUtil.getMeasurementViewManager();
subjectManager = LookupUtil.getSubjectManager();
overlord = subjectManager.getOverlord();
- }
- @BeforeTest
- public void beforeTest() throws Exception {
getTransactionManager().begin();
try {
EntityManager em = getEntityManager();
13 years, 6 months
[rhq] 2 commits - modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 04454683ca084b87270f073a11c6e162c8e7ecfd
Merge: 83175aa... 98b7898...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 17:15:20 2010 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 83175aa7541754e8172f2c945f88204083620a14
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 17:12:15 2010 +0100
More changes from BeforeSuite to BeforeMethod.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java
index abd0da4..cff1b0c 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java
@@ -28,6 +28,7 @@ import javax.xml.bind.util.ValidationEventCollector;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
@@ -36,7 +37,7 @@ import org.rhq.core.clientapi.descriptor.DescriptorPackages;
/**
* Try to validate the rhq-plugin.xml plugin descriptors
*
- * @author Heiko W. Rupp
+ * @author Heiko W. Rupp
* TODO get the plugins dynamically - see comment in {@link #testPluginDescriptors()}
*/
public class PluginDescriptorValidationTest extends UpdateSubsytemTestBase {
@@ -49,7 +50,7 @@ public class PluginDescriptorValidationTest extends UpdateSubsytemTestBase {
*/
String[] plugins = { "database", "postgres", "platform", "jmx", "rhq-agent", "apache" };
- @BeforeSuite
+ @BeforeMethod
@Override
protected void init() {
super.init();
13 years, 6 months
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 12 ++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 10 +----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 17 ++--------
3 files changed, 17 insertions(+), 22 deletions(-)
New commits:
commit 98b7898e296ca6a9bc26baafcf642ff7afefcd66
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Dec 14 10:47:24 2010 -0500
fix bug where content of Resource Summary>Activity subtab was not rendered on first selection of that subtab; change so ResourceSelectListeners are registered on ResourceDetailView and actually called when a Resource is selected (though there is currently no code that register selection listeners, so we can consider getting rid of the API altogether)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 50e994f..5fab7c4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -53,6 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.AbstractTwo
import org.rhq.enterprise.gui.coregui.client.inventory.common.event.EventCompositeHistoryView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceCompositeSearchView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ConfigurationHistoryView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationEditView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.PluginConfigurationEditView;
@@ -77,6 +78,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
private ResourceComposite resourceComposite;
+ private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>();
+
private TwoLevelTab summaryTab;
private TwoLevelTab monitoringTab;
private TwoLevelTab inventoryTab;
@@ -221,6 +224,9 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
protected void updateTabContent(ResourceComposite resourceComposite) {
this.resourceComposite = resourceComposite;
+ for (ResourceSelectListener selectListener : this.selectListeners) {
+ selectListener.onResourceSelected(this.resourceComposite);
+ }
Resource resource = this.resourceComposite.getResource();
getTitleBar().setResource(this.resourceComposite);
@@ -379,6 +385,10 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
return this.resourceId;
}
+ public void addResourceSelectListener(ResourceSelectListener listener) {
+ this.selectListeners.add(listener);
+ }
+
@Override
protected ResourceComposite getSelectedItem() {
return this.resourceComposite;
@@ -423,7 +433,6 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
new ResourceTypeRepository.TypeLoadedCallback() {
public void onTypesLoaded(ResourceType type) {
resourceComposite.getResource().setResourceType(type);
- ResourceDetailView.this.resourceComposite = resourceComposite;
updateTabContent(resourceComposite);
selectTab(getTabName(), getSubTabName(), viewPath);
}
@@ -440,4 +449,5 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
}
return false;
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index ffcfce4..35c6c21 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -80,7 +80,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupContextMenu;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.AutoGroupTreeNode;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.create.OperationCreateWizard;
@@ -105,8 +104,6 @@ public class ResourceTreeView extends LocatableVLayout {
private Menu resourceContextMenu;
private ResourceGroupContextMenu autoGroupContextMenu;
- private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>();
-
// Maps autogroup/type backing group ids to the corresponding autogroup/type nodes.
private Map<Integer, AutoGroupTreeNode> autoGroupNodeMap = new HashMap<Integer, AutoGroupTreeNode>();
@@ -300,7 +297,7 @@ public class ResourceTreeView extends LocatableVLayout {
private void updateSelection() {
- TreeNode selectedNode = null;
+ TreeNode selectedNode;
if (treeGrid != null && treeGrid.getTree() != null
&& (selectedNode = treeGrid.getTree().findById(selectedNodeId)) != null) {
@@ -820,10 +817,6 @@ public class ResourceTreeView extends LocatableVLayout {
}
*/
- public void addResourceSelectListener(ResourceSelectListener listener) {
- this.selectListeners.add(listener);
- }
-
public void renderView(ViewPath viewPath) {
currentViewId = viewPath.getCurrent();
String currentViewIdPath = currentViewId.getPath();
@@ -839,4 +832,5 @@ public class ResourceTreeView extends LocatableVLayout {
setSelectedResource(resourceId);
}
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
index 225f0c8..c7b6dee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
@@ -30,7 +30,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Ian Springer
*/
// TODO: Implement this.
-public class ActivityView extends LocatableVLayout implements ResourceSelectListener, RefreshableView {
+public class ActivityView extends LocatableVLayout implements RefreshableView {
private ResourceComposite resourceComposite;
private FullHTMLPane iFrame;
@@ -47,22 +47,13 @@ public class ActivityView extends LocatableVLayout implements ResourceSelectList
this.iFrame = new FullHTMLPane(extendLocatorId("IFrame"), null);
addMember(this.iFrame);
- if (this.resourceComposite != null) {
- onResourceSelected(this.resourceComposite);
- }
- }
-
- @Override
- public void onResourceSelected(ResourceComposite resourceComposite) {
- this.resourceComposite = resourceComposite;
+ refresh();
}
@Override
public void refresh() {
- if (this.iFrame != null) {
- this.iFrame.setContentsURL("/rhq/resource/summary/overview-plain.xhtml?id=" +
- this.resourceComposite.getResource().getId());
- }
+ int resourceId = this.resourceComposite.getResource().getId();
+ this.iFrame.setContentsURL("/rhq/resource/summary/overview-plain.xhtml?id=" + resourceId);
}
}
13 years, 6 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java | 4 ++--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBeanTest.java | 6 +++---
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java | 4 ++--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 4 ++--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceGroupManagerBeanTest.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 6763d2a6177fd73844bc7f9fc272da939c22e9ff
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 16:43:09 2010 +0100
More changes from BeforeSuite to BeforeMethod.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java
index bb7b9a2..cd2291d 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java
@@ -7,7 +7,7 @@ import javax.persistence.EntityManager;
import javax.persistence.Query;
import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -41,7 +41,7 @@ public class MeasurementViewManagerTest extends AbstractEJB3Test {
// TODO: jmarques - write unit tests for MeasurementViewManager
}
- @BeforeSuite
+ @BeforeMethod
public void beforeSuite() throws Exception {
viewManager = LookupUtil.getMeasurementViewManager();
subjectManager = LookupUtil.getSubjectManager();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBeanTest.java
index 3729a60..81b3aad 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBeanTest.java
@@ -23,7 +23,7 @@ import java.util.List;
import javax.persistence.EntityManager;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
@@ -54,7 +54,7 @@ public class ClusterManagerBeanTest extends AbstractEJB3Test {
private ResourceGroupManagerLocal resourceGroupManager;
private ResourceManagerLocal resourceManager;
- @BeforeSuite
+ @BeforeMethod
@SuppressWarnings( { "unused" })
private void init() {
clusterManager = LookupUtil.getClusterManager();
@@ -122,7 +122,7 @@ public class ClusterManagerBeanTest extends AbstractEJB3Test {
assertEquals(backingGroup.getClusterKey(), clusterKey.toString());
assertEquals(backingGroup.getClusterResourceGroup(), clusterGroup);
//Set<Resource> backingGroupResources = backingGroup.getExplicitResources();
- // explicitResources for backingGroup is lazy, so we need to hit resourceManager for the answer
+ // explicitResources for backingGroup is lazy, so we need to hit resourceManager for the answer
List<Resource> backingGroupResources = resourceManager.findExplicitResourcesByResourceGroup(subject,
backingGroup, PageControl.getUnlimitedInstance());
assertEquals(backingGroupResources.size(), resources.size());
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java
index 793a976..d6ab390 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java
@@ -25,7 +25,7 @@ import java.util.Random;
import javax.persistence.EntityManager;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
@@ -50,7 +50,7 @@ public class RecursiveResourceGroupTest extends AbstractEJB3Test {
private RoleManagerLocal roleManager;
private SubjectManagerLocal subjectManager;
- @BeforeSuite
+ @BeforeMethod
@SuppressWarnings({ "unused" })
private void init() {
resourceGroupManager = LookupUtil.getResourceGroupManager();
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 d8effb3..e43e3f9 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
@@ -39,7 +39,7 @@ import javax.xml.validation.SchemaFactory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService;
@@ -87,7 +87,7 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test {
protected static ResourceTypeManagerLocal resourceTypeManager;
protected static ResourceManagerLocal resourceManager;
- @BeforeSuite
+ @BeforeMethod
protected void init() {
try {
metadataManager = LookupUtil.getResourceMetadataManager();
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceGroupManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceGroupManagerBeanTest.java
index 340af16..a4c60ce 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceGroupManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceGroupManagerBeanTest.java
@@ -20,7 +20,7 @@ package org.rhq.enterprise.server.resource.test;
import javax.persistence.EntityManager;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
@@ -40,7 +40,7 @@ import org.rhq.enterprise.server.util.SessionTestHelper;
public class ResourceGroupManagerBeanTest extends AbstractEJB3Test {
private static ResourceGroupManagerLocal resourceGroupManager;
- @BeforeSuite
+ @BeforeMethod
@SuppressWarnings("unused")
private void init() {
try {
13 years, 6 months
[rhq] 2 commits - modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java | 1 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit dab1eabe1bd3f4bc1ba640c3a2cde5db3d7a6025
Merge: 11d549c... 1b03621...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 16:03:26 2010 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 11d549c4d83ca63b94670d0a1ff4670e82ce8667
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 16:03:01 2010 +0100
BeforeSuite may be too early.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java
index 181dccc..ccd8eec 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
import javax.persistence.EntityManager;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java
index dc708f5..ad390d4 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java
@@ -28,7 +28,7 @@ import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.auth.Subject;
@@ -47,7 +47,7 @@ import org.rhq.enterprise.server.test.AbstractEJB3Test;
import org.rhq.enterprise.server.util.LookupUtil;
/**
- * Tests around the event subsystem
+ * Tests around the event subsystem
* @author Heiko W. Rupp
*/
public class EventManagerTest extends AbstractEJB3Test {
@@ -55,7 +55,7 @@ public class EventManagerTest extends AbstractEJB3Test {
EventManagerLocal eventManager;
EntityManager em;
- @BeforeSuite
+ @BeforeMethod
public void init() {
try {
eventManager = LookupUtil.getEventManager();
@@ -90,7 +90,7 @@ public class EventManagerTest extends AbstractEJB3Test {
em.persist(ev);
em.flush();
- /*
+ /*
* do NOT use addEventData method until this test is refactored to support the fact that
* insertions made via direct SQL won't be visible to the entity manager in this xaction
*/
@@ -142,7 +142,7 @@ public class EventManagerTest extends AbstractEJB3Test {
//em.persist(ev);
//em.flush();
- /*
+ /*
* do NOT use addEventData method until this test is refactored to support the fact that
* insertions made via direct SQL won't be visible to the entity manager in this xaction
*/
13 years, 6 months
[rhq] modules/pom.xml
by Jay Shaughnessy
modules/pom.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 1b03621cccec1f55400611b67f29e3e5322c2053
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 14 09:45:17 2010 -0500
A while back the default profile's activation was changed to be active
if java.home is defined. The problem with that approach is that the
java.home property is typically defined, so default modules are
always activated. This causes duplicate module decls when trying to
use many other profiles, or minimally adds the default modules when
they are not wanted.
So, changing back. this may cause an issue for intellij maven plugin users
(as per the original commit comment)
Also, changed "model" profile to "coregui" profile. -Pcoregui will build
just CoreGui and its deps (domain,server jar), from the top level.
diff --git a/modules/pom.xml b/modules/pom.xml
index 231804e..35040d3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -29,9 +29,15 @@
<profile>
<id>default</id>
<activation>
+ <activeByDefault>true</activeByDefault>
+ <!-- The problem with the below approach is that the default modules are
+ always activated. This causes duplicate module decls when trying to use other
+ profiles, or adds the default modules when they are not wanted.
+
<property>
- <name>java.home</name>
+ <name>java.home</name>
</property>
+ -->
</activation>
<modules>
<module>core</module>
@@ -73,10 +79,10 @@
</profile>
<profile>
- <id>model</id>
+ <id>coregui</id>
<activation>
<property>
- <name>model</name>
+ <name>coregui</name>
</property>
</activation>
<modules>
13 years, 6 months
[rhq] modules/enterprise
by Heiko W. Rupp
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 616565e371522bf931e1b7c10917514a84963c02
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 14 15:30:14 2010 +0100
BeforeSuite may be too early.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java
index 2afafb7..181dccc 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java
@@ -26,6 +26,7 @@ import java.util.Set;
import javax.persistence.EntityManager;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
@@ -44,7 +45,7 @@ import org.rhq.enterprise.server.util.SessionTestHelper;
public class AuthorizationManagerBeanTest extends AbstractEJB3Test {
private AuthorizationManagerLocal authorizationManager;
- @BeforeSuite
+ @BeforeMethod
@SuppressWarnings( { "unused" })
private void init() {
try {
13 years, 6 months