EMBJOPR SVN: r84 - trunk/core/src/main/webapp.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-12-23 17:28:00 -0500 (Tue, 23 Dec 2008)
New Revision: 84
Modified:
trunk/core/src/main/webapp/login.xhtml
Log:
make username and password inputs the same width (note: works on FF but not IE)
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2008-12-23 21:39:14 UTC (rev 83)
+++ trunk/core/src/main/webapp/login.xhtml 2008-12-23 22:28:00 UTC (rev 84)
@@ -56,9 +56,9 @@
<h2>Please login to proceed.</h2>
<p/>
<h:outputLabel for="name" value="#{messages['security.username']}"/><br/>
- <h:inputText id="name" value="#{identity.username}"/></div>
+ <h:inputText id="name" value="#{identity.username}" size="20"/></div>
<div style="padding-top: 10px;"><h:outputLabel for="password" value="#{messages['security.password']}"/><br/>
- <h:inputSecret id="password" value="#{identity.password}"/></div>
+ <h:inputSecret id="password" value="#{identity.password}" size="20"/></div>
<div style="padding-top: 10px;"><h:commandButton value="#{messages['security.login']}" id="submit"
action="#{identity.login()}" styleClass="buttonmed"/>
</div>
16 years
EMBJOPR SVN: r83 - in trunk/core/src/main/webapp: css and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-12-23 16:39:14 -0500 (Tue, 23 Dec 2008)
New Revision: 83
Modified:
trunk/core/src/main/webapp/css/console-style.css
trunk/core/src/main/webapp/include/header.xhtml
trunk/core/src/main/webapp/login.xhtml
Log:
link logo image to embjopr homepage; add potential fix for login page CSS issue on IE7
Modified: trunk/core/src/main/webapp/css/console-style.css
===================================================================
--- trunk/core/src/main/webapp/css/console-style.css 2008-12-23 20:28:48 UTC (rev 82)
+++ trunk/core/src/main/webapp/css/console-style.css 2008-12-23 21:39:14 UTC (rev 83)
@@ -225,6 +225,7 @@
padding: 10px 60px 30px 60px;
width: 180px;
border: 1px solid #5f6a6f;
+ clear: both;
}
.Loginbox h4 {
Modified: trunk/core/src/main/webapp/include/header.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/header.xhtml 2008-12-23 20:28:48 UTC (rev 82)
+++ trunk/core/src/main/webapp/include/header.xhtml 2008-12-23 21:39:14 UTC (rev 83)
@@ -34,7 +34,9 @@
<ui:composition>
<div id="pageheader">
<div class="floatleft">
- <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
+ <h:outputLink value="http://jboss.org/embjopr/">
+ <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
+ </h:outputLink>
</div>
<div class="login">
<h:outputText rendered="#{not empty identity.username}">
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2008-12-23 20:28:48 UTC (rev 82)
+++ trunk/core/src/main/webapp/login.xhtml 2008-12-23 21:39:14 UTC (rev 83)
@@ -42,11 +42,14 @@
<div align="center" class="container">
<div id="pageheader">
<div class="floatleft">
- <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
+ <h:outputLink value="http://jboss.org/embjopr/">
+ <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
+ </h:outputLink>
</div>
<div class="login"><a href="#">#{messages['help.link']}</a><br/></div>
</div>
- <div class="Loginbox" ><h:messages layout="table" styleClass="loginerror-msg"/>
+ <div class="Loginbox">
+ <h:messages layout="table" styleClass="loginerror-msg"/>
<h:form id="login_form">
<div>
<h2>Welcome to the JBoss administration console.</h2>
16 years
EMBJOPR SVN: r82 - in trunk/core: src/main/webapp and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-12-23 15:28:48 -0500 (Tue, 23 Dec 2008)
New Revision: 82
Added:
trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif
trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_reg.gif
trunk/core/src/main/webappBinary/images/hdr_jbossadminconsole.gif
Removed:
trunk/core/src/main/webappBinary/images/hdr_hdrtitle.gif
Modified:
trunk/core/pom.xml
trunk/core/src/main/webapp/css/console-style.css
trunk/core/src/main/webapp/include/header.xhtml
trunk/core/src/main/webapp/login.xhtml
Log:
switch title image in header to Embedded Jopr logo; make font size of header links a bit larger
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2008-12-20 00:24:52 UTC (rev 81)
+++ trunk/core/pom.xml 2008-12-23 20:28:48 UTC (rev 82)
@@ -345,9 +345,10 @@
<fileset dir="target/classes" />
</copy>
- <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to <jbas4.warDir>...</echo>
+ <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} and src${file.separator}main${file.separator}webappBinary${file.separator} to <jbas4.warDir>...</echo>
<copy todir="${jbas4.warDir}">
<fileset dir="${basedir}/src/main/webapp" />
+ <fileset dir="${basedir}/src/main/webappBinary" />
</copy>
<!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
@@ -370,9 +371,10 @@
<fileset dir="target/classes" />
</copy>
- <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to <jbas5.warDir>...</echo>
+ <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} and src${file.separator}main${file.separator}webappBinary${file.separator} to <jbas5.warDir>...</echo>
<copy todir="${jbas5.warDir}">
<fileset dir="${basedir}/src/main/webapp" />
+ <fileset dir="${basedir}/src/main/webappBinary" />
</copy>
<!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
Modified: trunk/core/src/main/webapp/css/console-style.css
===================================================================
--- trunk/core/src/main/webapp/css/console-style.css 2008-12-20 00:24:52 UTC (rev 81)
+++ trunk/core/src/main/webapp/css/console-style.css 2008-12-23 20:28:48 UTC (rev 82)
@@ -36,9 +36,15 @@
/* ----------- MAIN LAYOUT COMPONENTS ------------ */
#pageheader {
+ /*
background-image: url( ../images/hdr_bkg.gif );
background-repeat: repeat-x;
+ */
+ background-color: #2A3B4E;
+ /*
height: 4em;
+ */
+ height: 49px;
color: #dddddd;
position: absolute;
top: 0;
@@ -54,7 +60,7 @@
padding-top: 5px;
margin-right: 20px;
text-align: right;
- font-size: 10px;
+ font-size: 11px;
line-height: 160%;
}
Modified: trunk/core/src/main/webapp/include/header.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/header.xhtml 2008-12-20 00:24:52 UTC (rev 81)
+++ trunk/core/src/main/webapp/include/header.xhtml 2008-12-23 20:28:48 UTC (rev 82)
@@ -34,7 +34,7 @@
<ui:composition>
<div id="pageheader">
<div class="floatleft">
- <h:graphicImage value="images/hdr_hdrtitle.gif"/>
+ <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
</div>
<div class="login">
<h:outputText rendered="#{not empty identity.username}">
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2008-12-20 00:24:52 UTC (rev 81)
+++ trunk/core/src/main/webapp/login.xhtml 2008-12-23 20:28:48 UTC (rev 82)
@@ -41,7 +41,9 @@
<body onload="document.getElementById('login_form:name').focus();">
<div align="center" class="container">
<div id="pageheader">
- <div class="floatleft"><h:graphicImage value="images/hdr_hdrtitle.gif"/></div>
+ <div class="floatleft">
+ <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/>
+ </div>
<div class="login"><a href="#">#{messages['help.link']}</a><br/></div>
</div>
<div class="Loginbox" ><h:messages layout="table" styleClass="loginerror-msg"/>
Added: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Added: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_reg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_reg.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Deleted: trunk/core/src/main/webappBinary/images/hdr_hdrtitle.gif
===================================================================
(Binary files differ)
Copied: trunk/core/src/main/webappBinary/images/hdr_jbossadminconsole.gif (from rev 81, trunk/core/src/main/webappBinary/images/hdr_hdrtitle.gif)
===================================================================
(Binary files differ)
16 years
EMBJOPR SVN: r81 - trunk/core/src/main/java/org/jboss/on/embedded/ui.
by embjopr-commits＠lists.jboss.org
Author: charles.crouch(a)jboss.com
Date: 2008-12-19 19:24:52 -0500 (Fri, 19 Dec 2008)
New Revision: 81
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java
Log:
add more debugging
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-12-20 00:23:43 UTC (rev 80)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-12-20 00:24:52 UTC (rev 81)
@@ -136,6 +136,7 @@
@Factory(value = "rootNode", scope=ScopeType.SESSION)
public JONTreeNode createJONTreeNode() {
+ log.debug("createJONTreeNode factory method being called.");
DummyTreeNode dummy = new DummyTreeNode();
PlatformResourceTreeNode platform = new PlatformResourceTreeNode(ResourceManagerFactory.resourceManager().getPlatform());
dummy.addChild(platform);
@@ -457,8 +458,7 @@
JONTreeNode node = findNode(getResourcePath(deletedResource));
if (node == null)
{
- log.warn("Unable to find node for deleted " + deletedResource.getResourceType().getName() + " '"
- + deletedResource.getName() + "'.");
+ log.warn("Unable to find node for deleted resource [" + deletedResource + "].");
return;
}
JONTreeNode parentNode = node.getParent();
16 years
EMBJOPR SVN: r80 - trunk/core/src/main/java/org/jboss/on/embedded.
by embjopr-commits＠lists.jboss.org
Author: charles.crouch(a)jboss.com
Date: 2008-12-19 19:23:43 -0500 (Fri, 19 Dec 2008)
New Revision: 80
Added:
trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java
Log:
Add a debugging event listener
Modified: trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java 2008-12-20 00:22:43 UTC (rev 79)
+++ trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java 2008-12-20 00:23:43 UTC (rev 80)
@@ -122,6 +122,7 @@
logLoadedPlugins(pluginContainer);
// Add our inventory listener BEFORE initiating Resource discovery.
pluginContainer.getInventoryManager().addInventoryEventListener(this.inventoryEventListener);
+ pluginContainer.getInventoryManager().addInventoryEventListener(new LoggingInventoryEventListener());
ResourceManager resourceManager = ResourceManagerFactory.resourceManager();
resourceManager.discoverResources();
LOG.info("Done bootstrapping Administration Console.");
Added: trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java (rev 0)
+++ trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2008-12-20 00:23:43 UTC (rev 80)
@@ -0,0 +1,64 @@
+/*
+ * 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.jboss.on.embedded;
+
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.pc.inventory.InventoryEventListener;
+
+/**
+ * @author Ian Springer
+ */
+public class LoggingInventoryEventListener implements InventoryEventListener
+{
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ public void resourcesAdded(Set<Resource> resources)
+ {
+ log.debug("The following resources have been added");
+ log(resources);
+ }
+
+ public void resourcesRemoved(Set<Resource> resources)
+ {
+ log.debug("The following resources have been removed");
+ log(resources);
+ return;
+ }
+
+ public void resourceActivated(Resource resource)
+ {
+ log.debug("The following resource has been activated");
+ log(resource);
+ return;
+ }
+
+ private void log(Set<Resource> resources) {
+ for (Resource resource : resources) {
+ log(resource);
+ }
+ }
+
+ private void log(Resource resource) {
+ log.debug("Resource[" + resource.getId() + "]: " + resource.getName());
+ }
+}
16 years
EMBJOPR SVN: r79 - trunk/core/src/main/java/org/jboss/on/embedded/manager/pc.
by embjopr-commits＠lists.jboss.org
Author: charles.crouch(a)jboss.com
Date: 2008-12-19 19:22:43 -0500 (Fri, 19 Dec 2008)
New Revision: 79
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
Log:
use the Constant
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2008-12-19 05:33:47 UTC (rev 78)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2008-12-20 00:22:43 UTC (rev 79)
@@ -316,7 +316,7 @@
{
// As ccrouch recalls, we do a service scan to pickup any change to the updated Resource's name.
discoverServicesSync();
- Events.instance().raiseEvent("resourceUpdated", resource);
+ Events.instance().raiseEvent(ResourceManager.RESOURCE_UPDATED_EVENT, resource);
}
}
catch (PluginContainerException e)
16 years
EMBJOPR SVN: r78 - in trunk/core/src/main: java/org/jboss/on/embedded/ui and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-12-19 00:33:47 -0500 (Fri, 19 Dec 2008)
New Revision: 78
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/Constants.java
trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
trunk/core/src/main/webapp/WEB-INF/pages.xml
Log:
handle user clicking on a stale resource instance link gracefully (fix for https://jira.jboss.org/jira/browse/EMBJOPR-54)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2008-12-18 18:30:13 UTC (rev 77)
+++ trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2008-12-19 05:33:47 UTC (rev 78)
@@ -63,6 +63,10 @@
*/
public static final String OUTCOME_RESOURCE_INSTANCE = "resourceInstance";
/**
+ * action outcome indicating that the summary page for the Platform resource instance should be displayed
+ */
+ public static final String OUTCOME_PLATFORM = "platform";
+ /**
* navigation key used to store all the datasources in the nav
*/
public static final String RESOURCE_CATEGORY_DATASOURCE = "datasource";
Modified: trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2008-12-18 18:30:13 UTC (rev 77)
+++ trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2008-12-19 05:33:47 UTC (rev 78)
@@ -83,8 +83,7 @@
{
if (this.navTreeInitialized)
for (Resource resource : resources)
- Events.instance().raiseEvent(ResourceManager.RESOURCE_DELETED_EVENT, resource.getResourceType(),
- resource.getParentResource());
+ Events.instance().raiseEvent(ResourceManager.RESOURCE_DELETED_EVENT, resource);
}
public void resourceActivated(Resource resource)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2008-12-18 18:30:13 UTC (rev 77)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2008-12-19 05:33:47 UTC (rev 78)
@@ -19,29 +19,26 @@
*/
package org.jboss.on.embedded.ui;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.faces.model.SelectItem;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.NotNull;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.resource.Resource;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+
import org.jboss.on.embedded.bean.ResourceListItem;
import org.jboss.on.embedded.manager.ResourceManager;
import org.jboss.on.embedded.manager.ResourceManagerFactory;
import org.jboss.on.embedded.ui.nav.JONTreeNode;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jetbrains.annotations.NotNull;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.model.SelectItem;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.RandomAccess;
-
/**
* Class to hold common methods used by Seam Action classes
*
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-12-18 18:30:13 UTC (rev 77)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-12-19 05:33:47 UTC (rev 78)
@@ -454,16 +454,15 @@
public void updateNavWithDeletedResource(Resource deletedResource)
{
log.info("Resource [" + deletedResource + "] deleted.");
- // TODO need to determine if this can ever return null
- JONTreeNode node = findNode(getResourcePath(deletedResource));
- // TODO need to determine if this can ever return null
+ JONTreeNode node = findNode(getResourcePath(deletedResource));
if (node == null)
{
- log.warn("Unable to find node for deleted Resource + '" + deletedResource.getName() + "'.");
+ log.warn("Unable to find node for deleted " + deletedResource.getResourceType().getName() + " '"
+ + deletedResource.getName() + "'.");
return;
}
- JONTreeNode parent = node.getParent();
- parent.reInitializeChildrenMap();
+ JONTreeNode parentNode = node.getParent();
+ parentNode.reInitializeChildrenMap();
}
@Observer(ResourceManager.RESOURCE_UPDATED_EVENT)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2008-12-18 18:30:13 UTC (rev 77)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2008-12-19 05:33:47 UTC (rev 78)
@@ -37,14 +37,18 @@
import org.jboss.on.embedded.manager.ResourceManager;
import org.jboss.on.embedded.manager.ResourceManagerFactory;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.faces.FacesMessages;
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.jboss.seam.annotations.Outcome;
+
import org.jetbrains.annotations.NotNull;
import javax.faces.event.ValueChangeEvent;
import javax.faces.context.FacesContext;
+import javax.faces.application.FacesMessage;
import java.util.ArrayList;
import java.util.List;
@@ -60,6 +64,9 @@
@Scope(ScopeType.EVENT)
public class SummaryAction
{
+ @In
+ private transient FacesMessages facesMessages;
+
/**
* the category that was selected based on the path request parameter
*/
@@ -131,6 +138,18 @@
}
public String getOutcome() {
+ ResourceManager resourceManager = ResourceManagerFactory.resourceManager();
+ if (resourceManager.getResource(this.resource.getId()) == null) {
+ SummaryAction.this.facesMessages.add(FacesMessage.SEVERITY_WARN,
+ "#0 '#1' no longer exists.", this.resource.getResourceType().getName(),
+ this.resource.getName());
+ // Reset the current node to the stale Resource node's parent node.
+ JONTreeNode parentNode = SummaryAction.this.navigationAction.getSelectedNode().getParent();
+ SummaryAction.this.navigationAction.setCurrentPath(parentNode.getPath());
+ // And refresh the parent node's children to remove the stale Resource node.
+ parentNode.reInitializeChildrenMap();
+ return Constants.OUTCOME_ERROR;
+ }
setResourceAndSummaryInfo(this.resource);
return Constants.OUTCOME_RESOURCE_INSTANCE;
}
Modified: trunk/core/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/pages.xml 2008-12-18 18:30:13 UTC (rev 77)
+++ trunk/core/src/main/webapp/WEB-INF/pages.xml 2008-12-19 05:33:47 UTC (rev 78)
@@ -42,7 +42,7 @@
</page>
<!-- summary.xhtml is a placeholder view-id, the page doesn't actually
-exist. Instead the navigation rules below determine which actual page is rendered-->
+ exist. Instead the navigation rules below determine which actual page is rendered-->
<page view-id="/secure/summary.xhtml">
<!-- map the path request parameter to a session scoped variable -->
<param name="path" value="#{navigationAction.currentPath}"/>
@@ -66,6 +66,9 @@
<rule if-outcome="resourceInstance">
<render view-id="/secure/resourceInstanceSummary.xhtml"/>
</rule>
+ <rule if-outcome="error">
+ <redirect view-id="/secure/summary.xhtml"/>
+ </rule>
</navigation>
</page>
16 years
EMBJOPR SVN: r77 - trunk.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-12-18 13:30:13 -0500 (Thu, 18 Dec 2008)
New Revision: 77
Modified:
trunk/pom.xml
Log:
upgrade RichFaces dep from 3.2.2.GA to 3.2.2.SR1 (https://jira.jboss.org/jira/browse/EMBJOPR-59)
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-12-17 21:28:44 UTC (rev 76)
+++ trunk/pom.xml 2008-12-18 18:30:13 UTC (rev 77)
@@ -65,7 +65,7 @@
<jaxb-api.version>2.1</jaxb-api.version>
<jaxb-impl.version>2.1.6</jaxb-impl.version>
<jon.version>2.2.0-SNAPSHOT</jon.version>
- <richfaces.version>3.2.2.GA</richfaces.version>
+ <richfaces.version>3.2.2.SR1</richfaces.version>
<rhq.version>1.2.0-SNAPSHOT</rhq.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
16 years
EMBJOPR SVN: r76 - trunk/core/src/main/java/org/jboss/on/embedded/manager/pc.
by embjopr-commits＠lists.jboss.org
Author: charles.crouch(a)jboss.com
Date: 2008-12-17 16:28:44 -0500 (Wed, 17 Dec 2008)
New Revision: 76
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
Log:
EMBJOPR-55 get rid unnecessary raising of Events, this should now be handled by the EventListener
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2008-12-17 20:52:41 UTC (rev 75)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2008-12-17 21:28:44 UTC (rev 76)
@@ -253,7 +253,6 @@
if (response.getStatus() == DeleteResourceStatus.SUCCESS)
{
discoverServicesSync();
- //Events.instance().raiseEvent(ResourceManager.RESOURCE_DELETED_EVENT, resource);
}
}
catch (PluginContainerException e)
@@ -290,8 +289,7 @@
response = getResourceFactoryService().executeCreateResourceImmediately(request);
if (response.getStatus() == CreateResourceStatus.SUCCESS)
{
- discoverServicesSync();
- Events.instance().raiseEvent(ResourceManager.RESOURCE_CREATED_EVENT, resourceType, parentResource);
+ discoverServicesSync();
}
}
catch (PluginContainerException e)
16 years
EMBJOPR SVN: r75 - trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-12-17 15:52:41 -0500 (Wed, 17 Dec 2008)
New Revision: 75
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java
Log:
display prettier failure message when an operation throws an UnsupportedOperationExcpetion (fix for https://jira.jboss.org/jira/browse/EMBJOPR-49 and https://jira.jboss.org/jira/browse/SOA-792)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java 2008-12-16 20:13:35 UTC (rev 74)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java 2008-12-17 20:52:41 UTC (rev 75)
@@ -60,15 +60,19 @@
public void operationFailed(String jobId, ExceptionPackage error, long invocationTime, long completionTime)
{
- OperationHistory history = historyBean.getHistory(jobId);
- history.setStatus(OperationRequestStatus.FAILURE);
+ OperationHistory operationHistory = historyBean.getHistory(jobId);
+ operationHistory.setStatus(OperationRequestStatus.FAILURE);
if (error != null)
{
- history.setErrorMessage(error.getStackTraceString());
+ if (error.getExceptionName().equals(UnsupportedOperationException.class.getName()))
+ operationHistory.setErrorMessage("The '" + operationHistory.getOperationDefinition().getName()
+ + "' operation is not supported by Embedded Jopr: " + error.getMessage());
+ else
+ operationHistory.setErrorMessage(error.getStackTraceString());
}
else
{
- history.setErrorMessage("Failed for an unknown reason at " + new Date(completionTime));
+ operationHistory.setErrorMessage("Failed for an unknown reason at " + new Date(completionTime));
}
}
@@ -81,5 +85,4 @@
history.setErrorMessage("Timed Out");
}
}
-
}
16 years