modules/core/gui/pom.xml | 15 modules/core/gui/src/main/java/org/rhq/core/gui/model/DefaultPageControlSettingsUIBean.java | 6 modules/core/gui/src/main/java/org/rhq/core/gui/table/bean/AbstractPagedDataUIBean.java | 12 modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java | 41 -- modules/enterprise/gui/base-perspective-jar/pom.xml | 51 -- modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectivePagedDataUIBean.java | 8 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java | 4 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveUIBean.java | 13 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 31 - modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/components.xml | 16 modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/web.xml | 36 - modules/enterprise/gui/portal-war/pom.xml | 46 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java | 9 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java | 25 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java | 21 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java | 14 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java | 17 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationContextUIBean.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java | 21 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java | 29 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FacesMessagePropogationPhaseListener.java | 6 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java | 43 -- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java | 11 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/ViewGroupResourceConfigurationUIBean.java | 27 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/FileUploadComponent.java | 15 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationDefinitionComponent.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java | 26 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java | 20 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java | 12 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java | 49 +- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupPluginConfigurationUIBean.java | 27 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java | 10 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java | 13 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/perspectives/PerspectiveUIBean.java | 20 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestConditionalFormUIBean.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestDynamicRenderingUIBean.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/LookupComponent.java | 36 - modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml | 43 -- modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml | 4 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml | 48 -- modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 39 -- modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider.xhtml | 6 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/test/groovy/org/rhq/enterprise/gui/util/LookupComponentTest.groovy | 92 ----- modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml | 4 modules/enterprise/server/ear/pom.xml | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java | 184 ---------- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 6 modules/enterprise/server/plugins/alert-operations/pom.xml | 18 modules/enterprise/server/plugins/alert-roles/pom.xml | 16 modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/WEB-INF/components.xml | 16 modules/enterprise/server/plugins/perspectives/policy/perspective/src/main/resources/META-INF/rhq-serverplugin.xml | 3 58 files changed, 218 insertions(+), 1069 deletions(-)
New commits: commit bc20c0d433f4e1e8bbd58d6d48d0b8e44408f1c6 Author: John Mazzitelli mazz@redhat.com Date: Wed Sep 5 13:23:40 2012 -0400
rip out Seam since we don't want to upgrade it when porting the ear to run inside AS7. the only thing "broken" appears to be the content tab's file upload feature. that still needs to be fixed.
Conflicts:
modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java modules/enterprise/server/ear/pom.xml modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 69bfec8..85b00f0 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -19,7 +19,6 @@ <properties> <!-- dependency versions --> <el.version>1.0</el.version> - <seam.version>2.1.0.SP1</seam.version> </properties>
<dependencies> @@ -104,20 +103,6 @@ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </dependency>
- <!-- == Seam Related Dependencies ================ --> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies>
<profiles> diff --git a/modules/core/gui/src/main/java/org/rhq/core/gui/model/DefaultPageControlSettingsUIBean.java b/modules/core/gui/src/main/java/org/rhq/core/gui/model/DefaultPageControlSettingsUIBean.java index 49dfc32..334b145 100644 --- a/modules/core/gui/src/main/java/org/rhq/core/gui/model/DefaultPageControlSettingsUIBean.java +++ b/modules/core/gui/src/main/java/org/rhq/core/gui/model/DefaultPageControlSettingsUIBean.java @@ -18,17 +18,11 @@ */ package org.rhq.core.gui.model;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - import javax.faces.model.SelectItem;
/** * @author Ian Springer */ -@Name("DefaultPageControlSettingsUIBean") -@Scope(ScopeType.APPLICATION) public class DefaultPageControlSettingsUIBean { private static final int[] PAGE_SIZES = new int[] {15, 30, 45}; private static final SelectItem[] PAGE_SIZE_SELECT_ITEMS = new SelectItem[PAGE_SIZES.length]; diff --git a/modules/core/gui/src/main/java/org/rhq/core/gui/table/bean/AbstractPagedDataUIBean.java b/modules/core/gui/src/main/java/org/rhq/core/gui/table/bean/AbstractPagedDataUIBean.java index 8e8abe4..0116fa0 100644 --- a/modules/core/gui/src/main/java/org/rhq/core/gui/table/bean/AbstractPagedDataUIBean.java +++ b/modules/core/gui/src/main/java/org/rhq/core/gui/table/bean/AbstractPagedDataUIBean.java @@ -18,16 +18,15 @@ */ package org.rhq.core.gui.table.bean;
-import org.jboss.seam.annotations.In; -import org.jboss.seam.faces.FacesMessages; +import javax.faces.context.FacesContext; +import javax.faces.model.SelectItem; + import org.jetbrains.annotations.NotNull; + import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.UnlimitedPageControl; import org.rhq.core.gui.table.model.PagedListDataModel;
-import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; - /** * @author Ian Springer */ @@ -45,9 +44,6 @@ public abstract class AbstractPagedDataUIBean<T> { /** The number of specific pages to display on the data scroller - limit to 7 pages until we find a general fix for * RHQ-1813. */ private static final int DATA_SCROLLER_MAX_PAGES = 7; - - @In - protected FacesMessages facesMessages;
private PageControl pageControl; private PagedListDataModel<T> dataModel; diff --git a/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java b/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java index 650f667..0b9f1fe 100644 --- a/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java +++ b/modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java @@ -35,9 +35,6 @@ import javax.servlet.http.HttpServletResponse; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
-import org.jboss.seam.core.Manager; -import org.jboss.seam.util.Strings; - import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.exception.WrappedRemotingException;
@@ -156,21 +153,7 @@ public abstract class FacesContextUtility { * @param detail localized detail message text; if null, no detail will be included in the message */ public static void addMessage(@NotNull Severity severity, @NotNull String summary, @Nullable String detail) { - //Now that we're using Seam for some of the pages, we use different mechanisms for transferring messages - //across redirect boundaries. - //If we are inside a long running conversation, we want Seam to do its thing, otherwise - //FacesmessagePropogationPhaseListener will step in eventually. - if (Manager.instance().isReallyLongRunningConversation()) { - //nothing's easy... Seam StatusMessage (which we're creating here) considers empty string the same - //as null. If the message is then eventually shown on the page, the null detail is replaced with the - //summary which would leave us with the summary displayed twice on the page. - //Because the detail therefore must not be empty, we must resort to an ugly hack here and put in a unicode - //for non-breakable space: - String detailToUse = Strings.isEmpty(detail) ? "\u00a0" : detail; - //FacesMessages.instance().add(toSeverity(severity), null, null, summary, detailToUse); - } else { - getFacesContext().addMessage(null, new FacesMessage(severity, summary, (detail != null) ? detail : "")); - } + getFacesContext().addMessage(null, new FacesMessage(severity, summary, (detail != null) ? detail : "")); }
@NotNull @@ -271,24 +254,4 @@ public abstract class FacesContextUtility {
return detailMessage.toString(); } - - /** - * Convert a FacesMessage.Severity to a StatusMessage.Severity - * - * Taken from {@link org.jboss.seam.faces.FacesMessages} private method. - */ - private static org.jboss.seam.international.StatusMessage.Severity toSeverity( - javax.faces.application.FacesMessage.Severity severity) { - if (FacesMessage.SEVERITY_ERROR.equals(severity)) { - return org.jboss.seam.international.StatusMessage.Severity.ERROR; - } else if (FacesMessage.SEVERITY_FATAL.equals(severity)) { - return org.jboss.seam.international.StatusMessage.Severity.FATAL; - } else if (FacesMessage.SEVERITY_INFO.equals(severity)) { - return org.jboss.seam.international.StatusMessage.Severity.INFO; - } else if (FacesMessage.SEVERITY_WARN.equals(severity)) { - return org.jboss.seam.international.StatusMessage.Severity.WARN; - } else { - return null; - } - } -} \ No newline at end of file +} diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 576b18e..bfa8dda 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -19,10 +19,6 @@ <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> <richfaces.version>3.3.3.Final</richfaces.version> </properties> @@ -44,28 +40,6 @@ </dependency>
<dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>${seam.version}</version> - </dependency> - - <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> <version>${jboss-el.version}</version> @@ -125,31 +99,6 @@ </dependency>
<dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - <version>${seam.version}</version> - <!-- we should be pulling this in directly ourselves, not relying - jboss-seam-debug to provide it --> - <exclusions> - <exclusion> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </exclusion> - </exclusions> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> </dependency> diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectivePagedDataUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectivePagedDataUIBean.java index 27629db..2f080a5 100644 --- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectivePagedDataUIBean.java +++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectivePagedDataUIBean.java @@ -18,8 +18,6 @@ */ package org.rhq.enterprise.server.perspective;
-import org.jboss.seam.Component; -import org.jboss.seam.annotations.Create; import org.rhq.core.gui.table.bean.AbstractPagedDataUIBean;
/** @@ -31,11 +29,11 @@ import org.rhq.core.gui.table.bean.AbstractPagedDataUIBean; public abstract class AbstractPerspectivePagedDataUIBean extends AbstractPagedDataUIBean { protected PerspectiveClientUIBean perspectiveClient;
- @Create + // @Create public void init() { if (this.perspectiveClient == null) { - this.perspectiveClient = (PerspectiveClientUIBean) Component.getInstance(PerspectiveClientUIBean.class, - true); + // this.perspectiveClient = (PerspectiveClientUIBean) Component.getInstance(PerspectiveClientUIBean.class, + // true); } } } diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java index f13e087..4ab63d5 100644 --- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java +++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java @@ -3,8 +3,6 @@ package org.rhq.enterprise.server.perspective; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
-import org.jboss.seam.annotations.web.RequestParameter; - import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.resource.Resource; @@ -18,7 +16,7 @@ import org.rhq.enterprise.server.resource.ResourceManagerRemote; public class AbstractPerspectiveResourceUIBean extends AbstractPerspectiveUIBean { private final Log log = LogFactory.getLog(this.getClass());
- @RequestParameter + // @RequestParameter private Integer rhqResourceId;
private Resource resource; diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveUIBean.java index 56034bb..01f8dd8 100644 --- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveUIBean.java +++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveUIBean.java @@ -18,24 +18,19 @@ */ package org.rhq.enterprise.server.perspective;
-import org.jboss.seam.Component; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.faces.FacesMessages; - /** * A base class for Seam components that utilize the RHQ remote API. * * @author Ian Springer */ public abstract class AbstractPerspectiveUIBean { - @In - protected FacesMessages facesMessages; + // @In + // protected FacesMessages facesMessages;
protected PerspectiveClientUIBean perspectiveClient;
- @Create + // @Create public void init() { - this.perspectiveClient = (PerspectiveClientUIBean) Component.getInstance(PerspectiveClientUIBean.class, true); + // this.perspectiveClient = (PerspectiveClientUIBean) Component.getInstance(PerspectiveClientUIBean.class, true); } } \ No newline at end of file diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java index d73431a..2d8b043 100644 --- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java +++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java @@ -4,13 +4,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.core.Conversation; - import org.rhq.core.domain.auth.Subject; import org.rhq.enterprise.clientapi.RemoteClient; import org.rhq.enterprise.server.auth.SubjectManagerRemote; @@ -18,9 +11,9 @@ import org.rhq.enterprise.server.auth.SubjectManagerRemote; /** * @author Ian Springer */ -@Name(PerspectiveClientUIBean.NAME) -@Scope(ScopeType.CONVERSATION) -@AutoCreate +//@Name(PerspectiveClientUIBean.NAME) +//@Scope(ScopeType.CONVERSATION) +//@AutoCreate public class PerspectiveClientUIBean { public static final String NAME = "PerspectiveClientUIBean";
@@ -31,23 +24,23 @@ public class PerspectiveClientUIBean {
private final Log log = LogFactory.getLog(this.getClass());
- @RequestParameter + // @RequestParameter private String rhqServerHost; private String serverHost;
- @RequestParameter + // @RequestParameter private Integer rhqServerPort; private Integer serverPort;
- @RequestParameter + // @RequestParameter private String rhqUsername; private String username;
- @RequestParameter + // @RequestParameter private String rhqPassword; private String password;
- @RequestParameter + // @RequestParameter private Integer rhqSessionId;
private RemoteClient remoteClient; @@ -64,12 +57,12 @@ public class PerspectiveClientUIBean { this.remoteClient.connect(); } catch (Exception e) { this.remoteClient = null; - log.info("Ending perspective client Conversation with id " + Conversation.instance().getId() + "..."); - Conversation.instance().end(); + // log.info("Ending perspective client Conversation with id " + Conversation.instance().getId() + "..."); + // Conversation.instance().end(); throw e; } - Conversation.instance().begin(); - log.info("Began perspective client Conversation with id " + Conversation.instance().getId() + "."); + // Conversation.instance().begin(); + // log.info("Began perspective client Conversation with id " + Conversation.instance().getId() + "."); } return this.remoteClient; } diff --git a/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/components.xml b/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/components.xml deleted file mode 100644 index 4631d2e..0000000 --- a/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/components.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<components xmlns="http://jboss.com/products/seam/components" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:security="http://jboss.com/products/seam/security" - xsi:schemaLocation= - "http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd%22%3E - - <component name="org.jboss.seam.core.init"> - <property name="debug">false</property> - <!-- enable only when needed --> - <property name="transactionManagementEnabled">false</property> - </component> - -</components> diff --git a/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/web.xml index fb66dca..4b9e940 100644 --- a/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/web.xml @@ -7,33 +7,6 @@
<display-name>RHQ Perspective Webapp</display-name>
- <!--=== Seam ===--> - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <!-- From Seam docs: The Seam master filter must be the first filter specified - in web.xml. This ensures it is run first. --> - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - <!-- flags for debugging during development --> <context-param> <param-name>com.sun.faces.validateXml</param-name> @@ -52,10 +25,6 @@ <load-on-startup>1</load-on-startup> </servlet> <!-- serve Facelets pages (*.xhtml) via the JSF servlet --> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping>
<servlet-mapping> <servlet-name>Faces Servlet</servlet-name> @@ -84,11 +53,6 @@
<!--=== RichFaces ===-->
- <!-- From Seam docs: If RichFaces is used in your project, Seam will install - the RichFaces Ajax filter for you, making sure to install it before all - other built-in filters. You don't need to install the RichFaces Ajax - filter in web.xml yourself. --> - <context-param> <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> <param-value>com.sun.facelets.FaceletViewHandler</param-value> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 7b21a37..ce18e68 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -19,7 +19,6 @@ <!-- dependency versions --> <el.version>1.0</el.version> <jsf-facelets.version>1.1.15.B1</jsf-facelets.version> - <seam.version>2.1.0.SP1</seam.version>
<!-- plugin versions --> <jetty-jspc-maven-plugin.version>7.0.1.v20091125</jetty-jspc-maven-plugin.version> @@ -235,51 +234,6 @@ <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 --> </dependency>
- <!-- == Seam Related Dependencies ================ --> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - <version>${seam.version}</version> - <!-- should be pulling this in directly ourselves, not relying - jboss-seam-debug to provide it --> - <exclusions> - <exclusion> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.jvnet</groupId> <artifactId>inflector</artifactId> diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java index d8dc707..16ffcac 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java @@ -19,8 +19,7 @@ package org.rhq.enterprise.gui.admin.plugin;
import javax.faces.application.FacesMessage; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.log.Log; + import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; @@ -38,8 +37,8 @@ import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDe public abstract class AbstractPluginConfigurationUIBean {
protected final ServerPluginsLocal serverPluginsBean = LookupUtil.getServerPlugins(); - @Logger - private Log log; + // @Logger + // private Log log;
private ServerPlugin plugin; private ConfigurationDefinition pluginConfigurationDefinition; @@ -89,7 +88,7 @@ public abstract class AbstractPluginConfigurationUIBean { this.scheduledJobsDefinition = ConfigurationMetadataParser.parse("jobs:" + pluginKey.getPluginName(), descriptor.getScheduledJobs()); } catch (Exception e) { String err = "Cannot determine what the plugin configuration or scheduled jobs configuration looks like"; - log.error(err + " - Cause: " + e); + // log.error(err + " - Cause: " + e); FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, err, e); } } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java index ad6c709..1929782 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java @@ -24,15 +24,6 @@ import java.util.List;
import javax.faces.application.FacesMessage;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.log.Log; - import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; @@ -42,12 +33,12 @@ import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.plugin.ServerPluginsLocal; import org.rhq.enterprise.server.util.LookupUtil;
-@Scope(ScopeType.PAGE) -@Name("editPluginConfigurationUIBean") +//@Scope(ScopeType.PAGE) +//@Name("editPluginConfigurationUIBean") public class EditPluginConfigurationUIBean extends AbstractPluginConfigurationUIBean implements Serializable {
- @Logger - private Log log; + // @Logger + // private Log log;
private Configuration currentConfiguration; private ConfigurationDefinition currentConfigurationDefinition; @@ -60,7 +51,7 @@ public class EditPluginConfigurationUIBean extends AbstractPluginConfigurationUI return currentConfigurationDefinition; }
- @Create + // @Create public void init() { checkPermission(); lookupConfigDefinitions(); @@ -69,14 +60,14 @@ public class EditPluginConfigurationUIBean extends AbstractPluginConfigurationUI // The superclass holds the plugin instance variable, but in this // case we want it injected via the PluginFactory - so this serves as // the injection point - @In(value = "plugin", required = false) + // @In(value = "plugin", required = false) public void setCurrentPlugin(ServerPlugin currentPlugin) { if (currentPlugin != null) { setPlugin(currentPlugin); } }
- @RequestParameter("listName") + // @RequestParameter("listName") public void setListName(String listName) { ServerPlugin plugin = getPlugin();
@@ -123,7 +114,7 @@ public class EditPluginConfigurationUIBean extends AbstractPluginConfigurationUI
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Configuration settings saved."); } catch (Exception e) { - log.error("Error updating the plugin configurations.", e); + // log.error("Error updating the plugin configurations.", e); FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "There was an error changing the configuration settings.", e);
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java index c7c25f2..70ef43d 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java @@ -21,25 +21,22 @@ package org.rhq.enterprise.gui.admin.plugin; import java.io.Serializable; import java.util.List; import java.util.Map; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; -import org.rhq.core.domain.plugin.PluginKey; -import org.rhq.core.domain.plugin.ServerPlugin; -import org.rhq.enterprise.server.plugin.pc.ServerPluginType; + import org.richfaces.component.UITree; import org.richfaces.component.html.HtmlTree; import org.richfaces.event.NodeSelectedEvent; import org.richfaces.model.TreeNode; import org.richfaces.model.TreeNodeImpl;
-@Scope(ScopeType.PAGE) -@Name("pluginConfigUIBean") +import org.rhq.core.domain.plugin.PluginKey; +import org.rhq.core.domain.plugin.ServerPlugin; +import org.rhq.enterprise.server.plugin.pc.ServerPluginType; + +//@Scope(ScopeType.PAGE) +//@Name("pluginConfigUIBean") public class PluginConfigurationUIBean extends AbstractPluginConfigurationUIBean implements Serializable {
- @RequestParameter + // @RequestParameter private String pluginName; private TreeNode root;
@@ -47,7 +44,7 @@ public class PluginConfigurationUIBean extends AbstractPluginConfigurationUIBean return root; }
- @Create + // @Create public void init() { checkPermission(); createTree(); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java index 7b0a104..aa2665f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java @@ -18,10 +18,6 @@ */ package org.rhq.enterprise.gui.admin.plugin;
-import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.web.RequestParameter; - import org.rhq.core.domain.plugin.AbstractPlugin; import org.rhq.core.domain.plugin.Plugin; import org.rhq.core.domain.plugin.PluginDeploymentType; @@ -36,17 +32,17 @@ import org.rhq.enterprise.server.util.LookupUtil; * * @author jharris */ -@Name("pluginFactory") +//@Name("pluginFactory") public class PluginFactory {
- @RequestParameter("plugin") + //@RequestParameter("plugin") private String name; - @RequestParameter("deployment") + //@RequestParameter("deployment") private PluginDeploymentType deployment; - @RequestParameter("pluginType") + //@RequestParameter("pluginType") private String pluginType;
- @Factory(value = "plugin", autoCreate = true) + //@Factory(value = "plugin", autoCreate = true) public AbstractPlugin lookupPlugin() { if (this.deployment == PluginDeploymentType.AGENT) { return LookupUtil.getPluginManager().getPlugin(this.name); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java index 1a51878..a0c0f17 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java @@ -24,13 +24,6 @@ import java.util.List;
import javax.faces.application.FacesMessage;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; - import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.configuration.Configuration; @@ -45,17 +38,17 @@ import org.rhq.enterprise.server.plugin.pc.ControlResults; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.enterprise.server.xmlschema.ControlDefinition;
-@Scope(ScopeType.CONVERSATION) -@Name("ServerPluginControlUIBean") +//@Scope(ScopeType.CONVERSATION) +//@Name("ServerPluginControlUIBean") public class ServerPluginControlUIBean implements Serializable { private static final long serialVersionUID = 1L;
private final ServerPluginsLocal serverPluginsBean = LookupUtil.getServerPlugins();
- @In("plugin") + //@In("plugin") private AbstractPlugin abstractPlugin;
- @RequestParameter + //@RequestParameter private String control;
private ServerPlugin serverPlugin; @@ -67,7 +60,7 @@ public class ServerPluginControlUIBean implements Serializable { private Configuration params; private ControlResults results;
- @Create + //@Create public void init() throws Exception { this.serverPlugin = (ServerPlugin) this.abstractPlugin;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationContextUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationContextUIBean.java index e3a4183..dfc152d 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationContextUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationContextUIBean.java @@ -18,16 +18,10 @@ */ package org.rhq.enterprise.gui.alert.common;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; - import org.rhq.enterprise.gui.common.framework.EnterpriseFacesContextUIBean;
-@Scope(ScopeType.EVENT) -@Name("AlertNotificationContextUIBean") +//@Scope(ScopeType.EVENT) +//@Name("AlertNotificationContextUIBean") public class AlertNotificationContextUIBean extends EnterpriseFacesContextUIBean { private enum Context { AlertNotificationTemplate, // @@ -37,18 +31,18 @@ public class AlertNotificationContextUIBean extends EnterpriseFacesContextUIBean NotificationDetails; }
- @RequestParameter("context") + // @RequestParameter("context") private String context; - @RequestParameter("contextId") + // @RequestParameter("contextId") private Integer contextId; - @RequestParameter("contextSubId") + // @RequestParameter("contextSubId") private Integer contextSubId;
private String name; private String redirect; private String refresh;
- @Create + // @Create public void init() { if (context.equals("template")) { name = "Alert Notification Template"; 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 dc65e73..d69117e 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 @@ -26,13 +26,6 @@ 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; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -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; @@ -46,18 +39,18 @@ import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; * * @author Justin Harris */ -@Scope(ScopeType.EVENT) -@Name("alertNotificationsUIBean") +//@Scope(ScopeType.EVENT) +//@Name("alertNotificationsUIBean") public class AlertNotificationsUIBean extends EnterpriseFacesContextUIBean {
- @RequestParameter("nid") + // @RequestParameter("nid") private Integer notificationId; - @RequestParameter("context") + // @RequestParameter("context") private String context; - @RequestParameter("contextId") + // @RequestParameter("contextId") private Integer contextId;
- @In + // @In private AlertNotificationManagerLocal alertNotificationManager;
private List<AlertNotification> alertNotifications; @@ -121,7 +114,7 @@ public class AlertNotificationsUIBean extends EnterpriseFacesContextUIBean { } }
- @Create + // @Create public void initNotifications() { reloadAlertNotifications(); this.selectedNotifications = new HashSet<AlertNotification>(); 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 1d9da88..e18d660 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 @@ -20,15 +20,6 @@ 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; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; - import org.rhq.core.domain.alert.notification.AlertNotification; import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.enterprise.gui.common.framework.EnterpriseFacesContextUIBean; @@ -36,14 +27,14 @@ import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; import org.rhq.enterprise.server.plugin.pc.alert.AlertSenderInfo; import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean;
-@Scope(ScopeType.EVENT) -@Name("customContentUIBean") +//@Scope(ScopeType.EVENT) +//@Name("customContentUIBean") public class CustomContentUIBean extends EnterpriseFacesContextUIBean {
- @RequestParameter("nid") + //@RequestParameter("nid") private Integer alertNotificationId;
- @In + //@In private AlertNotificationManagerLocal alertNotificationManager;
private String contentUrl; @@ -53,7 +44,7 @@ public class CustomContentUIBean extends EnterpriseFacesContextUIBean { return contentUrl; }
- @Create + //@Create public void init() { if (alertNotificationId == null) { return; @@ -94,8 +85,8 @@ public class CustomContentUIBean extends EnterpriseFacesContextUIBean { * name of bean, but this class is not an "official" seam component. */ private void outjectBean(String name, CustomAlertSenderBackingBean bean) { - Context context = Contexts.getPageContext(); - context.set(name, bean); + // Context context = Contexts.getPageContext(); + // context.set(name, bean); }
public String saveConfiguration() { @@ -114,9 +105,9 @@ public class CustomContentUIBean extends EnterpriseFacesContextUIBean { int alertDefinitionId = Integer.parseInt(customBackingBean.getContextId()); alertNotificationManager.updateAlertNotification(getSubject(), alertDefinitionId, notification);
- AlertNotificationsUIBean notificationsUIBean = (AlertNotificationsUIBean) Contexts - .lookupInStatefulContexts("alertNotificationsUIBean"); - notificationsUIBean.reselectActiveNotificationUsingDataComparison(notification); + // AlertNotificationsUIBean notificationsUIBean = (AlertNotificationsUIBean) Contexts + // .lookupInStatefulContexts("alertNotificationsUIBean"); + // notificationsUIBean.reselectActiveNotificationUsingDataComparison(notification); } catch (Throwable t) { FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to save alert notification", t); } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FacesMessagePropogationPhaseListener.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FacesMessagePropogationPhaseListener.java index d1fbc83..a21c0d2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FacesMessagePropogationPhaseListener.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FacesMessagePropogationPhaseListener.java @@ -33,8 +33,6 @@ import javax.faces.event.PhaseListener; import org.ajax4jsf.context.AjaxContext; import org.jetbrains.annotations.Nullable;
-import org.jboss.seam.core.Manager; - /** * A phase listener that propogates global JSF messages across redirects. * @@ -73,9 +71,7 @@ public class FacesMessagePropogationPhaseListener implements PhaseListener { PhaseId phaseId = event.getPhaseId(); if (phaseId == PhaseId.INVOKE_APPLICATION) { // We want to store the messages in the context after the application has done its processing. - if (!Manager.instance().isReallyLongRunningConversation()) { - putGlobalFacesMessagesInSession(); - } + putGlobalFacesMessagesInSession(); } else if (phaseId == PhaseId.RENDER_RESPONSE) { // If we've just rendered a response, this isn't a redirect, so we don't want to propogate messages. // (fix for http://jira.jboss.com/jira/browse/JBNADM-1548, ips, 08/15/07) diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java index 0689f49..9bb6a8f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java @@ -27,8 +27,6 @@ import com.sun.facelets.Facelet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
-import org.jboss.seam.Component; - import org.rhq.core.util.maven.MavenArtifactNotFoundException; import org.rhq.core.util.maven.MavenArtifactProperties; import org.rhq.enterprise.server.RHQConstants; @@ -70,7 +68,7 @@ public class ServerInfoUIBean { }
public String getSeamVersion() { - return getManifestVersion(Component.class); + return ""; //getManifestVersion(Component.class); }
public String getRichFacesVersion() { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java index b325f57..ab8e360 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java @@ -20,18 +20,7 @@ package org.rhq.enterprise.gui.configuration.group;
import javax.faces.application.FacesMessage;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.faces.Redirect; - import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.legacy.ParamConstants; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.configuration.ConfigurationUpdateStillInProgressException; @@ -41,20 +30,20 @@ import org.rhq.enterprise.server.configuration.ConfigurationUpdateStillInProgres * * @author Ian Springer */ -@Name("EditGroupResourceConfigurationUIBean") -@Scope(ScopeType.CONVERSATION) +//@Name("EditGroupResourceConfigurationUIBean") +//@Scope(ScopeType.CONVERSATION) public class EditGroupResourceConfigurationUIBean extends AbstractGroupResourceConfigurationUIBean { public static final String VIEW_ID = "/rhq/group/configuration/editCurrent.xhtml";
- @In(value = "org.jboss.seam.faces.redirect") - private Redirect redirect; + //@In(value = "org.jboss.seam.faces.redirect") + //private Redirect redirect;
- @Create - @Begin + //@Create + //@Begin public void init() { loadConfigurations(); // We can set this once here, since this.redirect is scoped to the same CONVERSATION as this managed bean instance. - this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); + //this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); return; }
@@ -73,7 +62,7 @@ public class EditGroupResourceConfigurationUIBean extends AbstractGroupResourceC
FacesContextUtility .addMessage(FacesMessage.SEVERITY_INFO, "Group Resource Configuration update scheduled."); - Conversation.instance().endBeforeRedirect(); + //Conversation.instance().endBeforeRedirect(); viewId = GroupResourceConfigurationHistoryUIBean.VIEW_ID; } catch (ConfigurationUpdateStillInProgressException updateException) { FacesContextUtility @@ -88,29 +77,29 @@ public class EditGroupResourceConfigurationUIBean extends AbstractGroupResourceC "Failed to schedule group Resource Configuration update - cause: " + e); viewId = VIEW_ID; } - this.redirect.setViewId(getViewId(viewId)); - this.redirect.execute(); + //this.redirect.setViewId(getViewId(viewId)); + //this.redirect.execute(); }
/** * End the convo and redirect back to viewCurrent.xhtml. This gets called when user clicks the CANCEL button. */ - @End + //@End public void cancel() { FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Edit canceled."); - this.redirect.setViewId(getViewId(ViewGroupResourceConfigurationUIBean.VIEW_ID)); - this.redirect.execute(); + //this.redirect.setViewId(getViewId(ViewGroupResourceConfigurationUIBean.VIEW_ID)); + // this.redirect.execute(); return; }
/** * End the convo and reload the current page (editCurrent.xhtml). This gets called when user clicks the RESET button. */ - @End + // @End public void reset() { FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "All properties reset to original values."); - this.redirect.setViewId(getViewId(VIEW_ID)); - this.redirect.execute(); + // this.redirect.setViewId(getViewId(VIEW_ID)); + // this.redirect.execute(); return; }
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java index 402bf33..cb4ccfa 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java @@ -21,19 +21,14 @@ package org.rhq.enterprise.gui.configuration.group; import org.rhq.core.domain.configuration.Configuration; import org.rhq.enterprise.gui.configuration.AbstractAddNewOpenMapMemberPropertyUIBean;
-import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.In; -import org.jboss.seam.ScopeType; - /** * @author Ian Springer */ -@Name("GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean") -@Scope(ScopeType.PAGE) +//@Name("GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean") +//@Scope(ScopeType.PAGE) public class GroupResourceConfigurationAddNewOpenMapMemberPropertyUIBean extends AbstractAddNewOpenMapMemberPropertyUIBean { - @In(value = "EditGroupResourceConfigurationUIBean") + //@In(value = "EditGroupResourceConfigurationUIBean") EditGroupResourceConfigurationUIBean editGroupResourceConfigurationUIBean;
protected Configuration getConfiguration() { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/ViewGroupResourceConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/ViewGroupResourceConfigurationUIBean.java index 62d17d0..0dd512a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/ViewGroupResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/ViewGroupResourceConfigurationUIBean.java @@ -18,31 +18,22 @@ */ package org.rhq.enterprise.gui.configuration.group;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.faces.Redirect; - import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.legacy.ParamConstants;
/** * A POJO Seam component that handles loading Resource configurations across a compatible Group in view-only mode. * * @author Ian Springer */ -@Name("ViewGroupResourceConfigurationUIBean") -@Scope(ScopeType.PAGE) +//@Name("ViewGroupResourceConfigurationUIBean") +//@Scope(ScopeType.PAGE) public class ViewGroupResourceConfigurationUIBean extends AbstractGroupResourceConfigurationUIBean { public static final String VIEW_ID = "/rhq/group/configuration/viewCurrent.xhtml";
- @In(value = "org.jboss.seam.faces.redirect") - private Redirect redirect; + //@In(value = "org.jboss.seam.faces.redirect") + //private Redirect redirect;
- @Create + //@Create public void init() { loadConfigurations(); return; @@ -51,11 +42,11 @@ public class ViewGroupResourceConfigurationUIBean extends AbstractGroupResourceC /** * Redirect to editCurrent.xhtml. This gets called when user clicks the EDIT button. */ - @End + //@End public void edit() { - this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); - this.redirect.setViewId(getViewId(EditGroupResourceConfigurationUIBean.VIEW_ID)); - this.redirect.execute(); + // this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); + // this.redirect.setViewId(getViewId(EditGroupResourceConfigurationUIBean.VIEW_ID)); + // this.redirect.execute(); return; }
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java index 698f288..e78a371 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java @@ -38,8 +38,6 @@ import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.Nullable; import org.richfaces.model.UploadItem;
-import org.jboss.seam.annotations.Create; - import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; @@ -84,7 +82,7 @@ public class ExistingResourceConfigurationUIBean extends AbstractConfigurationUI ExistingResourceConfigurationUIBean.class); }
- @Create + //@Create public void begin() { if (isRawSupported() || isStructuredAndRawSupported()) { initConfigDirectories(); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/FileUploadComponent.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/FileUploadComponent.java index c0ae9f9..a8f9046 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/FileUploadComponent.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/FileUploadComponent.java @@ -23,16 +23,13 @@
package org.rhq.enterprise.gui.configuration.resource;
+import java.io.IOException; + import org.apache.commons.io.FileUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.rhq.enterprise.gui.common.upload.FileUploadUIBean; import org.richfaces.event.UploadEvent; import org.richfaces.model.UploadItem;
-import java.io.IOException; +import org.rhq.enterprise.gui.common.upload.FileUploadUIBean;
/** * <p> @@ -45,8 +42,8 @@ import java.io.IOException; * upload which is implemented using RichFaces and Seam together. * </p> */ -@Name("fileUploader") -@Scope(ScopeType.PAGE) +//@Name("fileUploader") +//@Scope(ScopeType.PAGE) public class FileUploadComponent {
private FileUploadUIBean uploadBean = new FileUploadUIBean(); @@ -54,7 +51,7 @@ public class FileUploadComponent { /** * Represents the currently selected file in the raw config editor */ - @In + // @In private RawConfigUIBean selectedRawUIBean;
public UploadItem getUploadItem() { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java index 3f1532c..37c9a78 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java @@ -25,8 +25,6 @@ package org.rhq.enterprise.gui.configuration.resource;
import java.io.File;
-import org.jboss.seam.core.Events; - import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.RawConfiguration; import org.rhq.core.util.MessageDigestGenerator; @@ -71,7 +69,7 @@ public class RawConfigUIBean { }
private void fireRawConfigUpdateEvent() { - Events.instance().raiseEvent("rawConfigUpdate", this); + // Events.instance().raiseEvent("rawConfigUpdate", this); }
/** @return The full path name of the raw config file */ diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationDefinitionComponent.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationDefinitionComponent.java index d9e4073..ca4b943 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationDefinitionComponent.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationDefinitionComponent.java @@ -19,10 +19,6 @@
package org.rhq.enterprise.gui.configuration.resource;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java index d356a3f..6d8f2d5 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java @@ -23,11 +23,13 @@
package org.rhq.enterprise.gui.configuration.resource;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +import javax.ejb.EJBException; +import javax.faces.application.FacesMessage; + import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.RawConfiguration; @@ -35,14 +37,8 @@ import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.util.LookupUtil;
-import javax.ejb.EJBException; -import javax.faces.application.FacesMessage; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -@Name("configurationEditor") -@Scope(ScopeType.CONVERSATION) +//@Name("configurationEditor") +//@Scope(ScopeType.CONVERSATION) public class ResourceConfigurationEditor extends ResourceConfigurationViewer implements Serializable {
private Configuration originalResourceConfiguration; @@ -51,7 +47,7 @@ public class ResourceConfigurationEditor extends ResourceConfigurationViewer imp
private String modalEditorContents;
- @RequestParameter + // @RequestParameter private String tab;
@Override @@ -93,7 +89,7 @@ public class ResourceConfigurationEditor extends ResourceConfigurationViewer imp resourceConfiguration, RAW_MODE); }
- @Observer("rawConfigUpdate") + // @Observer("rawConfigUpdate") public void rawConfigUpdated(RawConfigUIBean rawConfigUIBean) { if (rawConfigUIBean.isModified()) { // If the file is modified and not already in the cache, then the file was previously in an unmodified state diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java index cd2adb4..9be7c6b 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java @@ -35,12 +35,6 @@ import javax.faces.application.FacesMessage; import javax.faces.event.ValueChangeEvent; import javax.servlet.http.HttpServletResponse;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; - import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; @@ -53,8 +47,8 @@ import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.util.LookupUtil;
-@Name("configurationViewer") -@Scope(ScopeType.PAGE) +//@Name("configurationViewer") +//@Scope(ScopeType.PAGE) public class ResourceConfigurationViewer {
public static final boolean STRUCTURED_MODE = true; @@ -62,19 +56,19 @@ public class ResourceConfigurationViewer {
private boolean mode = STRUCTURED_MODE;
- @In("webUser") + // @In("webUser") protected WebUser loggedInUser;
- @Out(required = false) + // @Out(required = false) protected Configuration resourceConfiguration;
- @Out(required = false) + // @Out(required = false) protected ConfigurationDefinition resourceConfigurationDefinition;
- @Out(required = false) + // @Out(required = false) protected Collection<RawConfigDirectory> rawConfigDirectories;
- @Out(required = false) + // @Out(required = false) protected RawConfigUIBean selectedRawUIBean;
protected Integer resourceId; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java index 38c995d..06ba36f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java @@ -41,7 +41,6 @@ import org.rhq.enterprise.gui.common.paging.PagedListDataModel; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.content.ContentException; import org.rhq.enterprise.server.content.ContentSourceManagerLocal; -import org.rhq.enterprise.server.perspective.PerspectiveManagerLocal; import org.rhq.enterprise.server.util.LookupUtil;
public class CreateContentSourceUIBean extends PagedDataTableUIBean { @@ -49,7 +48,7 @@ public class CreateContentSourceUIBean extends PagedDataTableUIBean {
private ContentSourceManagerLocal contentSourceManager = LookupUtil.getContentSourceManager();
- private PerspectiveManagerLocal perspectiveManager = LookupUtil.getPerspectiveManager(); + //private PerspectiveManagerLocal perspectiveManager = LookupUtil.getPerspectiveManager();
private ContentSource newContentSource = new ContentSource(); private ContentSourceType selectedContentSourceType = null; @@ -203,14 +202,15 @@ public class CreateContentSourceUIBean extends PagedDataTableUIBean { } }
- public String getCreateContentProviderPageLink(String typeName) { + public String getCreateContentProviderPageLink() { Subject subject = EnterpriseFacesContextUtility.getSubject(); - String link = perspectiveManager.getPageLink(subject, "createContentProvider", typeName, null); + String link = null;//perspectiveManager.getPageLink(subject, "createContentProvider", typeName, null);
if (null == link) { - link = "/rhq/content/createContentProvider-plain.xhtml?mode=new&typeName=" + typeName; + //link = "/rhq/content/createContentProvider-plain.xhtml?mode=new&typeName=" + typeName; + link = "/rhq/content/createContentProvider-plain.xhtml"; } else { - link += "&mode=new&typeName=" + typeName; + //link += "&mode=new&typeName=" + typeName; }
return link; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java index 33577f9..2cc7bf0 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java @@ -20,18 +20,7 @@ package org.rhq.enterprise.gui.inventory.group;
import javax.faces.application.FacesMessage;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.faces.Redirect; - import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.enterprise.gui.legacy.ParamConstants; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.authz.PermissionException;
@@ -40,20 +29,20 @@ import org.rhq.enterprise.server.authz.PermissionException; * * @author Ian Springer */ -@Name("EditGroupPluginConfigurationUIBean") -@Scope(ScopeType.CONVERSATION) +//@Name("EditGroupPluginConfigurationUIBean") +//@Scope(ScopeType.CONVERSATION) public class EditGroupPluginConfigurationUIBean extends AbstractGroupPluginConfigurationUIBean { public static final String VIEW_ID = "/rhq/group/inventory/edit-connection.xhtml";
- @In(value = "org.jboss.seam.faces.redirect") - private Redirect redirect; + // @In(value = "org.jboss.seam.faces.redirect") + // private Redirect redirect;
- @Create - @Begin + // @Create + // @Begin public void init() { loadConfigurations(); // We can set this once here, since this.redirect is scoped to the same CONVERSATION as this managed bean instance. - this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); + // this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); return; }
@@ -71,41 +60,41 @@ public class EditGroupPluginConfigurationUIBean extends AbstractGroupPluginConfi } catch (Exception e) { if (e instanceof PermissionException) { FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, e.getLocalizedMessage()); - this.redirect.setViewId(ViewGroupPluginConfigurationUIBean.VIEW_ID); + // this.redirect.setViewId(ViewGroupPluginConfigurationUIBean.VIEW_ID); } else { FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to schedule group plugin Configuration update - cause: " + e); - this.redirect.setViewId(VIEW_ID); + // this.redirect.setViewId(VIEW_ID); } - this.redirect.execute(); + // this.redirect.execute(); return; } FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Group plugin Configuration update scheduled."); - Conversation.instance().endBeforeRedirect(); - this.redirect.setViewId(ViewGroupConnectionPropertyHistoryUIBean.VIEW_ID); - this.redirect.execute(); + // Conversation.instance().endBeforeRedirect(); + // this.redirect.setViewId(ViewGroupConnectionPropertyHistoryUIBean.VIEW_ID); + // this.redirect.execute(); return; }
/** * End the convo and redirect back to view-connection.xhtml. This gets called when user clicks the CANCEL button. */ - @End + // @End public void cancel() { FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Edit canceled."); - this.redirect.setViewId(ViewGroupPluginConfigurationUIBean.VIEW_ID); - this.redirect.execute(); + // this.redirect.setViewId(ViewGroupPluginConfigurationUIBean.VIEW_ID); + // this.redirect.execute(); return; }
/** * End the convo and reload the current page (edit-connection.xhtml). This gets called when user clicks the RESET button. */ - @End + // @End public void reset() { FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "All properties reset to original values."); - this.redirect.setViewId(VIEW_ID); - this.redirect.execute(); + // this.redirect.setViewId(VIEW_ID); + // this.redirect.execute(); return; } } \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupPluginConfigurationUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupPluginConfigurationUIBean.java index aeee740..3e777d2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupPluginConfigurationUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupPluginConfigurationUIBean.java @@ -18,31 +18,22 @@ */ package org.rhq.enterprise.gui.inventory.group;
-import org.rhq.enterprise.gui.legacy.ParamConstants; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.faces.Redirect; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In;
/** * A POJO Seam component that handles loading plugin configurations across a compatible Group in view-only mode. * * @author Ian Springer */ -@Name("ViewGroupPluginConfigurationUIBean") -@Scope(ScopeType.PAGE) +//@Name("ViewGroupPluginConfigurationUIBean") +//@Scope(ScopeType.PAGE) public class ViewGroupPluginConfigurationUIBean extends AbstractGroupPluginConfigurationUIBean { public static final String VIEW_ID = "/rhq/group/inventory/view-connection.xhtml";
- @In(value = "org.jboss.seam.faces.redirect") - private Redirect redirect; + //@In(value = "org.jboss.seam.faces.redirect") + //private Redirect redirect;
- @Create + //@Create public void init() { loadConfigurations(); return; @@ -51,11 +42,11 @@ public class ViewGroupPluginConfigurationUIBean extends AbstractGroupPluginConfi /** * Redirect to editCurrent.xhtml. This gets called when user clicks the EDIT button. */ - @End + // @End public void edit() { - this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); - this.redirect.setViewId(EditGroupPluginConfigurationUIBean.VIEW_ID); - this.redirect.execute(); + // this.redirect.setParameter(ParamConstants.GROUP_ID_PARAM, getGroup().getId()); + //this.redirect.setViewId(EditGroupPluginConfigurationUIBean.VIEW_ID); + // this.redirect.execute(); return; } } \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java index 5bf3da5..86e0473 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java @@ -21,10 +21,6 @@ package org.rhq.enterprise.gui.inventory.resource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; import org.rhq.enterprise.gui.legacy.WebUser; import org.rhq.enterprise.gui.legacy.WebUserPreferences; import org.rhq.enterprise.gui.legacy.action.resource.common.QuickFavoritesUtil; @@ -35,8 +31,8 @@ import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; * * @author Joseph Marques */ -@Name("FavoritesUIBean") -@Scope(ScopeType.EVENT) +//@Name("FavoritesUIBean") +//@Scope(ScopeType.EVENT) public class FavoritesUIBean {
protected final Log log = LogFactory.getLog(FavoritesUIBean.class); @@ -49,7 +45,7 @@ public class FavoritesUIBean { * requests, particularly with the raw config editor. The raw config editor however extends the life of the * current ResourceUIBean beyond the current request so that the id can be accessed through ResourceUIBean. */ - @In(value = ResourceUIBean.MANAGED_BEAN_NAME, create = true) + // @In(value = ResourceUIBean.MANAGED_BEAN_NAME, create = true) private ResourceUIBean resourceUIBean;
public FavoritesUIBean() { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java index ecc1253..3a266e8 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java @@ -28,10 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.measurement.AvailabilityType; @@ -50,7 +46,6 @@ import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal; -import org.rhq.enterprise.server.perspective.PerspectiveManagerLocal; import org.rhq.enterprise.server.perspective.Tab; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; @@ -63,8 +58,8 @@ import org.rhq.enterprise.server.util.LookupUtil; * * @author Ian Springer */ -@Name(ResourceUIBean.MANAGED_BEAN_NAME) -@Scope(ScopeType.EVENT) +//@Name(ResourceUIBean.MANAGED_BEAN_NAME) +//@Scope(ScopeType.EVENT) public class ResourceUIBean {
protected final Log log = LogFactory.getLog(ResourceUIBean.class); @@ -84,7 +79,7 @@ public class ResourceUIBean { private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager(); private ResourceTypeManagerLocal resourceTypeManager = LookupUtil.getResourceTypeManager(); private AuthorizationManagerLocal authorizationManager = LookupUtil.getAuthorizationManager(); - private PerspectiveManagerLocal perspectiveManager = LookupUtil.getPerspectiveManager(); + //private PerspectiveManagerLocal perspectiveManager = LookupUtil.getPerspectiveManager();
private String message;
@@ -112,7 +107,7 @@ public class ResourceUIBean { .getId()); this.permissions = new ResourcePermission(resourcePerms); this.facets = this.resourceTypeManager.getResourceFacets(getResourceType().getId()); - this.tabs = this.perspectiveManager.getResourceTabs(subject, this.resource); + //this.tabs = this.perspectiveManager.getResourceTabs(subject, this.resource);
//parent can be viewed by user only if he is allowed to see it if (parent != null) diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/perspectives/PerspectiveUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/perspectives/PerspectiveUIBean.java index ea8a93c..e8a38ed 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/perspectives/PerspectiveUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/perspectives/PerspectiveUIBean.java @@ -26,14 +26,8 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.cloud.Server; import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.perspective.PerspectiveException; -import org.rhq.enterprise.server.perspective.PerspectiveManagerLocal; import org.rhq.enterprise.server.util.LookupUtil;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - /** * Bean dynamically provides menu information used by menu.xhtml. This bean should be viewed * concurrently with menu.xhtml and it's designed to provide static or dynamic menu content @@ -43,19 +37,19 @@ import org.jboss.seam.annotations.Scope; * @author Jay Shaughnessy * */ -@Name("PerspectiveUIBean") -@Scope(ScopeType.PAGE) +//@Name("PerspectiveUIBean") +//@Scope(ScopeType.PAGE) public class PerspectiveUIBean {
- PerspectiveManagerLocal perspectiveManager = LookupUtil.getPerspectiveManager(); + //PerspectiveManagerLocal perspectiveManager = LookupUtil.getPerspectiveManager();
public List<org.rhq.enterprise.server.perspective.MenuItem> getCoreMenu() { Subject subject = EnterpriseFacesContextUtility.getSubject(); List<org.rhq.enterprise.server.perspective.MenuItem> result = null;
try { - result = perspectiveManager.getMenu(subject); - } catch (PerspectiveException e) { + //result = perspectiveManager.getMenu(subject); + } catch (Exception e) { FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to get core menu.", e); }
@@ -73,8 +67,8 @@ public class PerspectiveUIBean { String result = null;
try { - result = perspectiveManager.getUrlViaKey(Integer.valueOf(targetUrlKey)); - result = addContextParams(result); + // result = perspectiveManager.getUrlViaKey(Integer.valueOf(targetUrlKey)); + // result = addContextParams(result); } catch (NumberFormatException e) { FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Required request parameter 'targetUrlKey' was not numeric: " + targetUrlKey, e); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestConditionalFormUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestConditionalFormUIBean.java index 65871b2..4caf970 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestConditionalFormUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestConditionalFormUIBean.java @@ -6,12 +6,8 @@ import java.util.List; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -@Scope(ScopeType.PAGE) -@Name("TestConditionalFormUIBean") +//@Scope(ScopeType.PAGE) +//@Name("TestConditionalFormUIBean") public class TestConditionalFormUIBean {
private String currentType = ""; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestDynamicRenderingUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestDynamicRenderingUIBean.java index abbc2fe..707ebfa 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestDynamicRenderingUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestDynamicRenderingUIBean.java @@ -1,13 +1,9 @@ package org.rhq.enterprise.gui.test;
-import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - import org.rhq.core.gui.util.FacesContextUtility;
-@Scope(ScopeType.PAGE) -@Name("TestDynamicRenderingUIBean") +//@Scope(ScopeType.PAGE) +//@Name("TestDynamicRenderingUIBean") public class TestDynamicRenderingUIBean { private final static String childOne = "/rhq/test/rerender/child-1.xhtml"; private final static String childTwo = "/rhq/test/rerender/child-2.xhtml"; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/LookupComponent.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/LookupComponent.java index 31259a0..d224f62 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/LookupComponent.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/LookupComponent.java @@ -20,15 +20,7 @@ package org.rhq.enterprise.gui.util;
import java.beans.Introspector; import java.lang.reflect.Method; -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Startup; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.core.Init; + import org.rhq.enterprise.server.util.LookupUtil;
/** @@ -52,18 +44,18 @@ import org.rhq.enterprise.server.util.LookupUtil; * * @author Justin Harris */ -@Startup -@Scope(ScopeType.APPLICATION) -@Name("lookupComponent") +//@Startup +//@Scope(ScopeType.APPLICATION) +//@Name("lookupComponent") public class LookupComponent {
- @In - private Init init; + //@In + //private Init init;
- @In - private Context applicationContext; + //@In + //private Context applicationContext;
- @Create + //@Create public void scanComponents() { for (Method method : LookupUtil.class.getDeclaredMethods()) { String methodName = method.getName(); @@ -95,17 +87,17 @@ public class LookupComponent { */ private void addComponent(String componentName, Method creationMethod) { LookupUtilComponent component = new LookupUtilComponent(componentName, creationMethod); - this.applicationContext.set(componentName + ".component", component); + //this.applicationContext.set(componentName + ".component", component);
// set the new component to @AutoCreate - this.init.addAutocreateVariable(componentName); + //this.init.addAutocreateVariable(componentName); }
/** * Custom Seam component that delegates component intantiation to a creation * method. This is similar in concept to Seam @Factory methods. */ - class LookupUtilComponent extends Component { + class LookupUtilComponent /*extends Component*/{
private Method creationMethod;
@@ -114,12 +106,12 @@ public class LookupComponent { }
private LookupUtilComponent(String name, Method creationMethod) { - super(Object.class, name); + //super(Object.class, name);
this.creationMethod = creationMethod; }
- @Override + //@Override protected Object instantiate() throws Exception { return this.creationMethod.invoke(null); } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml deleted file mode 100644 index 9dcd041..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<components xmlns="http://jboss.com/products/seam/components" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:security="http://jboss.com/products/seam/security" - xmlns:core="http://jboss.com/products/seam/core" - xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd%22%3E - - - <component name="org.jboss.seam.core.init"> - <property name="debug">true</property> <!-- enable only when needed --> - <property name="transactionManagementEnabled">false</property> - <property name="jndiPattern">rhq/#{ejbName}/local</property> - </component> - - - <!--<component class="org.jboss.seam.web.MultipartFilter">--> - <!--<property name="createTempFiles">true</property>--> - <!--<property name="maxRequestSize">1000000</property>--> - <!--<property name="urlPattern">*.xhtml</property>--> - <!--</component>--> - - <!--<component class="org.rhq.enterprise.gui.configuration.resource.ExistingResourceConfigurationUIBean"--> - <!--name="ExistingResourceConfigurationViewUIBean"--> - <!--scope="page"/>--> - - <!--<component class="org.rhq.enterprise.gui.configuration.resource.ExistingResourceConfigurationUIBean"--> - <!--name="ExistingResourceConfigurationUIBean"--> - <!--scope="session"/>--> - - <!-- Load i18n bundles --> - core:resource-loader - core:bundle-names - <value>messages</value> - <value>ApplicationResources</value> - </core:bundle-names> - </core:resource-loader> - - <core:manager conversation-timeout="180000" concurrent-request-timeout="10000"/> - -</components> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml index d2fac18..c137f08 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml @@ -21,10 +21,6 @@ </application>
<lifecycle> - <!-- - <!- - This phase listener is required for Seam applications. - -> - <phase-listener>org.jboss.seam.jsf.SeamPhaseListener</phase-listener> - --> <phase-listener>org.rhq.enterprise.gui.common.framework.FacesMessagePropogationPhaseListener</phase-listener> <phase-listener>org.rhq.enterprise.gui.common.framework.PhaseTracker</phase-listener> <phase-listener>org.rhq.enterprise.gui.common.framework.HttpHeadersInjector</phase-listener> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml deleted file mode 100644 index f0217a7..0000000 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages - http://jboss.com/products/seam/pages-2.1.xsd%22%3E - - <page view-id="/rhq/resource/configuration/view.xhtml"> - <action execute="#{configurationViewer.initialize}" on-postback="false"/> - <navigation from-action="#{ConfigHelperUIBean.accessMap}"> - <render view-id="/rhq/resource/configuration/view-map.xhtml"/> - </navigation> - </page> - - <page view-id="/rhq/resource/configuration/view-map.xhtml" action="#{configurationViewer.initialize}"/> - - <page view-id="/rhq/resource/configuration/edit.xhtml" concurrent-request-timeout="10000" timeout="180000"> - <action execute="#{configurationEditor.initialize}" - on-postback="false" - if="#{!conversation.longRunning or (empty resourceConfiguration or resourceConfiguration.id ne ResourceUIBean.id)}"/> - - <navigation from-action="#{configurationEditor.initialize}"> - <begin-conversation join="true"/> - <rule if="#{configurationEditor.updateInProgress}"> - <redirect view-id="/rhq/resource/configuration/view.xhtml" include-page-params="true"> - <param name="id" value="#{ResourceUIBean.id}"/> - </redirect> - </rule> - </navigation> - - <navigation from-action="#{configurationEditor.updateConfiguration}"> - <rule if-outcome="success"> - <end-conversation before-redirect="false"/> - <redirect view-id="/rhq/resource/configuration/history.xhtml"> - <param name="id" value="#{ResourceUIBean.id}"/> - </redirect> - </rule> - </navigation> - - <navigation from-action="#{configurationEditor.finishAddMap}"> - <render view-id="/rhq/resource/configuration/edit.xhtml"/> - </navigation> - - <navigation from-action="#{configurationEditor.finishEditMap}"> - <render view-id="/rhq/resource/configuration/edit.xhtml"/> - </navigation> - </page> - -</pages> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml index 7528dd9..0539e78 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml @@ -7,31 +7,6 @@
<display-name>RHQ Legacy GUI</display-name>
- <!--=== Seam ===--> - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <!-- From Seam docs: The Seam master filter must be the first filter specified - in web.xml. This ensures it is run first. --> - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - <init-param> - <param-name>createTempFiles</param-name> - <param-value>true</param-value> - </init-param> - <init-param> - <param-name>maxRequestSize</param-name> - <param-value>250000000</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>*.xhtml</url-pattern> - </filter-mapping> - <!--=== JSF RI ===-->
<listener> @@ -65,21 +40,12 @@ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet>
<!-- serve Facelets pages (*.xhtml) via the JSF servlet --> <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.xhtml</url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping>
<!-- the suffix for files containing JSF content (default is ".jsp") --> <context-param> @@ -213,11 +179,6 @@
<!--=== RichFaces ===-->
- <!-- From Seam docs: If RichFaces is used in your project, Seam will install - the RichFaces Ajax filter for you, making sure to install it before all - other built-in filters. You don't need to install the RichFaces Ajax - filter in web.xml yourself. --> - <!-- name of the CSS skin used by RichFaces (default value is "DEFAULT") --> <context-param> <param-name>org.richfaces.SKIN</param-name> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml index 00dff99..1520b7e 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml @@ -60,9 +60,9 @@ </onc:sortableColumnHeader> </f:facet>
- <h:outputLink value="#{CreateContentSourceUIBean.getCreateContentProviderPageLink(item.name)}"> - <!-- note, do not use f:param with perspectives --> - + <h:outputLink value="#{CreateContentSourceUIBean.createContentProviderPageLink}"> + <f:param name="typeName" value="#{item.name}" /> + <f:param name="mode" value="new" /> <h:outputText value="#{item.displayName}" /> <h:outputText value=" *" rendered="#{(not empty param.typeName) and (param.typeName eq item.name)}"/> </h:outputLink> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider.xhtml index 1a48919..28a84bc 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider.xhtml @@ -70,9 +70,9 @@ </onc:sortableColumnHeader> </f:facet>
- <h:outputLink value="#{CreateContentSourceUIBean.getCreateContentProviderPageLink(item.name)}"> - <!-- note, do not use f:param with perspectives --> - + <h:outputLink value="#{CreateContentSourceUIBean.createContentProviderPageLink}"> + <f:param name="typeName" value="#{item.name}" /> + <f:param name="mode" value="new" /> <h:outputText value="#{item.displayName}" /> <h:outputText value=" *" rendered="#{(not empty param.typeName) and (param.typeName eq item.name)}"/> </h:outputLink> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml index a9880ae..6ab0ee4 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml @@ -86,7 +86,7 @@ <h:outputText styleClass="headerText" value="Name" /> </onc:sortableColumnHeader> </f:facet> - <h:outputLink value="repo.xhtml"> + <h:outputLink value="repo-plain.xhtml"> <f:param name="mode" value="view"/> <f:param name="id" value="#{item.id}"/> <h:outputText value="#{item.name}" /> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml index c5e970d..c575b47 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml @@ -51,7 +51,7 @@ </onc:sortableColumnHeader> </f:facet>
- <h:outputLink value="/rhq/content/repo.xhtml"> + <h:outputLink value="/rhq/content/repo-plain.xhtml"> <f:param name="mode" value="view"/> <f:param name="id" value="#{item.repo.id}"/> <h:outputText value="#{item.repo.name}" /> @@ -164,7 +164,7 @@ </onc:sortableColumnHeader> </f:facet>
- <h:outputLink value="/rhq/content/repo.xhtml"> + <h:outputLink value="/rhq/content/repo-plain.xhtml"> <f:param name="mode" value="view"/> <f:param name="id" value="#{item.repo.id}"/> <h:outputText value="#{item.repo.name}" /> diff --git a/modules/enterprise/gui/portal-war/src/test/groovy/org/rhq/enterprise/gui/util/LookupComponentTest.groovy b/modules/enterprise/gui/portal-war/src/test/groovy/org/rhq/enterprise/gui/util/LookupComponentTest.groovy deleted file mode 100644 index 7e1f27a..0000000 --- a/modules/enterprise/gui/portal-war/src/test/groovy/org/rhq/enterprise/gui/util/LookupComponentTest.groovy +++ /dev/null @@ -1,92 +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.enterprise.gui.util - -import java.lang.reflect.Method -import org.jboss.seam.ScopeType -import org.jboss.seam.contexts.BasicContext -import org.jboss.seam.contexts.Context -import org.jboss.seam.core.Init -import org.rhq.enterprise.gui.util.LookupComponent.LookupUtilComponent -import org.rhq.enterprise.server.util.LookupUtil -import org.testng.AssertJUnit -import org.testng.annotations.BeforeClass -import org.testng.annotations.DataProvider -import org.testng.annotations.Test - -public class LookupComponentTest { - - def lookupComponent - def contextMap - - @BeforeClass - void setUp() { - contextMap = [:] - - lookupComponent = new LookupComponent() - lookupComponent.init = new Init() - lookupComponent.applicationContext = new BasicContext(ScopeType.APPLICATION, contextMap) - - lookupComponent.scanComponents() - } - - @DataProvider(name="components") - Object[][] createExpectedComponents() { - // Note: these are just arbitrary - feel free to add to the list - [ - [ "activeConditionProducer.component", "activeConditionProducer", getMethod("getActiveConditionProducer") ], - [ "activeConditionConsumer.component", "activeConditionConsumer", getMethod("getActiveConditionConsumer") ], - [ "agentManager.component", "agentManager", getMethod("getAgentManager") ], - [ "alertConditionCacheManager.component", "alertConditionCacheManager", getMethod("getAlertConditionCacheManager") ], - [ "alertConditionManager.component", "alertConditionManager", getMethod("getAlertConditionManager") ], - [ "alertDefinitionManager.component", "alertDefinitionManager", getMethod("getAlertDefinitionManager") ], - [ "alertSubsystemManager.component", "alertSubsystemManager", getMethod("getAlertSubsystemManager") ], - [ "configurationManager.component", "configurationManager", getMethod("getConfigurationManager") ], - [ "emailManagerBean.component", "emailManagerBean", getMethod("getEmailManagerBean") ], - [ "resourceManager.component", "resourceManager", getMethod("getResourceManager") ], - ] - } - - def getMethod(String methodName) { - return LookupUtil.class.getMethod(methodName) - } - - @Test(dataProvider="components") - void componentExists(def expectedComponentName, def expectedName, def expectedMethod) { - def component = contextMap[expectedComponentName] - - AssertJUnit.assertNotNull("The component: '" + expectedComponentName + "' should be in the application context.", component) - } - - @Test(dataProvider="components") - void componentName(def expectedComponentName, def expectedName, def expectedMethod) { - def component = contextMap[expectedComponentName] - - AssertJUnit.assertEquals("Created component should be named: " + expectedName, expectedName, component.getName()) - } - - @Test(dataProvider="components") - void componentMethod(def expectedComponentName, def expectedName, def expectedMethod) { - def component = contextMap[expectedComponentName] - - AssertJUnit.assertEquals("The method: " + expectedMethod.toGenericString() + " should be called to create component: " + expectedName, - expectedMethod, component.getCreationMethod()) - } - -} \ No newline at end of file diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml index 936c5b9..f6601ab 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml @@ -461,10 +461,6 @@ <priority value="WARN"/> </category>
- <category name="org.jboss.seam"> - <priority value="WARN"/> - </category> - <!-- ================= --> <!-- The root category --> <!-- ================= --> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index fc67965..4a05dd2 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -17,9 +17,6 @@
<properties> <earDirectory>${project.build.directory}/${project.build.finalName}</earDirectory> - - <!-- dependency versions --> - <seam.version>1.2.1.GA</seam.version> </properties>
<dependencies> 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 7aea01a..1b1f5fb 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 @@ -25,9 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map;
-import javax.ejb.EJB; -import javax.ejb.Stateless; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; @@ -44,12 +41,12 @@ import org.rhq.enterprise.server.perspective.activator.context.GlobalActivationC import org.rhq.enterprise.server.perspective.activator.context.ResourceActivationContext; import org.rhq.enterprise.server.plugin.pc.perspective.metadata.PerspectivePluginMetadataManager;
-@Stateless /** * @author Jay Shaughnessy * @author Ian Springer */ -public class PerspectiveManagerBean implements PerspectiveManagerLocal { +//@Stateless +public class PerspectiveManagerBean {//implements PerspectiveManagerLocal {
// Map of sessionId to cached menu entry. The cached menu is re-used for the same sessionId. // This should more appropriately use Subject as the key, but since Subject equality is @@ -61,10 +58,10 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal {
private final Log log = LogFactory.getLog(PerspectiveManagerBean.class);
- @EJB + //@EJB private ServerManagerLocal serverManager;
- @EJB + //@EJB private SubjectManagerLocal subjectManager;
/* (non-Javadoc) @@ -477,4 +474,4 @@ public class PerspectiveManagerBean implements PerspectiveManagerLocal { String result = protocol + server.getAddress() + ":" + port + url; return result; } -} \ No newline at end of file +} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java deleted file mode 100644 index 497d89c..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java +++ /dev/null @@ -1,184 +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 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.server.perspective; - -import java.util.List; -import java.util.Map; - -import javax.ejb.Local; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.resource.Resource; - -@Local -public interface PerspectiveManagerLocal { - /** - * Return the core menu for the specified subject. Depending on their inventory and roles the - * core menu for one subject1 could differ from that of subject2. - * - * Subsequent calls will return the same core menu for the same Subject. In other words, it does - * not change during a user session. - * - * @param subject - * @return - */ - List<MenuItem> getMenu(Subject subject) throws PerspectiveException; - - /** - * Returns the list of tabs that should be displayed for the specified user for the specified Resource. - * - * @param subject a user - * @param resource an inventoried Resource - * @return the list of tabs that should be displayed for the specified user for the specified Resource - */ - List<Tab> getResourceTabs(Subject subject, Resource resource); - - /** - * Return the url for the given page and name, if one is defined. - * - * @param subject a user - * @param pageName, a valid page extension point - * @param linkName, the link that should be replaced - * @param defaultValue, if no perspective link is defined for the pageName+linkName, the value to return - * @return the page link extenstion's url. defaultValue if not found - */ - String getPageLink(Subject subject, String pageName, String linkName, String defaultValue); - - /** - * Given a targetUrlKey parameter value, as set in the extension, resolve that key into the targetUrl - * for the extension's content. - * - * @param key, a valid key - * @return the target url - */ - public String getUrlViaKey(int key) throws PerspectiveException; - - // ************************************************************************************************* - // The following were previously the remote API. The perspective API is not yet ready for release - // ************************************************************************************************* - - /** - * Get the CoreUI context root. This can be used to assemble a url not otherwise obtainable via the API. - * This should be used with care as hardcoded paths may break in future releases of the core UI. - * - * @param subject - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return the Core GUI root url in the format "protocol://host:port/" - */ - String getRootUrl(Subject subject, boolean makeExplicit, boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * @param subject - * @param menuItemName The name of the menuItem extension point - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified extension point. May return null if the extension does not specify a url - * @throws IllegalArgumentException if the extension point does not exist. - */ - String getMenuItemUrl(Subject subject, String menuItemName, boolean makeExplicit, boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * @param subject - * @param tabName The name of the resource tab extension point - * @param resourceId The resource id to be incorporated into the url. This method does not check the validity - * of the resourceId. - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified extension point. May return null if the extension does not specify a url - * @throws IllegalArgumentException if the extension point does not exist. - */ - String getResourceTabUrl(Subject subject, String tabName, int resourceId, boolean makeExplicit, boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * - * @param subject - * @param target The target of the navigation link. for example, a role. - * @param targetId The id of the specified target. for example, a roleId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified target. - */ - String getTargetUrl(Subject subject, PerspectiveTarget target, int targetId, boolean makeExplicit, - boolean makeSecure); - - /** - * When requesting the same target url for several targets this is a more efficient call than calling - * getTargetUrl() repeatedly. For example, if generating links to a list of resources. - * - * This method does not ensure the specified subject can actually access the requested urls. - * - * @param subject - * @param target The target of the navigation link. for example, a role. - * @param targetId The id of the specified target. for example, a roleId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return A Map of targetId to url mappings. - */ - Map<Integer, String> getTargetUrls(Subject subject, PerspectiveTarget target, int[] targetIds, - boolean makeExplicit, boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * - * @param subject - * @param resourceId The resource id of the specified target. for example, the resource on which an alert is exists - * @param target The target of the navigation link. for example, an alert. - * @param targetId The id of the specified target. for example, an alertId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified target. - */ - String getResourceTargetUrl(Subject subject, int resourceId, PerspectiveTarget target, int targetId, - boolean makeExplicit, boolean makeSecure); - - /** - * When requesting the same target url for several resource targets this is a more efficient call than calling - * getResourceTargetUrl() repeatedly. For example, if generating links to a list of a resource's alerts. - * - * Same This method does not ensure the specified subject can actually access the requested urls. - * - * @param subject - * @param resourceId The resource id of the specified target. for example, the resource on which an alert is exists - * @param target The target of the navigation link. for example, an alert. - * @param targetId The id of the specified target. for example, an alertId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return A Map of targetId to url mappings. - */ - Map<Integer, String> getResourceTargetUrls(Subject subject, int resourceId, PerspectiveTarget target, - int[] targetIds, boolean makeExplicit, boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * @param subject - * @param resourceTypeId The resourceType id of the specified target. for example, the type for an alert template - * @param target The target of the navigation link. for example, an alert template - * @param targetId The id of the specified target. for example, an alert template definition Id - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified target. - */ - String getTemplateTargetUrl(Subject subject, int resourceId, PerspectiveTarget target, int targetId, - boolean makeExplicit, boolean makeSecure); - -} \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 6c82e91..989b546 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -144,8 +144,6 @@ import org.rhq.enterprise.server.measurement.MeasurementViewManagerBean; import org.rhq.enterprise.server.measurement.MeasurementViewManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerBean; import org.rhq.enterprise.server.operation.OperationManagerLocal; -import org.rhq.enterprise.server.perspective.PerspectiveManagerBean; -import org.rhq.enterprise.server.perspective.PerspectiveManagerLocal; import org.rhq.enterprise.server.plugin.ServerPluginsBean; import org.rhq.enterprise.server.plugin.ServerPluginsLocal; import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement; @@ -574,10 +572,6 @@ public final class LookupUtil { return lookupLocal(SystemManagerBean.class); }
- public static PerspectiveManagerLocal getPerspectiveManager() { - return lookupLocal(PerspectiveManagerBean.class); - } - public static ProductVersionManagerLocal getProductVersionManager() { return lookupLocal(ProductVersionManagerBean.class); } diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index e768090..e8da660 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -13,24 +13,6 @@
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
- <properties> - <seam.version>2.1.0.SP1</seam.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> <plugins>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 21a5269..ae58aea 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -13,25 +13,9 @@
<name>RHQ Enterprise Server Roles Alert Plugin</name>
- <properties> - <seam.version>2.1.0.SP1</seam.version> - </properties> - <dependencies>
<dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>jboss.jboss-embeddable-ejb3</groupId> <artifactId>jboss-ejb3-all</artifactId> <version>1.0.0.Alpha9</version> diff --git a/modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/WEB-INF/components.xml b/modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/WEB-INF/components.xml deleted file mode 100644 index 4631d2e..0000000 --- a/modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/WEB-INF/components.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<components xmlns="http://jboss.com/products/seam/components" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:security="http://jboss.com/products/seam/security" - xsi:schemaLocation= - "http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd%22%3E - - <component name="org.jboss.seam.core.init"> - <property name="debug">false</property> - <!-- enable only when needed --> - <property name="transactionManagementEnabled">false</property> - </component> - -</components> diff --git a/modules/enterprise/server/plugins/perspectives/policy/perspective/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/perspectives/policy/perspective/src/main/resources/META-INF/rhq-serverplugin.xml index ded5e86..dd3bc00 100644 --- a/modules/enterprise/server/plugins/perspectives/policy/perspective/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/perspectives/policy/perspective/src/main/resources/META-INF/rhq-serverplugin.xml @@ -17,6 +17,7 @@ baseUrl="/rhq-policy-perspective" />
<!-- Administration > Provisioning --> + <!-- <menu-item name="administration.provisioning" displayName="Provisioning Bundles" @@ -26,5 +27,5 @@ name="administration.content" placement="after" /> </menu-item> - + --> </perspective-plugin> \ No newline at end of file
rhq-commits@lists.fedorahosted.org