EMBJOPR SVN: r777 - trunk.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-10-06 15:02:05 -0400 (Tue, 06 Oct 2009)
New Revision: 777
Modified:
trunk/BUILD.txt
Log:
update content and improve structure
Modified: trunk/BUILD.txt
===================================================================
--- trunk/BUILD.txt 2009-10-06 14:33:47 UTC (rev 776)
+++ trunk/BUILD.txt 2009-10-06 19:02:05 UTC (rev 777)
@@ -2,7 +2,9 @@
********************************
Compiling
=========
-1) Make sure you have JDK 5, a Subversion (SVN) client, and Maven 2 setup on your system.
+1) Make sure you have JDK 5, a Subversion (SVN) client, and Maven 2 setup on
+ your system.
+
2) Check out the Embedded Jopr source from SVN:
svn co http://anonsvn.jboss.org/repos/embjopr/trunk/ embjopr
@@ -10,6 +12,7 @@
or, if you are a committer:
svn co https://svn.jboss.org/repos/embjopr/trunk/ embjopr
+
3) Build Embedded Jopr:
cd embjopr
@@ -17,53 +20,70 @@
This will produce two admin console WARs:
- * jbas4/target/jbas4-console.war - for JBAS 4.2.x deployment
- * jbas5/target/jbas5-console.war - for JBAS 5.x deployment
+ * jbas4/target/jbas4-console.war
+ - for deployment to JBoss AS 4.2.x or JBoss EAP 4.3.x
+ * jbas5/target/jbas5-console.war
+ - for deployment to JBoss AS 5.1.x or JBoss EAP 5.x
Installation
============
-See INSTALL.txt in the embjopr root directory for instructions on:
-1) Installing the admin console WAR to a JBAS instance.
-2) Logging in to the admin console.
+See INSTALL.txt in the embjopr root directory for instructions on installing
+the admin console WAR to a JBAS instance and logging in to the admin console.
+NOTE: If you are deploying the admin console to EAP 5.x, you should remove the
+ bundled admin-console.war from the deploy dir before installing your
+ self-built admin console WAR.
+
+NOTE: If you think you may want to activate the dev profile at some point, you
+ should deploy the admin console WAR in exploded form (i.e. as a
+ directory).
+
'dev' Profile
=============
-If you are doing development work on Embedded Jopr, the 'dev' Maven profile can be used to speed up the dev/test cycle.
-This will cause Maven to automatically copy any updated files to a copy of the admin console WAR deployed to a JBAS
-instance.
+If you are doing development work on Embedded Jopr, the 'dev' Maven profile can
+be used to speed up the dev/test cycle. This will cause the Maven compile and
+package phases to automatically copy any updated files to a copy of the admin
+console WAR deployed to a JBAS instance. For details on configuring the dev
+profile, see steps 3 and 4 below.
-One-Time Steps
---------------
-1) (OPTIONAL) Activate the 'dev' profile either by adding "<activeProfile>dev</activeProfile>" to the "activeProfiles"
- section of your Maven settings.xml or by specifying -Pdev when running "mvn package" to build the Admin Console WAR.
-2) Add the following to the "profiles" section of your Maven settings.xml:
+Optional One-Time Steps
+=======================
+1) Increase your JVM memory settings in run.sh/conf/bat to at least the
+ following (via the JAVA_OPTS environment variable):
+
+ -Xms200M -Xmx200M -XX:PermSize=200M -XX:MaxPermSize=200M
+
+ This is recommended during development, because multiple redeploys of
+ Seam-based webapps can cause you to run out of heap, or more likely,
+ permgen. The app server must be restarted for this change to take effect.
+
+2) Add the reloadable="true" atrribute to
+ $JBOSS_HOME/server/$CONFIG/deploy/jboss-web.deployer/context.xml, i.e.:
+
+ <Context cookies="true" crossContext="true" reloadable="true">
+
+ This will ensure that the WAR gets redeployed by JBAS whenever a dev profile
+ build is run. The app server must be restarted for this change to take
+ effect.
+
+3) In your ~/.m2/settings.xml, add the following to the "profiles" section
+ to set the properties required by the dev profile:
+
<profile>
<id>dev</id>
<properties>
- <!-- Set the below prop to the location to your dev JBAS 4.2/4.3 deploy location for the admin console WAR.
+ <!-- Set the below prop to the location to your dev JBAS 4.2/4.3
+ deploy location for the admin console WAR.
e.g.: C:/opt/jboss-eap-4.3.0.GA_CP02/jboss-as/server/production -->
<jbas4.configDir>SET_ME</jbas4.configDir>
- <!-- Set the below prop to the location to your dev JBAS 5.0 deploy location for the embedded console WAR.
- e.g.: C:/opt/jboss-5.0.0.CR1/server/default -->
+ <!-- Set the below prop to the location to your dev JBAS 5.0 deploy
+ location for the embedded console WAR.
+ e.g.: C:/opt/jboss-5.1.0.GA/server/default -->
<jbas5.configDir>SET_ME</jbas5.configDir>
</properties>
</profile>
-3) Add the reloadable="true" atrribute to $JBOSS_HOME/server/$CONFIG/deploy/jboss-web.deployer/context.xml, i.e.:
- <Context cookies="true" crossContext="true" reloadable="true">
- This will ensure that the WAR gets redeployed by JBAS whenever a dev-profile build is run.
-4) Increase your JVM memory settings in run.sh/conf/bat to at least the following
- (via the JAVA_OPTS environment variable):
-
- -Xms200M -Xmx200M -XX:PermSize=200M -XX:MaxPermSize=200M
-
- This is recommended, because multiple redeploys of Seam-based webapps can cause you to run out of heap,
- or more likely, permgen.
-5) Restart your JBAS instance, so the changes from 3) and 4) will take effect.
-6) Build Embedded Jopr using the instructions above, then copy the admin console WAR corresponding to your
- JBAS version, *in exploded form*, to the deploy directory of your development JBAS instance.
-
-Running Builds
---------------
-If you did not activate the 'dev' profile in your Maven settings.xml (step 1 above), make sure to include "-Pdev"
-to activate the 'dev' profile when running mvn.
+4) In your ~/.m2/settings.xml, activate the 'dev' profile by default by adding
+ "<activeProfile>dev</activeProfile>" to the "activeProfiles" section. If you
+ do not do this, you can always activate the dev profile for a particular mvn
+ run by including "-Pdev" on the mvn command line.
15 years, 3 months
- 1
- 0
EMBJOPR SVN: r776 - trunk.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-10-06 10:33:47 -0400 (Tue, 06 Oct 2009)
New Revision: 776
Modified:
trunk/pom.xml
Log:
upgrade RichFaces from 3.3.0.GA to 3.3.2.GA (https://jira.jboss.org/jira/browse/EMBJOPR-257)
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-10-02 19:51:36 UTC (rev 775)
+++ trunk/pom.xml 2009-10-06 14:33:47 UTC (rev 776)
@@ -65,7 +65,7 @@
<jaxb-api.version>2.1</jaxb-api.version>
<jaxb-impl.version>2.1.6</jaxb-impl.version>
<jopr.version>2.4.0-SNAPSHOT</jopr.version>
- <richfaces.version>3.3.0.GA</richfaces.version>
+ <richfaces.version>3.3.2.GA</richfaces.version>
<rhq.version>1.4.0-SNAPSHOT</rhq.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
15 years, 3 months
- 1
- 0
EMBJOPR SVN: r775 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/connfactories and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-10-02 15:51:36 -0400 (Fri, 02 Oct 2009)
New Revision: 775
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java
Log:
* ConnFactory and Datasource tests: JNDI names changed to be hierarchical (prepended "EJtest/")
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-10-02 19:42:47 UTC (rev 774)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-10-02 19:51:36 UTC (rev 775)
@@ -392,7 +392,7 @@
protected Map<String, MetaValue> createDatasourcePropertiesAsMetaValues() {
Map<String, MetaValue> propertiesMap = new LinkedHashMap<String, MetaValue>();
- propertiesMap.put("jndi-name", SimpleValueSupport.wrap("TestDS"));
+ propertiesMap.put("jndi-name", SimpleValueSupport.wrap("EJtest/TestDS"));
propertiesMap.put("user-name", SimpleValueSupport.wrap("testUser"));
propertiesMap.put("password", SimpleValueSupport.wrap("password"));
propertiesMap.put("min-pool-size", SimpleValueSupport.wrap(new Integer(5)));
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-02 19:42:47 UTC (rev 774)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-02 19:51:36 UTC (rev 775)
@@ -22,20 +22,17 @@
package org.jboss.jopr.jsfunit.as5.connfactories;
-import org.jboss.jopr.jsfunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
import java.io.*;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jboss.jopr.jsfunit.exceptions.*;
-import org.jboss.jopr.jsfunit.as5.ResourceTestBase;
import org.jboss.managed.api.ComponentType;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.api.values.MetaValue;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.*;
+
/**
* This class contains tests for creating Connection Factories with JBoss AS 5.
*
@@ -56,7 +53,7 @@
*/
public void testCreateTxConnectionFactory() throws Exception {
- String jndiName = "CreateTxConnFactory";
+ String jndiName = "EJtest/CreateTxConnFactory";
Map<String, MetaValue> propertiesMapAsMetaValues = createConnFactoryPropertiesAsMetaValues(jndiName);
// Add an additional property
@@ -74,7 +71,7 @@
*/
public void testCreateNoTxConnectionFactory() throws Exception {
- String jndiName = "CreateNoTxConnFactory";
+ String jndiName = "EJtest/CreateNoTxConnFactory";
Map<String, MetaValue> propertiesMapAsMetaValues = createConnFactoryPropertiesAsMetaValues(jndiName);
createConnFactoryCommon(jndiName, CFType.NO_TX_CF,
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java 2009-10-02 19:42:47 UTC (rev 774)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java 2009-10-02 19:51:36 UTC (rev 775)
@@ -22,22 +22,12 @@
package org.jboss.jopr.jsfunit.as5.datasources;
-import org.jboss.jopr.jsfunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
-import javax.management.ObjectName;
-import java.util.Map;
-import javax.management.JMException;
-import java.sql.Connection;
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
-import org.jboss.deployers.spi.management.KnownComponentTypes;
-import org.jboss.managed.api.ComponentType;
-import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.metatype.api.values.MetaValue;
-import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
/**
* This class contains creation tests for datasources.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java 2009-10-02 19:42:47 UTC (rev 774)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java 2009-10-02 19:51:36 UTC (rev 775)
@@ -25,9 +25,6 @@
import org.jboss.jopr.jsfunit.*;
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
-import java.util.*;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import javax.management.ObjectName;
import java.util.Map;
import javax.management.JMException;
15 years, 3 months
- 1
- 0
EMBJOPR SVN: r774 - in trunk/core/src/main: java/org/jboss/on/embedded/ui and 2 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-10-02 15:42:47 -0400 (Fri, 02 Oct 2009)
New Revision: 774
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
trunk/core/src/main/webapp/secure/addMap.xhtml
trunk/core/src/main/webapp/secure/addSimple.xhtml
trunk/core/src/main/webapp/secure/editMap.xhtml
trunk/core/src/main/webapp/secure/operationParameters.xhtml
trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml
trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml
trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml
trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml
Log:
stop using 'resource' as an EL variable name, since it's an implicit EL var in JSF2 (https://jira.jboss.org/jira/browse/EMBJOPR-253)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java 2009-10-02 19:42:47 UTC (rev 774)
@@ -57,10 +57,18 @@
}
}
+ public String getVersion() {
+ return resource.getVersion();
+ }
+
public String getName() {
return resource.getName();
}
+ public String getDescription() {
+ return resource.getDescription();
+ }
+
public String getType() {
return resource.getResourceType().getName();
}
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 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2009-10-02 19:42:47 UTC (rev 774)
@@ -84,7 +84,7 @@
{
// there are plenty of other implementations we could use here
// e.g. navigationAction.getSelectedNode().getResource()
- String path = navigationAction.getCurrentPath();
+ String path = this.navigationAction.getCurrentPath();
int resourceId;
try
{
@@ -116,7 +116,7 @@
public List<SelectItem> asSelectItemList()
{
- JONTreeNode selectedNode = navigationAction.getSelectedNode();
+ JONTreeNode selectedNode = this.navigationAction.getSelectedNode();
Collection<JONTreeNode> c = selectedNode.getChildNodes();
List<SelectItem> result = new ArrayList<SelectItem>();
if (c != null)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-10-02 19:42:47 UTC (rev 774)
@@ -53,7 +53,7 @@
* the resource being displayed on the metric tab
*/
@Out(required = false)
- private ResourceListItem resource;
+ private ResourceListItem currentResource;
/**
* this resource's resource type
@@ -96,13 +96,13 @@
public String view()
{
- resource = commonActionUtil.getCurrentResourceListItem();
+ currentResource = commonActionUtil.getCurrentResourceListItem();
- resourceType = resource.getResource().getResourceType();
+ resourceType = currentResource.getResource().getResourceType();
measurementDisplayMap = new HashMap<String, List<MeasurementDisplay>>();
- MeasurementUtils measurementUtils = new MeasurementUtils(resource);
+ MeasurementUtils measurementUtils = new MeasurementUtils(currentResource);
measurementDefinitionMap = measurementUtils.getMeasurementDefinitionMap();
List<MeasurementData> measurementDataList = measurementUtils.loadMeasurementData(null, DataType.MEASUREMENT);
measurementCategoryList = measurementUtils.loadCategoryList(measurementDefinitionMap,
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-10-02 19:42:47 UTC (rev 774)
@@ -41,8 +41,8 @@
@Scope(ScopeType.SESSION)
public class SingleResourceContentAction implements Serializable
{
- @Out(value = "currentResource", required = false, scope = ScopeType.PAGE)
- private Resource resource;
+ @Out(required = false, scope = ScopeType.PAGE)
+ private Resource currentResource;
@Out(value = "contentHistory", required = false, scope = ScopeType.SESSION)
private ContentDiscoveryReport contentHistory;
@@ -58,8 +58,8 @@
public void getContent()
{
- resource = commonActionUtil.getCurrentResource();
- Collection<ContentDiscoveryReport> historyForResource = contentManager.getHistoryForResource(resource);
+ currentResource = commonActionUtil.getCurrentResource();
+ Collection<ContentDiscoveryReport> historyForResource = contentManager.getHistoryForResource(currentResource);
if (historyForResource != null && historyForResource.size() > 0)
{
for (ContentDiscoveryReport currentReport : historyForResource)
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 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2009-10-02 19:42:47 UTC (rev 774)
@@ -87,7 +87,7 @@
* the resource that was selected based on the path request parameter
*/
@Out(required = false)
- private ResourceListItem resource;
+ private ResourceListItem currentResource;
/**
* all measurement data for this resource marked with the "summary" displayType
@@ -256,11 +256,11 @@
public void setResourceAndSummaryInfo(Resource selectedResource)
{
Availability availability = ResourceManagerFactory.resourceManager().getAvailability(selectedResource);
- resource = new ResourceListItem(selectedResource, availability);
+ currentResource = new ResourceListItem(selectedResource, availability);
resourceType = selectedResource.getResourceType();
summaryMeasurementDisplayList = new ArrayList<MeasurementDisplay>();
- MeasurementUtils measurementUtils = new MeasurementUtils(resource);
+ MeasurementUtils measurementUtils = new MeasurementUtils(currentResource);
summaryMeasurementDefinitionMap = measurementUtils.getMeasurementDefinitionMap();
List<MeasurementData> measurementDataList = measurementUtils.loadMeasurementData(DisplayType.SUMMARY, DataType.MEASUREMENT);
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-10-02 19:42:47 UTC (rev 774)
@@ -80,8 +80,8 @@
@In(value = "ancestorResource", required = false)
private Resource ancestorResource;
- @Out(value = "resource", required = false)
- private ResourceListItem listItem;
+ @Out(required = false)
+ private ResourceListItem currentResource;
private ResourceType serviceType;
@@ -137,8 +137,8 @@
public void resourceConfiguration()
{
actionType = ActionType.UPDATE;
- listItem = commonActionUtil.getCurrentResourceListItem();
- Resource resource = listItem.getResource();
+ currentResource = commonActionUtil.getCurrentResourceListItem();
+ Resource resource = currentResource.getResource();
try
{
setConfiguration(configurationManager.getResourceConfiguration(resource));
@@ -184,7 +184,7 @@
String result;
Configuration resourceConfig = getConfiguration();
- ConfigurationUpdateResponse pluginResponse = configurationManager.updateResource(this.listItem.getResource(),
+ ConfigurationUpdateResponse pluginResponse = configurationManager.updateResource(this.currentResource.getResource(),
resourceConfig);
switch (pluginResponse.getStatus())
@@ -192,7 +192,7 @@
case SUCCESS:
{
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success",
- this.listItem.getResource().getResourceType().getName(), this.listItem.getResource().getName());
+ this.currentResource.getResource().getResourceType().getName(), this.currentResource.getResource().getName());
result = FacesOutcomes.SUCCESS;
break;
}
Modified: trunk/core/src/main/webapp/secure/addMap.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/addMap.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/addMap.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -36,7 +36,7 @@
THIS TEXT WILL BE REMOVED AS WELL.
- <ui:param name="pageTitle" value="#{resource.resource.name} - Add Map To List '#{param.listName}']"/>
+ <ui:param name="pageTitle" value="#{currentResource.name} - Add Map To List '#{param.listName}']"/>
<ui:define name="body">
<div class="instructionalText">
Modified: trunk/core/src/main/webapp/secure/addSimple.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/addSimple.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/addSimple.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -36,13 +36,13 @@
THIS TEXT WILL BE REMOVED AS WELL.
- <ui:param name="pageTitle" value="#{resource.resource.name} - Add Property To Map '#{param.mapName}'"/>
+ <ui:param name="pageTitle" value="#{currentResource.name} - Add Property To Map '#{param.mapName}'"/>
<ui:define name="body">
<div class="instructionalText">
Enter a name and a value for the property to be added to the map '#{param.mapName}',
- then click OK to return to the '#{resource.resource.name}' resource's main Edit Configuration page.
+ then click OK to return to the '#{currentResource.name}' resource's main Edit Configuration page.
</div>
<div class="instructionalText">
Modified: trunk/core/src/main/webapp/secure/editMap.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/editMap.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/editMap.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -36,7 +36,7 @@
THIS TEXT WILL BE REMOVED AS WELL.
- <ui:param name="pageTitle" value="'#{resource.resource.name}' - Edit Map - #{param.listName}[#{param.listIndex}]"/>
+ <ui:param name="pageTitle" value="'#{currentResource.name}' - Edit Map - #{param.listName}[#{param.listIndex}]"/>
<ui:define name="body">
Modified: trunk/core/src/main/webapp/secure/operationParameters.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/operationParameters.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/operationParameters.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -36,7 +36,7 @@
THIS TEXT WILL BE REMOVED AS WELL.
- <ui:define name="pagetitle">#{resource.resource.name}</ui:define>
+ <ui:define name="pagetitle">#{currentResource.name}</ui:define>
<ui:define name="body">
Modified: trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -27,7 +27,7 @@
<f:view>
<ui:composition template="/WEB-INF/facelets/layout.xhtml">
- <ui:define name="pagetitle">#{resource.resource.name}</ui:define>
+ <ui:define name="pagetitle">#{currentResource.name}</ui:define>
<!-- This rendered might be an issue if actionType is neither UPDATE or CREATE, which shouldn't happen-->
<ui:define name="tabmenu">
@@ -55,7 +55,7 @@
<h1>#{messages['resource.edit.title']}</h1>
</h:panelGroup>
<h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'CREATE'}">
- <h1>#{messages['resource.add.pageTitlePrefix']} #{resource.resource.resourceType.name}</h1>
+ <h1>#{messages['resource.add.pageTitlePrefix']} #{currentResource.resourceType.name}</h1>
</h:panelGroup>
<h:panelGroup rendered="#{resourceConfigurationUIBean.configuration eq null}">
Modified: trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -32,7 +32,7 @@
<f:view>
<ui:composition template="/WEB-INF/facelets/layout.xhtml">
- <ui:define name="pagetitle">#{resource.name}</ui:define>
+ <ui:define name="pagetitle">#{currentResource.name}</ui:define>
<ui:define name="tabmenu">
<ui:include src="/WEB-INF/facelets/tabMenu.xhtml">
Modified: trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -32,7 +32,7 @@
<f:view>
<ui:composition template="/WEB-INF/facelets/layout.xhtml">
- <ui:define name="pagetitle">#{resource.resource.name}</ui:define>
+ <ui:define name="pagetitle">#{currentResource.name}</ui:define>
<ui:define name="tabmenu">
<ui:include src="/WEB-INF/facelets/tabMenu.xhtml">
Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-09-30 12:55:16 UTC (rev 773)
+++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-10-02 19:42:47 UTC (rev 774)
@@ -27,12 +27,11 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
-
<body>
<f:view>
<ui:composition template="/WEB-INF/facelets/layout.xhtml">
- <ui:define name="pagetitle">#{resource.resource.name}</ui:define>
+ <ui:define name="pagetitle">#{currentResource.name}</ui:define>
<ui:define name="tabmenu">
<ui:include src="/WEB-INF/facelets/tabMenu.xhtml">
@@ -51,21 +50,21 @@
<span style="padding-right:3px;">
<strong>#{messages['summary.resourceInstance.configuration.name']}</strong>
</span>
- #{resource.resource.name}
+ #{currentResource.name}
</h:panelGroup>
<h:panelGroup layout="block">
<span style="padding-right:3px;">
<strong>#{messages['summary.resourceInstance.configuration.version']}</strong>
</span>
- <h:outputText rendered="#{not empty resource.resource.version}">#{resource.resource.version}</h:outputText>
- <h:outputText rendered="#{empty resource.resource.version}">--</h:outputText>
+ <h:outputText rendered="#{not empty currentResource.version}">#{currentResource.version}</h:outputText>
+ <h:outputText rendered="#{empty currentResource.version}">--</h:outputText>
</h:panelGroup>
<h:panelGroup layout="block">
<span style="padding-right:3px;">
<strong>#{messages['summary.resourceInstance.configuration.description']}</strong>
</span>
- <h:outputText rendered="#{not empty resource.resource.description}">#{resource.resource.description}</h:outputText>
- <h:outputText rendered="#{empty resource.resource.description}">--</h:outputText>
+ <h:outputText rendered="#{not empty currentResource.description}">#{currentResource.description}</h:outputText>
+ <h:outputText rendered="#{empty currentResource.description}">--</h:outputText>
</h:panelGroup>
</h:panelGrid>
@@ -76,7 +75,7 @@
var="trait"
columnClasses="standard-traitscolumn">
<rich:column>
- <strong>#{ summaryMeasurementDefinitionMap[trait.measurementData.name].displayName}:</strong>
+ <strong>#{summaryMeasurementDefinitionMap[trait.measurementData.name].displayName}:</strong>
#{trait.measurementValueAndUnits}
</rich:column>
</rich:dataTable>
15 years, 3 months
- 1
- 0