Disable building and assemblying rh-access-war by default, disable sh…

…owing up RHA-related menu items
rhq-project · Jun 26, 2014 · c49d373 · c49d373
1 parent 5a50fe2
commit c49d373
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/...c/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java b/...c/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java
@@ -51,7 +51,7 @@ public void onClick(MenuItemClickEvent event) {
 
     public boolean isToBeIncluded() {
         if (CoreGUI.isRHQ()) {
-            //return false; TODO disable for RHQ !!
+            return false;
         }
         Resource resource = resourceComposite.getResource();
         if (resource.getResourceType().getPlugin().equals("JBossAS7")) {

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java
@@ -279,12 +279,9 @@ private String getViewLink(ViewName view) {
         }
 
         private String createCspButtonContent() {
-            ProductInfo productInfo = CoreGUI.get().getProductInfo();
-            boolean isRHQ = (productInfo != null) && "RHQ".equals(productInfo.getShortName());
-            if (!isRHQ) { // TODO disable for RHQ
+            if (CoreGUI.isRHQ()) {
                 return "";
             }
-
             MenuItem search = new MenuItem(RhAccessView.PAGE_SEARCH, RhAccessView.VIEW_ID);
             MenuItem newCase = new MenuItem(RhAccessView.PAGE_NEW_CASE, RhAccessView.VIEW_ID);
             MenuItem myCases = new MenuItem(RhAccessView.PAGE_MY_CASES, RhAccessView.VIEW_ID);

diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
@@ -41,9 +41,6 @@
 
     <profile>
       <id>enable-rha</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <modules>
         <module>portal-war</module>
         <module>remote-client-war</module>

diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
@@ -540,13 +540,6 @@
     <profiles>
         <profile>
           <id>enable-rha</id>
-           <activation>
-              <property>
-                 <!-- we want this always active but activeByDefault doesn't work -->
-                 <!-- see http://maven.apache.org/guides/introduction/introduction-to-profiles.html -->
-                 <name>java.home</name>
-              </property>
-           </activation>
             <dependencies>
               <dependency>
                 <groupId>${project.groupId}</groupId>