[prev in list] [next in list] [prev in thread] [next in thread]
List: rhq-commits
Subject: [rhq] Branch 'release-3.0.0' - 3 commits - modules/enterprise modules/plugins
From: ips () fedoraproject ! org (ips)
Date: 2010-06-29 21:22:05
Message-ID: 20100629212205.CEAC5120268 () lists ! fedorahosted ! org
[Download RAW message or body]
modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml \
| 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml \
| 95 --------- modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml \
| 53 ----- modules/plugins/nss/pom.xml \
| 102 ---------- modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml \
| 4 5 files changed, 19 insertions(+), 239 deletions(-)
New commits:
commit 1dab7fe90f9f6e477878751dbeb50c56166de3f9
Author: Ian Springer <ian.springer at redhat.com>
Date: Tue Jun 29 17:21:51 2010 -0400
make nsswitch plugin pom and descriptor follow same conventions as the other \
agent plugins
diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml
index 47b015b..0b8578a 100644
--- a/modules/plugins/nss/pom.xml
+++ b/modules/plugins/nss/pom.xml
@@ -6,109 +6,19 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-plugins-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.rhq.plugin.nss</groupId>
<artifactId>nameservices-switch-plugin</artifactId>
- <version>0.0.7</version>
<packaging>jar</packaging>
<name>Name Service Switch</name>
<description>A Plugin for managing the Name Service Switch infrastructure of a \
Linux System</description>
- <properties>
- <rhq.version>1.4.0-SNAPSHOT</rhq.version>
- </properties>
-
- <dependencies>
-
- <!-- Below are the core modules that are required dependencies of all plugins \
-->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-plugin-api</artifactId>
- <version>${rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-native-system</artifactId>
- <version>${rhq.version}</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <!-- Fix for the Javac bug requiring annotations to be available when \
compiling classes. (fixed in JDK 6) -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <!-- Fix for the Javac bug requiring annotations to be available when \
compiling classes. (fixed in JDK 6) -->
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.GA</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <!-- Fix for the Javac bug requiring annotations to be available when \
compiling classes. (fixed in JDK 6) -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope> <!-- provided by the agent/plugin-container -->
- </dependency>
-
- <!--
- Uncomment the one of the three logging systems your plugin uses: log4j, \
commons-logging or i18nlog
- All three are provided to your plugin by the agent/plugin-container.
- -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Define any third-party dependencies your plugin has here. -->
- <!--
- <dependency>
- <groupId>group-id-of-dependency-goes-here</groupId>
- <artifactId>artifact-id-of-dependency-goes-here</artifactId>
- <version>version-of-dependency-goes-here</version>
- </dependency>
- -->
-
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-plugin-validator</artifactId>
- <version>${rhq.version}</version>
- </plugin>
-
-
- </plugins>
- </build>
-
<profiles>
<profile>
<id>dev</id>
diff --git a/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml \
b/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml index \
305129e..2ad376e 100644
--- a/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<plugin name=""
+<plugin name="NSS"
displayName="Name Service Switch"
version="1.0"
package="org.rhq.plugin.nss"
@@ -30,4 +30,6 @@
<c:simple-property name="aliases" displayName="aliases" default="" /> \
</resource-configuration>
</server>
+
</plugin>
+
commit e4637fefe54591d1b7a8001dd153755f388d382a
Author: Ian Springer <ian.springer at redhat.com>
Date: Tue Jun 29 17:20:56 2010 -0400
disable raw config support in GUI \
(https://bugzilla.redhat.com/show_bug.cgi?id=609211)
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml \
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml
index d10c5f4..9aafddc 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml
@@ -25,27 +25,6 @@ THIS TEXT WILL BE REMOVED.
<ui:param name="selectedTabName" value="Configuration.Current"/>
<ui:define name="content">
- <script type="text/javascript">
- function cursor_wait() {
- document.body.style.cursor = 'wait';
- }
-
- function cursor_clear() {
- document.body.style.cursor = 'default';
- }
-
- var currentFileModified = false;
-
- var selectedFile = '';
-
- function setCurrentFileModified() {
- currentFileModified = true;
- }
-
- function resetCurrentFile() {
- currentFileModified;
- }
- </script>
<h:panelGroup layout="block" styleClass="InfoBlock"
rendered="#{configurationEditor.updateInProgress}">
@@ -82,64 +61,11 @@ THIS TEXT WILL BE REMOVED.
</h:panelGrid>
</h:panelGrid>
- <c:choose>
- <c:when test="${configurationEditor.rawSupported}">
- <rich:tabPanel>
- <rich:tab label="Advanced Mode" onlabelclick="cursor_wait();" \
oncomplete="cursor_clear();">
- <ui:include src="raw.xhtml">
- <ui:param name="readOnly" value="false"/>
- </ui:include>
- </rich:tab>
- </rich:tabPanel>
- </c:when>
-
- <c:when test="${configurationEditor.structuredSupported}">
- <rich:tabPanel>
- <rich:tab label="Basic Mode" onlabelclick="cursor_wait();" \
oncomplete="cursor_clear();">
- <ui:include src="structured.xhtml">
- <ui:param name="readOnly" value="false"/>
- </ui:include>
-
- <ui:remove>
- <h:panelGrid columns="2" styleClass="buttons-table" \
columnClasses="button-cell"
- rendered="#{resourceConfiguration != null}">
- <h:commandButton value="SAVE" \
action="#{configurationEditor.updateConfiguration}"
- title="Click to Save Changes" \
styleClass="buttonmed"
- \
rendered="${ResourceUIBean.permissions.configure}"/>
- <h:commandButton value="RESET" type="reset" immediate="true"
- title="Click to Reset Fields" \
styleClass="buttonmed"/>
- </h:panelGrid>
- </ui:remove>
- </rich:tab>
- </rich:tabPanel>
- </c:when>
-
- <c:when test="${configurationEditor.structuredAndRawSupported}">
- <rich:tabPanel id="configTabPanel"
- selectedTab="#{configurationEditor.selectedTab}"
- switchType="ajax"
- valueChangeListener="#{configurationEditor.changeTabs}">
- <rich:tab id="structuredTab"
- label="Basic Mode"
- reRender="lowerCommitPanel,upperCommitPanel,modalEditor"
- onlabelclick="cursor_wait();"
- oncomplete="cursor_clear();">
- <ui:include src="structured.xhtml">
- <ui:param name="readOnly" value="false"/>
- </ui:include>
- </rich:tab>
- <rich:tab id="rawTab"
- label="Advanced Mode"
- \
reRender="fileMenuPanel,upperCommitPanel,lowerCommitPanel,modalEditor"
- onlabelclick="cursor_wait();"
- oncomplete="cursor_clear();">
- <ui:include src="raw.xhtml">
- <ui:param name="readOnly" value="false"/>
- </ui:include>
- </rich:tab>
- </rich:tabPanel>
- </c:when>
- </c:choose>
+ <c:if test="${configurationEditor.structuredSupported or \
configurationEditor.structuredAndRawSupported}"> + <ui:include \
src="structured.xhtml"> + <ui:param name="readOnly" value="false"/>
+ </ui:include>
+ </c:if>
<h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer">
<h:panelGroup id="lowerCommitPanel" style="text-align:right">
@@ -163,19 +89,8 @@ THIS TEXT WILL BE REMOVED.
</h:panelGroup>
</h:panelGrid>
- <ui:include src="view-raw-modal.xhtml">
- <ui:param name="readOnly" value="false"/>
- </ui:include>
-
- <ui:include src="error-window.xhtml"/>
</h:form>
- <!--
- upload-modal.xhtml needs to be included outside the above form because the \
file upload component requires its
- own, separate form.
- -->
- <ui:include src="upload-modal.xhtml"/>
-
</ui:define>
</ui:composition>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml \
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml
index 6541456..7a40797 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml
@@ -27,15 +27,6 @@ THIS TEXT WILL BE REMOVED.
<ui:param name="selectedTabName" value="Configuration.Current"/>
<ui:define name="content">
- <script type="text/javascript">
- function cursor_wait() {
- document.body.style.cursor = 'wait';
- }
-
- function cursor_clear() {
- document.body.style.cursor = 'default';
- }
- </script>
<h:panelGroup layout="block" styleClass="InfoBlock"
rendered="#{configurationViewer.updateInProgress}">
@@ -60,46 +51,9 @@ THIS TEXT WILL BE REMOVED.
</h:panelGrid>
</h:panelGrid>
- <c:choose>
- <c:when test="${configurationViewer.rawSupported}">
- <rich:tabPanel>
- <rich:tab label="Advanced Mode">
- <ui:include src="raw.xhtml"/>
- </rich:tab>
- </rich:tabPanel>
- </c:when>
-
- <c:when test="${configurationViewer.structuredSupported}">
- <rich:tabPanel>
- <rich:tab label="Basic Mode">
- <ui:include src="structured.xhtml"/>
- </rich:tab>
- </rich:tabPanel>
- </c:when>
-
- <c:when test="${configurationViewer.structuredAndRawSupported}">
- <rich:tabPanel id="resourceConfigurationTabPanel"
- switchType="ajax"
- valueChangeListener="#{configurationViewer.changeTabs}">
- <rich:tab id="structuredTab"
- label="Basic Mode"
- onlabelclick="cursor_wait();"
- oncomplete="cursor_clear();"
- limitToList="true"
- reRender="upperEditButton,lowerEditButton,modalEditor">
- <ui:include src="structured.xhtml"/>
- </rich:tab>
- <rich:tab id="rawTab"
- label="Advanced Mode"
- onlabelclick="cursor_wait();"
- oncomplete="cursor_clear();"
- limitToList="true"
- reRender="upperEditButton,lowerEditButton,modalEditor">
- <ui:include src="raw.xhtml"/>
- </rich:tab>
- </rich:tabPanel>
- </c:when>
- </c:choose>
+ <c:if test="${configurationViewer.structuredSupported or \
configurationViewer.structuredAndRawSupported}"> + <ui:include \
src="structured.xhtml"/> + </c:if>
<h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer">
<h:panelGroup style="text-align:right">
@@ -114,7 +68,6 @@ THIS TEXT WILL BE REMOVED.
</h:panelGroup>
</h:panelGrid>
- <ui:include src="view-raw-modal.xhtml"/>
</h:form>
</ui:define>
commit e6438c474e3eb5788b913893ab8c5db270dbbe3a
Author: Ian Springer <ian.springer at redhat.com>
Date: Tue Jun 29 17:18:30 2010 -0400
fix issue caused by original fix for IE scrollbar issue \
(https://bugzilla.redhat.com/show_bug.cgi?id=601744)
which was causing vertical scrollbar on Resource tab pages to be displayed by FF \
at 2/3 of the correct width
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml \
b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml \
index 7629fd7..e249621 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
@@ -49,8 +49,8 @@ id - the id of the Resource being accessed
</div>
</div>
<div id="centerContent" class="column" style="width: #{100 - \
UserPreferencesUIBean.leftResourceNavState}%;">
- <div id="centerContentWrapper" class="content-right" \
style="position: relative">
- <div style="left: 0; right: 0; height: 100%;">
+ <div id="centerContentWrapper" class="content-right">
+ <div style="left: 0; right: 0; height: 100%; position: \
relative">
<ui:insert name="summary"><p>Default Entity \
Summary</p></ui:insert>
<ui:insert name="tabBar"><p>Default Entity \
TabBar</p></ui:insert>
<ui:insert name="content"><p>Default Entity \
Content</p></ui:insert>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic