EMBJOPR SVN: r256 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as4 and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: fjuma
Date: 2009-03-25 10:44:31 -0400 (Wed, 25 Mar 2009)
New Revision: 256
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
Log:
Updated the nav tree labels used in the tests for the three types of datasources.
Modified the datasource configuration tests to only check the properties of the appropriate ManagedComponent and not the -ds.xml file itself after a config update.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-03-24 19:44:21 UTC (rev 255)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-03-25 14:44:31 UTC (rev 256)
@@ -36,6 +36,7 @@
import java.io.FileReader;
import java.util.Map;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import javax.naming.InitialContext;
import java.sql.Connection;
import javax.sql.DataSource;
@@ -43,6 +44,8 @@
import java.sql.SQLException;
import java.util.ArrayList;
import javax.management.*;
+import org.jboss.metatype.api.values.SimpleValueSupport;
+import org.jboss.metatype.api.values.MetaValue;
/**
* This is the base test class for Embedded Jopr Datasource tests.
@@ -60,9 +63,12 @@
// Some of these values are specific for AS 5. TODO: Think up some way to split nicely.
// // label serviceName xml-element-name template <select>
- LOCAL_TX_DATASOURCE("Local TX Datasources", "LocalTxCM", "local-tx-datasource", "default__Local TX Datasource"),
- NO_TX_DATASOURCE( "No TX Datasources", "NoTxCM", "no-tx-datasource", "default__No TX Datasource"),
- XA_DATASOURCE( "XA Datasources", "XATxCM", "xa-datasource", "default__XA Datasource");
+ LOCAL_TX_DATASOURCE("Local Tx Datasources", "LocalTxCM", "local-tx-datasource", "default__Local Tx Datasource",
+ "Local Tx Datasource"),
+ NO_TX_DATASOURCE( "No Tx Datasources", "NoTxCM", "no-tx-datasource", "default__No Tx Datasource",
+ "No Tx Datasource"),
+ XA_DATASOURCE( "XA Datasources", "XATxCM", "xa-datasource", "default__XA Datasource",
+ "XA Datasource");
protected String label;
public String getLabel() { return label; }
@@ -79,14 +85,18 @@
protected final String templateHtmlSelectValue;
public String getTemplateHtmlSelectValue() { return templateHtmlSelectValue; }
+
+ protected final String typeName;
+ public String getTypeName() { return typeName; }
private DatasourceType(String label, String serviceName,
- String xmlElementName, String htmlSelectValue)
+ String xmlElementName, String htmlSelectValue, String typeName)
{
this.label = label;
this.serviceName = serviceName;
this.xmlElementName = xmlElementName;
this.templateHtmlSelectValue = htmlSelectValue;
+ this.typeName = typeName;
}
}// DatasourceTypes
@@ -125,10 +135,10 @@
AS4_DEFAULT("default__Datasource"),
/** AS 5 */
- AS5_ORACLE_LOCAL_TX("Oracle Local TX__Local TX Datasource"),
- AS5_DEFAULT_LOCAL_TX("default__Local TX Datasource"),
- AS5_ORACLE_NO_TX("Oracle No TX__No TX Datasource"),
- AS5_DEFAULT_NO_TX("default__No TX Datasource"),
+ AS5_ORACLE_LOCAL_TX("Oracle Local TX__Local Tx Datasource"),
+ AS5_DEFAULT_LOCAL_TX("default__Local Tx Datasource"),
+ AS5_ORACLE_NO_TX("Oracle No TX__No Tx Datasource"),
+ AS5_DEFAULT_NO_TX("default__No Tx Datasource"),
AS5_ORACLE_XA("Oracle XA__XA Datasource"),
AS5_DEFAULT_XA("default__XA Datasource");
@@ -224,12 +234,11 @@
/**
* checkProperties reads the *-ds.xml file corresponding to the datasource
* given by jndiName and compares the property values in this file to the
- * given expected values. checkProperties returns true if all the given
- * properties are correctly set in the *-ds.xml file and false otherwise.
+ * given expected values.
*/
- protected boolean checkProperties(String jndiName,
- DatasourceType datasourceType,
- Map<String, String> expectedValuesMap)
+ protected void checkProperties(String jndiName,
+ DatasourceType datasourceType,
+ Map<String, String> expectedValuesMap)
{
Map<String, String> actualValuesMap = new HashMap<String, String>();
@@ -260,25 +269,13 @@
// Compare the actual values to the expected ones.
for( String key : expectedValuesMap.keySet() ){
- if(!actualValuesMap.containsKey(key)){
-
- // Value was not set.
- log.fatal("Property '" + key + "' is not found.");
- return false;
- }
-
- if(!expectedValuesMap.get(key).equals(actualValuesMap.get(key))) {
-
- // Incorrect value.
- log.fatal("Property '" + key +"' has unexpected value: '" + actualValuesMap.get(key) + "'");
- return false;
- }
+ assertTrue("Property '" + key + "' was not found in the -ds.xml file", actualValuesMap.containsKey(key));
+ assertEquals("Incorrect value for '" + key + "' in the -ds.xml file: ",
+ expectedValuesMap.get(key), actualValuesMap.get(key));
+
}
-
- return true;
-
} catch (Exception e) {
- log.fatal("Config file check failed: "+e.getMessage());
+ log.fatal("Config file check failed: " + e.getMessage());
throw new RuntimeException(e);
}
}
@@ -378,26 +375,34 @@
*/
protected Map<String, String> createDatasourceProperties()
{
- Map<String, String> propertiesMap = new HashMap();
+ Map<String, MetaValue> propertiesMapAsMetaValues = createDatasourcePropertiesAsMetaValues();
+ Map<String, String> propertiesMap = formatPropertiesMap(propertiesMapAsMetaValues);
+ return propertiesMap;
+ }
- // The properties we want to configure
- propertiesMap.put("jndi-name", "TestDS");
- propertiesMap.put("user-name", "testUser");
- propertiesMap.put("password", "password");
- propertiesMap.put("min-pool-size", "5");
- propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");
- propertiesMap.put("connection-url", "jdbc:hsqldb:."); // Store data current working dir.
- propertiesMap.put("idle-timeout-minutes", "20");
- propertiesMap.put("prepared-statement-cache-size", "2");
- propertiesMap.put("valid-connection-checker-class-name",
- "org.jboss.resource.adapter.jdbc.CheckValidConnectionSQL");
- propertiesMap.put("exception-sorter-class-name",
- "org.jboss.resource.adapter.jdbc.ExceptionSorter");
-
+ /**
+ * Creates the default properties for the datasource.
+ * Returns a map of String names to MetaValues.
+ */
+ protected Map<String, MetaValue> createDatasourcePropertiesAsMetaValues() {
+ Map<String, MetaValue> propertiesMap = new LinkedHashMap<String, MetaValue>();
+
+ propertiesMap.put("jndi-name", SimpleValueSupport.wrap("TestDS"));
+ propertiesMap.put("user-name", SimpleValueSupport.wrap("testUser"));
+ propertiesMap.put("password", SimpleValueSupport.wrap("password"));
+ propertiesMap.put("min-pool-size", SimpleValueSupport.wrap(new Integer(5)));
+ propertiesMap.put("driver-class", SimpleValueSupport.wrap("org.hsqldb.jdbcDriver"));
+ propertiesMap.put("connection-url", SimpleValueSupport.wrap("jdbc:hsqldb:."));
+ propertiesMap.put("idle-timeout-minutes", SimpleValueSupport.wrap(new Integer(20)));
+ propertiesMap.put("prepared-statement-cache-size", SimpleValueSupport.wrap(new Integer(2)));
+ propertiesMap.put("valid-connection-checker-class-name",
+ SimpleValueSupport.wrap("org.jboss.resource.adapter.jdbc.CheckValidConnectionSQL"));
+ propertiesMap.put("exception-sorter-class-name",
+ SimpleValueSupport.wrap("org.jboss.resource.adapter.jdbc.ExceptionSorter"));
+
return propertiesMap;
}
-
/**
* Create a basic Local TX Datasource. Return the mapping of property
* names to property values.
@@ -414,9 +419,10 @@
propertiesMap.put("idle-timeout-minutes", "20");
propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");
propertiesMap.put("connection-url", "jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB");
+ propertiesMap.put("use-java-context", "true");
createDatasource(DatasourceType.LOCAL_TX_DATASOURCE,
- DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), // "default__Local TX Datasource",
+ DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), // "default__Local Tx Datasource",
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
@@ -444,9 +450,10 @@
propertiesMap.put("domain", "HsqlDbRealm");
propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");
propertiesMap.put("connection-url", "jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB");
+ propertiesMap.put("use-java-context", "true");
createDatasource(DatasourceType.NO_TX_DATASOURCE,
- DatasourceType.NO_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__No TX Datasource",
+ DatasourceType.NO_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__No Tx Datasource",
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
@@ -467,6 +474,7 @@
propertiesMap.put("min-pool-size", "6");
propertiesMap.put("set-tx-query-timeout", "false");
propertiesMap.put("user-name", "testUser");
+ propertiesMap.put("use-java-context", "true");
createDatasource(DatasourceType.XA_DATASOURCE,
DatasourceType.XA_DATASOURCE.getTemplateHtmlSelectValue(), //"default__XA Datasource",
@@ -630,38 +638,6 @@
*/
/**
- * Create a new datasource. Leave some property values, that aren't
- * required, unset.
- */
- public void testCreateDatasource() throws IOException, EmbJoprTestException {
-
-
- // The properties we want to configure
- Map<String, String> propertiesMap = this.getDatasourceProperties();
-
- createDatasource(DatasourceType.LOCAL_TX_DATASOURCE,
- DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), // TODO: Redundant - remove.
- propertiesMap);
- client.click("resourceConfigurationForm:saveButton");
-
- // Check for the appropriate success messages
- String expectedMessage = "Successfully added new Local TX Datasource";
- checkClientAndServerMessages(expectedMessage, expectedMessage, false);
-
- assertTrue("Datasource is not deployed (isDatasourceDeployed() returned false).",
- isDatasourceDeployed(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE));
- assertTrue(checkProperties(propertiesMap.get("jndi-name"),
- DatasourceType.LOCAL_TX_DATASOURCE,
- propertiesMap));
-
- // TODO: need to verify that appropriate default values were
- // set for properties that were not specified above
-
- // Clean up
- deleteDatasource(propertiesMap.get("jndi-name"));
- }
-
- /**
* Attempt to create a new datasource but leave at least one required
* value unset. An error should occur.
*
@@ -681,7 +657,7 @@
}
createDatasource(DatasourceType.NO_TX_DATASOURCE,
- //"default__No TX Datasource",
+ //"default__No Tx Datasource",
isJBoss4 ?
DatasourceTemplate.AS4_DEFAULT.getTemplateHtmlSelectValue() :
DatasourceTemplate.AS5_DEFAULT_NO_TX.getTemplateHtmlSelectValue(),
@@ -767,7 +743,7 @@
propertiesMap.put("max-pool-size", "-25");
createDatasource(DatasourceType.NO_TX_DATASOURCE,
- DatasourceType.NO_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__No TX Datasource",
+ DatasourceType.NO_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__No Tx Datasource",
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
@@ -789,12 +765,12 @@
propertiesMap.put("connection-url", "jdbc:hsqldb:.");
createDatasource(DatasourceType.LOCAL_TX_DATASOURCE,
- DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__Local TX Datasource",
+ DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), //"default__Local Tx Datasource",
propertiesMap);
client.click("resourceConfigurationForm:saveButton");
// Check for the appropriate error messages
- String expectedMessage = "A Local TX Datasource named "
+ String expectedMessage = "A " + DatasourceType.LOCAL_TX_DATASOURCE.getTypeName() + " named "
+ "'DefaultDS' already exists";
checkClientAndServerMessages(expectedMessage, expectedMessage, true);
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java 2009-03-24 19:44:21 UTC (rev 255)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/DatasourceTest.java 2009-03-25 14:44:31 UTC (rev 256)
@@ -174,7 +174,6 @@
* Create a new datasource. Leave some property values that aren't
* required unset.
*/
- @Override
public void testCreateDatasource() throws IOException, EmbJoprTestException {
@@ -229,9 +228,9 @@
// Check whether the dataource is deployed.
assertTrue(isDatasourceDeployed(propertiesMap.get("jndi-name"),
DatasourceType.LOCAL_TX_DATASOURCE));
- assertTrue(checkProperties(propertiesMap.get("jndi-name"),
- DatasourceType.LOCAL_TX_DATASOURCE,
- propertiesMap));
+ checkProperties(propertiesMap.get("jndi-name"),
+ DatasourceType.LOCAL_TX_DATASOURCE,
+ propertiesMap);
// TODO: need to verify that appropriate default values were
// set for properties that were not specified above
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-03-24 19:44:21 UTC (rev 255)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-03-25 14:44:31 UTC (rev 256)
@@ -35,6 +35,8 @@
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;
/**
* When complete, this class will contain tests for creating,
@@ -59,7 +61,7 @@
* Thus, this method is overriden from the Base class.
*
* @param datasourceType must be a datasource type from DatasourceType enum.
- * It's label from the left nav (eg. "Local TX Datasources") is in getLabel() property.
+ * It's label from the left nav (eg. "Local Tx Datasources") is in getLabel() property.
*
*/
@Override
@@ -84,27 +86,25 @@
fillOutForm(propertiesMap);
}
-
/**
- * Properties needed for testCreateDatasource for AS 5.
+ * Properties needed for testCreateDatasource.
* @returns the properties from the base class overriden by properties for AS 5.
*/
@Override
- protected Map<String, String> createDatasourceProperties()
- {
- Map<String, String> propertiesMap = super.createDatasourceProperties();
-
- // Additional or different properties for AS 5
- propertiesMap.put("query-timeout", "180");
- propertiesMap.put("share-prepared-statements", "false");
- propertiesMap.put("stale-connection-checker-class-name",
- "org.jboss.resource.adapter.jdbc.StaleConnectionChecker");
- propertiesMap.put("allocation-retry", "10000");
- propertiesMap.put("allocation-retry-wait-millis", "10000");
- propertiesMap.put("background-validation-millis", "15000");
- propertiesMap.put("prefill", "true");
- propertiesMap.put("use-try-lock", "61000");
-
+ protected Map<String, MetaValue> createDatasourcePropertiesAsMetaValues() {
+ Map<String, MetaValue> propertiesMap = super.createDatasourcePropertiesAsMetaValues();
+
+ // Additional properties
+ propertiesMap.put("query-timeout", SimpleValueSupport.wrap(new Integer(180)));
+ propertiesMap.put("share-prepared-statements", SimpleValueSupport.wrap(Boolean.FALSE));
+ propertiesMap.put("stale-connection-checker-class-name",
+ SimpleValueSupport.wrap("org.jboss.resource.adapter.jdbc.StaleConnectionChecker"));
+ propertiesMap.put("allocation-retry", SimpleValueSupport.wrap(new Integer(10000)));
+ propertiesMap.put("allocation-retry-wait-millis", SimpleValueSupport.wrap(new Long(10000)));
+ propertiesMap.put("background-validation-millis", SimpleValueSupport.wrap(new Long(15000)));
+ propertiesMap.put("prefill", SimpleValueSupport.wrap(Boolean.TRUE));
+ propertiesMap.put("use-try-lock", SimpleValueSupport.wrap(new Long(61000)));
+
return propertiesMap;
}
@@ -220,6 +220,46 @@
{
return new TestSuite(DatasourceTest.class);
}
+
+ /*
+ * CREATION TESTS
+ */
+
+ /**
+ * Create a new datasource. Leave some property values, that aren't
+ * required, unset.
+ */
+ public void testCreateDatasource() throws Exception {
+
+
+ // The properties we want to configure
+ Map<String, MetaValue> propertiesMapAsMetaValues = createDatasourcePropertiesAsMetaValues();
+ Map<String, String> propertiesMap = formatPropertiesMap(propertiesMapAsMetaValues);
+
+ createDatasource(DatasourceType.LOCAL_TX_DATASOURCE,
+ DatasourceType.LOCAL_TX_DATASOURCE.getTemplateHtmlSelectValue(), // TODO: Redundant - remove.
+ propertiesMap);
+ client.click("resourceConfigurationForm:saveButton");
+
+ // Check for the appropriate success messages
+ String expectedMessage = "Successfully added new " + DatasourceType.LOCAL_TX_DATASOURCE.getTypeName();
+ checkClientAndServerMessages(expectedMessage, expectedMessage, false);
+
+ assertTrue("Datasource is not deployed (isDatasourceDeployed() returned false).",
+ isDatasourceDeployed(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE));
+
+ checkComponentProperties(propertiesMapAsMetaValues, propertiesMap.get("jndi-name"), LOCAL_TX_COMPONENT_TYPE);
+
+ checkProperties(propertiesMap.get("jndi-name"),
+ DatasourceType.LOCAL_TX_DATASOURCE,
+ propertiesMap);
+
+ // TODO: need to verify that appropriate default values were
+ // set for properties that were not specified above
+
+ // Clean up
+ deleteDatasource(propertiesMap.get("jndi-name"));
+ }
/*
* DELETION TESTS
@@ -230,13 +270,8 @@
*/
public void testDeleteLocalTXDatasource() throws Exception {
Map<String, String> propertiesMap = createLocalTXDatasource("DeleteLocalTXDS");
-
- // The message we expect to see
- String expectedMessage = "Successfully deleted Local TX Datasource '"
- + propertiesMap.get("jndi-name") + "'";
-
- deleteDS(expectedMessage, propertiesMap,
- LOCAL_TX_COMPONENT_TYPE, DatasourceType.LOCAL_TX_DATASOURCE);
+
+ deleteDS(propertiesMap, LOCAL_TX_COMPONENT_TYPE, DatasourceType.LOCAL_TX_DATASOURCE);
}
/**
@@ -244,12 +279,8 @@
*/
public void testDeleteNoTXDatasource() throws Exception {
Map<String, String> propertiesMap = createNoTXDatasource("DeleteNoTXDS");
-
- // The message we expect to see
- String expectedMessage = "Successfully deleted No TX Datasource '"
- + propertiesMap.get("jndi-name") + "'";
- deleteDS(expectedMessage, propertiesMap, NO_TX_COMPONENT_TYPE,
+ deleteDS(propertiesMap, NO_TX_COMPONENT_TYPE,
DatasourceType.NO_TX_DATASOURCE);
}
@@ -258,13 +289,8 @@
*/
public void testDeleteXADatasource() throws Exception {
Map<String, String> propertiesMap = createXADatasource("DeleteXADS");
-
- // The message we should see
- String expectedMessage = "Successfully deleted XA Datasource '"
- + propertiesMap.get("jndi-name") + "'";
-
- deleteDS(expectedMessage, propertiesMap,
- XA_COMPONENT_TYPE, DatasourceType.XA_DATASOURCE);
+
+ deleteDS(propertiesMap, XA_COMPONENT_TYPE, DatasourceType.XA_DATASOURCE);
}
/**
@@ -275,12 +301,8 @@
// Use an existing -ds.xml file
Map<String, String> propertiesMap = getPropertyValuesMap("DeleteLocalTXExistingFile",
DatasourceType.LOCAL_TX_DATASOURCE);
-
- String expectedMessage = "Successfully deleted Local TX Datasource '"
- + propertiesMap.get("jndi-name") + "'";
-
- deleteDS(expectedMessage, propertiesMap,
- LOCAL_TX_COMPONENT_TYPE, DatasourceType.LOCAL_TX_DATASOURCE);
+
+ deleteDS(propertiesMap, LOCAL_TX_COMPONENT_TYPE, DatasourceType.LOCAL_TX_DATASOURCE);
}
/**
@@ -291,11 +313,8 @@
// Use an existing -ds.xml file
Map<String, String> propertiesMap = getPropertyValuesMap("DeleteNoTXExistingFile",
DatasourceType.NO_TX_DATASOURCE);
-
- String expectedMessage = "Successfully deleted No TX Datasource '"
- + propertiesMap.get("jndi-name") + "'";
-
- deleteDS(expectedMessage, propertiesMap, NO_TX_COMPONENT_TYPE,
+
+ deleteDS(propertiesMap, NO_TX_COMPONENT_TYPE,
DatasourceType.NO_TX_DATASOURCE);
}
@@ -307,20 +326,18 @@
// Use an existing -ds.xml file
Map<String, String> propertiesMap = getPropertyValuesMap("DeleteXAExistingFile",
DatasourceType.XA_DATASOURCE);
-
- // Check for the appropriate success messages
- String expectedMessage = "Successfully deleted XA Datasource '"
- + propertiesMap.get("jndi-name") + "'";
-
- deleteDS(expectedMessage, propertiesMap, XA_COMPONENT_TYPE,
+
+ deleteDS(propertiesMap, XA_COMPONENT_TYPE,
DatasourceType.XA_DATASOURCE);
}
/**
* Common code for the testDelete* tests.
*/
- private void deleteDS(String expectedMessage, Map<String, String> propertiesMap,
+ private void deleteDS(Map<String, String> propertiesMap,
ComponentType componentType, DatasourceType datasourceType) throws Exception {
+ String expectedMessage = "Successfully deleted " + datasourceType.getTypeName()
+ + " '" + propertiesMap.get("jndi-name") + "'";
deleteDatasource(propertiesMap.get("jndi-name"));
@@ -352,7 +369,9 @@
deleteDatasource(jndiName);
// Check for the appropriate success messages
- String expectedMessage = "Successfully deleted No TX Datasource '" + jndiName + "'";
+ String expectedMessage = "Successfully deleted "
+ + DatasourceType.NO_TX_DATASOURCE.getTypeName() + " '"
+ + jndiName + "'";
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Make sure the ManagedComponent was removed
@@ -375,14 +394,15 @@
/**
* Change the value of some already set properties.
*/
- public void testConfigureDatasourceChangeSetProperties() throws IOException, EmbJoprTestException {
- Map<String, String> propertiesMap = createXADatasource("ChangeSetPropertiesDS");
+ public void testConfigureDatasourceChangeSetProperties() throws Exception {
+ String jndiName = "ChangeSetPropertiesDS";
+ Map<String, String> propertiesMap = createXADatasource(jndiName);
- // Change some property values that are already set
- Map<String, String> propertiesMapChanges = new HashMap<String, String>();
- propertiesMapChanges.put("xa-resource-timeout", "60000");
- propertiesMapChanges.put("set-tx-query-timeout", "true");
- propertiesMapChanges.put("user-name", "newUser");
+ // Change some property values that are already set
+ Map<String, MetaValue> propertiesMapChangesAsMetaValues = new LinkedHashMap<String, MetaValue>();
+ propertiesMapChangesAsMetaValues.put("xa-resource-timeout", SimpleValueSupport.wrap(new Integer(60000)));
+ propertiesMapChangesAsMetaValues.put("set-tx-query-timeout", SimpleValueSupport.wrap(Boolean.TRUE));
+ propertiesMapChangesAsMetaValues.put("user-name", SimpleValueSupport.wrap("newUser"));
navigateToPage(propertiesMap.get("jndi-name"),
DatasourceType.XA_DATASOURCE,
@@ -392,19 +412,19 @@
assertFalse("The configuration page could not be displayed",
client.getPageAsText().contains("There was an error retrieving the configuration for this resource"));
+ Map<String, String> propertiesMapChanges = formatPropertiesMap(propertiesMapChangesAsMetaValues);
fillOutForm(propertiesMapChanges);
client.click("resourceConfigurationForm:saveButton");
// Check for the appropriate success messages
- String expectedMessage = "Successfully updated XA Datasource '"
- + propertiesMap.get("jndi-name") + "'";
+ String expectedMessage = "Successfully updated " + DatasourceType.XA_DATASOURCE.getTypeName()
+ + " '" + propertiesMap.get("jndi-name") + "'";
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
+
+ checkComponentProperties(propertiesMapChangesAsMetaValues, jndiName, XA_COMPONENT_TYPE);
assertTrue(isDatasourceDeployed(propertiesMap.get("jndi-name"),
DatasourceType.XA_DATASOURCE));
- assertTrue(checkProperties(propertiesMap.get("jndi-name"),
- DatasourceType.XA_DATASOURCE,
- propertiesMapChanges));
// Clean up
deleteDatasource(propertiesMap.get("jndi-name"));
@@ -413,16 +433,18 @@
/**
* Change the value of some previously unset properties.
*/
- public void testConfigureDatasourceChangeUnsetProperties() throws IOException, EmbJoprTestException {
- Map<String, String> propertiesMap = createLocalTXDatasource("ChangeUnsetPropertiesDS");
+ public void testConfigureDatasourceChangeUnsetProperties() throws Exception {
+ String jndiName = "ChangeUnsetPropertiesDS";
+
+ Map<String, String> propertiesMap = createLocalTXDatasource(jndiName);
- // Set some property values that were previously unset
- Map<String, String> propertiesMapChanges = new HashMap<String, String>();
- propertiesMapChanges.put("valid-connection-checker-class-name",
- "org.jboss.resource.adapter.jdbc.CheckValidConnectionSQL");
- propertiesMapChanges.put("set-tx-query-timeout", "true");
- propertiesMapChanges.put("background-validation", "false");
- propertiesMapChanges.put("allocation-retry", "10000");
+ // Set some property values that were previously unset
+ Map<String, MetaValue> propertiesMapChangesAsMetaValues = new LinkedHashMap<String, MetaValue>();
+ propertiesMapChangesAsMetaValues.put("valid-connection-checker-class-name",
+ SimpleValueSupport.wrap("org.jboss.resource.adapter.jdbc.CheckValidConnectionSQL"));
+ propertiesMapChangesAsMetaValues.put("set-tx-query-timeout", SimpleValueSupport.wrap(Boolean.TRUE));
+ propertiesMapChangesAsMetaValues.put("background-validation", SimpleValueSupport.wrap(Boolean.FALSE));
+ propertiesMapChangesAsMetaValues.put("allocation-retry", SimpleValueSupport.wrap(new Integer(10000)));
navigateToPage(propertiesMap.get("jndi-name"),
DatasourceType.LOCAL_TX_DATASOURCE,
@@ -432,20 +454,20 @@
assertFalse("The configuration page could not be displayed",
client.getPageAsText().contains("There was an error retrieving the configuration for this resource"));
+ Map<String, String> propertiesMapChanges = formatPropertiesMap(propertiesMapChangesAsMetaValues);
fillOutForm(propertiesMapChanges);
client.click("resourceConfigurationForm:saveButton");
// Check for the appropriate success messages
- String expectedMessage = "Successfully updated Local TX Datasource '"
- + propertiesMap.get("jndi-name") + "'";
+ String expectedMessage = "Successfully updated " + DatasourceType.LOCAL_TX_DATASOURCE.getTypeName()
+ + " '" + propertiesMap.get("jndi-name") + "'";
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
+
+ checkComponentProperties(propertiesMapChangesAsMetaValues, jndiName, LOCAL_TX_COMPONENT_TYPE);
assertTrue(isDatasourceDeployed(propertiesMap.get("jndi-name"),
DatasourceType.LOCAL_TX_DATASOURCE));
- assertTrue(checkProperties(propertiesMap.get("jndi-name"),
- DatasourceType.LOCAL_TX_DATASOURCE,
- propertiesMapChanges));
-
+
// Clean up
deleteDatasource(propertiesMap.get("jndi-name"));
}
@@ -472,24 +494,14 @@
enableOrDisableFormInput("noTxSeparatePools", Boolean.FALSE);
client.click("resourceConfigurationForm:saveButton");
- // Update our expected property values
- propertiesMap.remove("user-name");
- propertiesMap.remove("idle-timeout-minutes");
- propertiesMap.remove("track-connection-by-tx");
- propertiesMap.remove("domain");
- propertiesMap.remove("noTxSeparatePools");
-
// Check for the appropriate success messages
- String expectedMessage = "Successfully updated No TX Datasource '"
- + propertiesMap.get("jndi-name") + "'";
+ String expectedMessage = "Successfully updated " + DatasourceType.NO_TX_DATASOURCE.getTypeName()
+ + " '" + propertiesMap.get("jndi-name") + "'";
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
assertTrue(isDatasourceDeployed(propertiesMap.get("jndi-name"),
DatasourceType.NO_TX_DATASOURCE));
- assertTrue(checkProperties(propertiesMap.get("jndi-name"),
- DatasourceType.NO_TX_DATASOURCE,
- propertiesMap));
-
+
// Clean up
deleteDatasource(propertiesMap.get("jndi-name"));
}
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r255 - trunk/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: smcgowan(a)redhat.com
Date: 2009-03-24 15:44:21 -0400 (Tue, 24 Mar 2009)
New Revision: 255
Modified:
trunk/jsfunit/pom.xml
Log:
update to use org.jboss.man 2.1.0.CR4
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-03-24 19:39:47 UTC (rev 254)
+++ trunk/jsfunit/pom.xml 2009-03-24 19:44:21 UTC (rev 255)
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-metatype</artifactId>
- <version>2.1.0.CR3</version>
+ <version>2.1.0.CR4</version>
<scope>provided</scope>
</dependency>
<dependency>
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r254 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5.
by embjopr-commits＠lists.jboss.org
Author: smcgowan(a)redhat.com
Date: 2009-03-24 15:39:47 -0400 (Tue, 24 Mar 2009)
New Revision: 254
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java
Log:
Update JBoss App Server label
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-03-23 20:59:57 UTC (rev 253)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-03-24 19:39:47 UTC (rev 254)
@@ -187,9 +187,9 @@
// Check whether the server is listed. If not, Exception is thrown.
ContentTableRow row =
ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("JBoss Application Server")
- .getFirstRowContainingLink("JBoss App Server:default");
+ .getFirstRowContainingLink("JBAS (default)");
// Click the server link
- //HtmlAnchor link row.getLinkByLabel("JBoss App Server:default");
+ //HtmlAnchor link row.getLinkByLabel("JBAS (default)");
Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0);
if( null == firstLink || !(firstLink instanceof HtmlAnchor) )
throw new HtmlElementNotFoundException("Can't find the server link.");
@@ -201,7 +201,7 @@
{
String pageText = client.getPageAsText();
- String headerText = "JBoss App Server:default";
+ String headerText = "JBAS (default)";
assertTrue("Page doesn't contain the header: "+headerText,
pageText.contains(headerText));
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-03-23 20:59:57 UTC (rev 253)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-03-24 19:39:47 UTC (rev 254)
@@ -156,7 +156,7 @@
// Check whether the server is listed. If not, Exception is thrown.
ContentTableRow row =
ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("JBoss Application Server")
- .getFirstRowContainingLink("JBoss App Server:default");
+ .getFirstRowContainingLink("JBAS (default)");
// Click the server link
//HtmlAnchor link row.getLinkByLabel("JBoss App Server:default");
Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0);
@@ -170,7 +170,7 @@
{
String pageText = client.getPageAsText();
- String headerText = "JBoss App Server:default";
+ String headerText = "JBAS (default)";
assertTrue("Page doesn't contain the header: "+headerText,
pageText.contains(headerText));
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r253 - in trunk/core/src/main: webapp/include and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-03-23 16:59:57 -0400 (Mon, 23 Mar 2009)
New Revision: 253
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java
trunk/core/src/main/webapp/include/header.xhtml
Log:
when in debug mode, include links in header for kicking off server and service scans
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java 2009-03-23 17:49:07 UTC (rev 252)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java 2009-03-23 20:59:57 UTC (rev 253)
@@ -22,10 +22,13 @@
import java.io.PrintWriter;
import org.rhq.core.pc.util.InventoryPrinter;
+import org.rhq.core.pc.PluginContainer;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.on.embedded.manager.ResourceManagerFactory;
+
/**
* A Seam component that contains actions used for debugging purposes.
*
@@ -48,6 +51,16 @@
System.out.println("*****************************************************************************************");
}
+ public void runServerScan() {
+ System.out.println("******************************* RUNNING SERVER SCAN... **********************************");
+ PluginContainer.getInstance().getInventoryManager().executeServerScanImmediately();
+ }
+
+ public void runServiceScan() {
+ System.out.println("******************************* RUNNING SERVICE SCAN... **********************************");
+ ResourceManagerFactory.resourceManager().discoverServicesAsync();
+ }
+
public void testErrorPage() {
try {
throw new RuntimeException("Yikes!");
Modified: trunk/core/src/main/webapp/include/header.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/header.xhtml 2009-03-23 17:49:07 UTC (rev 252)
+++ trunk/core/src/main/webapp/include/header.xhtml 2009-03-23 20:59:57 UTC (rev 253)
@@ -50,13 +50,17 @@
<ui:remove>
<!-- Disable the Help link until we actually have some online help to link to. -->
|
- [<a href="#">#{messages['help.link']}</a>]
+ [<a href="#">#{messages['help.link']}</a>]
</ui:remove>
<h:outputText rendered="#{debug}">
|
- [<s:link action="#{debugAction.dumpInventory()}">Dump Inventory</s:link>]
+ [<s:link action="#{debugAction.dumpInventory()}">Dump Inventory</s:link>]
|
- [<s:link action="#{debugAction.testErrorPage()}">Test Error Page</s:link>]
+ [<s:link action="#{debugAction.runServerScan()}">Run Server Scan</s:link>]
+ |
+ [<s:link action="#{debugAction.runServiceScan()}">Run Service Scan</s:link>]
+ |
+ [<s:link action="#{debugAction.testErrorPage()}">Test Error Page</s:link>]
</h:outputText>
</div>
</div>
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r252 - trunk/core/src/main/webappBinary/images.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-03-23 13:49:07 -0400 (Mon, 23 Mar 2009)
New Revision: 252
Modified:
trunk/core/src/main/webappBinary/images/favicon.png
Log:
use EmbJopr logo for favicon instead of Jopr logo (https://jira.jboss.org/jira/browse/EMBJOPR-103)
Modified: trunk/core/src/main/webappBinary/images/favicon.png
===================================================================
(Binary files differ)
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r251 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit/as5 and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: fjuma
Date: 2009-03-23 10:24:42 -0400 (Mon, 23 Mar 2009)
New Revision: 251
Added:
trunk/jsfunit/testdata/destinations/MetricsOneQueueReceiverExistingQueue-service.xml
trunk/jsfunit/testdata/destinations/QueueMetricsMultipleMessagesExistingQueue-service.xml
trunk/jsfunit/testdata/destinations/QueueMetricsOneMessageExistingQueue-service.xml
trunk/jsfunit/testdata/destinations/QueueMetricsReceiveMessageExistingQueue-service.xml
trunk/jsfunit/testdata/destinations/QueueMetricsScheduledMessagesExistingQueue-service.xml
trunk/jsfunit/testdata/destinations/QueueMetricsTimeLastUpdateExistingQueue-service.xml
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
Log:
Adding metrics tests for queues.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-03-21 00:54:16 UTC (rev 250)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-03-23 14:24:42 UTC (rev 251)
@@ -240,10 +240,9 @@
String id = metric.getIdAttribute();
// An example id is: dataTable:0:j_id118:2:j_id119
- String[] idElements = id.split(":");
- String rowNum = idElements[idElements.length - 2];
- return ((HtmlTableCell)client.getElement(rowNum
- + ":measurementValue")).asText();
+ // We would need: dataTable:0:j_id118:2:measurementValue
+ return ((HtmlTableCell)client.getElement(id.substring(0, id.lastIndexOf(":"))
+ + ":measurementValue")).asText();
}
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-03-21 00:54:16 UTC (rev 250)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-03-23 14:24:42 UTC (rev 251)
@@ -51,6 +51,9 @@
import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSession;
+import javax.jms.QueueSender;
+import javax.jms.QueueReceiver;
import javax.jms.ConnectionFactory;
import javax.jms.TextMessage;
import javax.jms.JMSException;
@@ -119,6 +122,8 @@
private static final String DEPTH_DELTA = "Depth Delta";
private static final String TIME_LAST_UPDATE = "Time Last Update";
+ private static final long SCHEDULED_TIME = 3600000;
+
private TopicConnection topicConnection = null;
private QueueConnection queueConnection = null;
@@ -215,7 +220,7 @@
topicConnection.setClientID(CLIENT_ID);
TopicSession topicSession = topicConnection.createTopicSession(Boolean.FALSE,
- TopicSession.AUTO_ACKNOWLEDGE);
+ TopicSession.AUTO_ACKNOWLEDGE);
topicConnection.start();
return topicSession;
@@ -226,7 +231,7 @@
*/
protected TopicSubscriber createNonDurableTopicSubscriber(TopicSession session,
Topic topic) throws JMSException {
- return session.createSubscriber(topic);
+ return session.createSubscriber(topic);
}
/**
@@ -235,7 +240,7 @@
protected TopicSubscriber createDurableTopicSubscriber(TopicSession session,
Topic topic,
String subscriptionName) throws JMSException {
- return session.createDurableSubscriber(topic, subscriptionName);
+ return session.createDurableSubscriber(topic, subscriptionName);
}
/**
@@ -259,13 +264,90 @@
* Lookup and return the topic given by jndiName.
*/
protected Topic getTopic(String jndiName) throws NamingException {
+ InitialContext context = new InitialContext();
+ Topic topic = (Topic)context.lookup(jndiName);
+
+ return topic;
+ }
+
+ /**
+ * Create a queue session and return it.
+ */
+ protected QueueSession createQueueSession() throws Exception {
InitialContext context = new InitialContext();
- Topic topic = (Topic)context.lookup(jndiName);
+ Object tmp = context.lookup(QUEUE_FACTORY);
- return topic;
+ QueueConnectionFactory qcf = (QueueConnectionFactory)tmp;
+ queueConnection = qcf.createQueueConnection();
+
+ QueueSession queueSession = queueConnection.createQueueSession(Boolean.FALSE,
+ QueueSession.AUTO_ACKNOWLEDGE);
+ queueConnection.start();
+
+ return queueSession;
}
/**
+ * Create a QueueReceiver and return it.
+ */
+ protected QueueReceiver createQueueReceiver(QueueSession session,
+ Queue queue) throws JMSException {
+ return session.createReceiver(queue);
+ }
+
+ /**
+ * Create a QueueSender for the given queue and send the
+ * given number of messages.
+ */
+ protected void sendMessages(QueueSession session,
+ Queue queue,
+ int numMessages) throws JMSException {
+
+ QueueSender sender = session.createSender(queue);
+
+ for(int i = 0; i < numMessages; i++) {
+ TextMessage message = session.createTextMessage("Message " + i);
+ sender.send(message);
+ }
+
+ sender.close();
+ }
+
+ /**
+ * Create a QueueSender for the given queue and schedule the
+ * given number of messages.
+ */
+ protected void sendScheduledMessages(QueueSession session,
+ Queue queue,
+ int numMessages) throws JMSException {
+ QueueSender sender = session.createSender(queue);
+
+ for(int i = 0; i < numMessages; i++) {
+
+ // Schedule the message
+ TextMessage message = session.createTextMessage("Message " + i);
+
+ long now = System.currentTimeMillis();
+ message.setLongProperty("JMS_JBOSS_SCHEDULED_DELIVERY", now + SCHEDULED_TIME);
+
+ sender.send(message);
+ }
+
+ sender.close();
+ }
+
+ /**
+ * Lookup and return the queue given by jndiName.
+ */
+ protected Queue getQueue(String jndiName) throws NamingException {
+ InitialContext context = new InitialContext();
+ Queue queue = (Queue)context.lookup(jndiName);
+
+ return queue;
+ }
+
+
+ /**
* Close all connections.
*/
protected void disconnect() throws JMSException {
@@ -702,7 +784,7 @@
TOPIC_COMPONENT_TYPE, propertiesMapChanges,
propertiesMap);
}
-
+
/**
* Test Name: testConfigureQueueChangeProperties
* Assertion: Verify the ability to change queue property values.
@@ -1168,6 +1250,344 @@
}
/**
+ * Test Name: testQueueMetricsAfterCreation
+ * Assertion: Verify that queue metrics are correct after queue
+ * creation.
+ */
+ public void testQueueMetricsAfterCreation() throws Exception {
+ String jndiName = "MetricsAfterQueueCreation";
+
+ // Create the queue first
+ createQueue(jndiName);
+
+ // Set up the expected values
+ Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
+ expectedMetrics.put(CONSUMER_COUNT, "0.0");
+ expectedMetrics.put(DELIVERING_COUNT, "0.0");
+ expectedMetrics.put(MSG_COUNT, "0.0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
+ expectedMetrics.put(COUNT, "0.0");
+ expectedMetrics.put(COUNT_DELTA, "0.0");
+ expectedMetrics.put(DEPTH, "0.0");
+ expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(TIME_LAST_UPDATE, "0.0");
+
+ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
+ DestinationType.QUEUE);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterCreatingReceiver
+ * Assertion: Verify that queue metrics are correct after creating
+ * a queue receiver.
+ */
+ public void testQueueMetricsAfterCreatingReceiver() throws Exception {
+ String jndiName = "MetricsAfterQueueReceiver";
+
+ // Create the queue first
+ createQueue(jndiName);
+
+ checkQueueMetricsAfterCreatingReceiver(jndiName);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterCreatingReceiverUsingExistingServiceFile
+ * Assertion: Verify that queue metrics are correct after creating
+ * a queue receiver. Use a queue that already exists.
+ */
+ public void testQueueMetricsAfterCreatingReceiverUsingExistingServiceFile() throws Exception {
+ String jndiName = "MetricsOneQueueReceiverExistingQueue";
+
+ expandNavTreeArrow(JMS_NAV_LABEL);
+ checkQueueMetricsAfterCreatingReceiver(jndiName);
+ }
+
+ /**
+ * Common code for the testQueueMetricsAfterCreatingReceiver* tests.
+ */
+ private void checkQueueMetricsAfterCreatingReceiver(String jndiName) throws Exception {
+
+ // Create a receiver
+ QueueSession session = createQueueSession();
+ Queue queue = getQueue(jndiName);
+ createQueueReceiver(session, queue);
+
+ // Set up the expected values
+ Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
+ expectedMetrics.put(CONSUMER_COUNT, "1.0");
+ expectedMetrics.put(DELIVERING_COUNT, "0.0");
+ expectedMetrics.put(MSG_COUNT, "0.0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
+ expectedMetrics.put(COUNT, "0.0");
+ expectedMetrics.put(COUNT_DELTA, "0.0");
+ expectedMetrics.put(DEPTH, "0.0");
+ expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(TIME_LAST_UPDATE, "0.0");
+
+ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
+ DestinationType.QUEUE);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterOneMessage
+ * Assertion: Verify that queue metrics are correct after sending
+ * a message to the queue.
+ */
+ public void testQueueMetricsAfterOneMessage() throws Exception {
+ String jndiName = "QueueMetricsAfterOneMessage";
+
+ // Create the queue first
+ createQueue(jndiName);
+
+ checkQueueMetricsAfterOneMessage(jndiName);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterOneMessageUsingExistingServiceFile
+ * Assertion: Verify that queue metrics are correct after sending
+ * a message to the queue. Use a queue that already exists.
+ */
+ public void testQueueMetricsAfterOneMessageUsingExistingServiceFile() throws Exception {
+ String jndiName = "QueueMetricsOneMessageExistingQueue";
+
+ expandNavTreeArrow(JMS_NAV_LABEL);
+ checkQueueMetricsAfterOneMessage(jndiName);
+ }
+
+ /**
+ * Common code for the testQueueMetricsAfterOneMessage* tests.
+ */
+ private void checkQueueMetricsAfterOneMessage(String jndiName) throws Exception {
+
+ // Send 1 message to the queue
+ QueueSession session = createQueueSession();
+ Queue queue = getQueue(jndiName);
+ sendMessages(session, queue, 1);
+
+ // Set up the expected values
+ Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
+ expectedMetrics.put(CONSUMER_COUNT, "0.0");
+ expectedMetrics.put(DELIVERING_COUNT, "0.0");
+ expectedMetrics.put(MSG_COUNT, "1.0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
+ expectedMetrics.put(COUNT, "1.0");
+ expectedMetrics.put(COUNT_DELTA, "1.0");
+ expectedMetrics.put(DEPTH, "1.0");
+ expectedMetrics.put(DEPTH_DELTA, "1.0");
+
+ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
+ DestinationType.QUEUE);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterMulipleMessages
+ * Assertion: Verify that queue metrics are correct after sending
+ * multiple messages to the queue.
+ */
+ public void testQueueMetricsAfterMultipleMessages() throws Exception {
+ String jndiName = "QueueMetricsAfterMultipleMessages";
+
+ // Create the queue first
+ createQueue(jndiName);
+
+ checkQueueMetricsAfterMultipleMessages(jndiName);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterMulipleMessagesUsingExistingServiceFile
+ * Assertion: Verify that queue metrics are correct after sending
+ * multiple messages to the queue. Use a queue that already exists.
+ */
+ public void testQueueMetricsAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+ String jndiName = "QueueMetricsMultipleMessagesExistingQueue";
+
+ expandNavTreeArrow(JMS_NAV_LABEL);
+ checkQueueMetricsAfterMultipleMessages(jndiName);
+ }
+
+ /**
+ * Common code for the testQueueMetricsAfterMultipleMessages* tests.
+ */
+ private void checkQueueMetricsAfterMultipleMessages(String jndiName) throws Exception {
+
+ // Send multiple messages to the queue
+ QueueSession session = createQueueSession();
+ Queue queue = getQueue(jndiName);
+ sendMessages(session, queue, 3);
+
+ // Set up the expected values
+ Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
+ expectedMetrics.put(CONSUMER_COUNT, "0.0");
+ expectedMetrics.put(DELIVERING_COUNT, "0.0");
+ expectedMetrics.put(MSG_COUNT, "3.0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
+ expectedMetrics.put(COUNT, "3.0");
+ expectedMetrics.put(COUNT_DELTA, "3.0");
+ expectedMetrics.put(DEPTH, "3.0");
+ expectedMetrics.put(DEPTH_DELTA, "3.0");
+
+ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
+ DestinationType.QUEUE);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterReceivingMessage
+ * Assertion: Verify that queue metrics are correct
+ * after a queue receiver actually receives a message.
+ */
+ public void testQueueMetricsAfterReceivingMessage() throws Exception {
+ String jndiName = "QueueMetricsAfterReceivingMessage";
+
+ // Create the queue first
+ createQueue(jndiName);
+
+ checkQueueMetricsAfterReceivingMessage(jndiName);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterReceivingMessageUsingExistingServiceFile
+ * Assertion: Verify that queue metrics are correct
+ * after a queue receiver actually receives a message. Use a queue
+ * that already exists.
+ */
+ public void testQueueMetricsAfterReceivingMessageUsingExistingServiceFile() throws Exception {
+ String jndiName = "QueueMetricsReceiveMessageExistingQueue";
+
+ expandNavTreeArrow(JMS_NAV_LABEL);
+ checkQueueMetricsAfterReceivingMessage(jndiName);
+ }
+
+ /**
+ * Common code for the testQueueMetricsAfterReceivingMessage* tests.
+ */
+ private void checkQueueMetricsAfterReceivingMessage(String jndiName) throws Exception {
+
+ // Create a queue receiver and then send multiple messages to the
+ // queue
+ QueueSession session = createQueueSession();
+ Queue queue = getQueue(jndiName);
+ QueueReceiver receiver = createQueueReceiver(session, queue);
+ sendMessages(session, queue, 3);
+
+ // Actually receive a message
+ receiver.receive();
+
+ // Set up the expected values
+ Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
+ expectedMetrics.put(CONSUMER_COUNT, "1.0");
+ expectedMetrics.put(DELIVERING_COUNT, "2.0");
+ expectedMetrics.put(MSG_COUNT, "2.0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
+ expectedMetrics.put(COUNT, "3.0");
+ expectedMetrics.put(COUNT_DELTA, "3.0");
+ expectedMetrics.put(DEPTH, "2.0");
+ expectedMetrics.put(DEPTH_DELTA, "2.0");
+
+ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
+ DestinationType.QUEUE);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterScheduledMessages
+ * Assertion: Verify that queue metrics are correct after creating
+ * some scheduled messages for the queue.
+ */
+ public void testQueueMetricsAfterScheduledMessages() throws Exception {
+ String jndiName = "QueueMetricsAfterScheduledMessages";
+
+ // Create the queue first
+ createQueue(jndiName);
+
+ checkQueueMetricsAfterScheduledMessage(jndiName);
+ }
+
+ /**
+ * Test Name: testQueueMetricsAfterScheduledMessagesUsingExistingServiceFile
+ * Assertion: Verify that queue metrics are correct after creating
+ * a scheduled message for the queue. Use a queue that already exists.
+ */
+ public void testQueueMetricsAfterScheduledMessagesUsingExistingServiceFile() throws Exception {
+ String jndiName = "QueueMetricsScheduledMessagesExistingQueue";
+
+ expandNavTreeArrow(JMS_NAV_LABEL);
+ checkQueueMetricsAfterScheduledMessage(jndiName);
+ }
+
+ /**
+ * Common code for the testQueueMetricsAfterScheduledMessage* tests.
+ */
+ private void checkQueueMetricsAfterScheduledMessage(String jndiName) throws Exception {
+
+ // Create a queue receiver and then schedule some
+ // messages
+ QueueSession session = createQueueSession();
+ Queue queue = getQueue(jndiName);
+ createQueueReceiver(session, queue);
+ sendScheduledMessages(session, queue, 2);
+
+ // Set up the expected values
+ Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "2.0");
+ expectedMetrics.put(COUNT, "2.0");
+ expectedMetrics.put(COUNT_DELTA, "2.0");
+ expectedMetrics.put(DEPTH, "0.0");
+ expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "1.0");
+ expectedMetrics.put(MSG_COUNT, "2.0");
+ expectedMetrics.put(DELIVERING_COUNT, "0.0");
+
+ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
+ DestinationType.QUEUE);
+ }
+
+ /**
+ * Test Name: testQueueMetricsTimeLastUpdate
+ * Assertion: Verify that the "Time Last Update" metric for queues gets
+ * displayed appropriately.
+ */
+ public void testQueueMetricTimeLastUpdate() throws Exception {
+ String jndiName = "QueueMetricsCheckTimeLastUpdate";
+
+ // Create the queue first
+ createQueue(jndiName);
+ checkQueueMetricTimeLastUpdate(jndiName);
+ }
+
+ /**
+ * Test Name: testQueueMetricsTimeLastUpdateUsingExistingServiceFile
+ * Assertion: Verify that the "Time Last Update" metric for queues gets
+ * displayed appropriately. Use a queue that already exists.
+ */
+ public void testQueueMetricTimeLastUpdateUsingExistingServiceFile() throws Exception {
+ String jndiName = "QueueMetricsTimeLastUpdateExistingQueue";
+
+ expandNavTreeArrow(JMS_NAV_LABEL);
+ checkQueueMetricTimeLastUpdate(jndiName);
+ }
+
+ /**
+ * Common code for the testQueueMetricsTimeLastUpdate* tests.
+ */
+ private void checkQueueMetricTimeLastUpdate(String jndiName) throws Exception {
+
+ // Send a message to the queue
+ QueueSession session = createQueueSession();
+ Queue queue = getQueue(jndiName);
+ sendMessages(session, queue, 1);
+
+ ArrayList<String> expectedMetric = new ArrayList<String>();
+ expectedMetric.add(TIME_LAST_UPDATE);
+
+ checkResourceMetricsNotNull(JMS_NAV_LABEL, DestinationType.QUEUE.getNavLabel(),
+ jndiName, expectedMetric.iterator(),
+ ZERO_VALUE_MESSAGE,
+ "0.0");
+ // Clean up
+ disconnect();
+ deleteDestination(DestinationType.QUEUE, jndiName);
+ }
+
+ /**
* Common code for the metrics tests.
*/
private void checkDestinationMetrics(String jndiName,
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-03-21 00:54:16 UTC (rev 250)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-03-23 14:24:42 UTC (rev 251)
@@ -54,7 +54,8 @@
public static final String MISSING_VALUE_MESSAGE = "Value is required";
public static final String OUT_OF_RANGE_MESSAGE = "Specified attribute is not between the expected values";
public static final String INVALID_INTEGER_MESSAGE = "Value is not a valid integer";
-
+ public static final String ZERO_VALUE_MESSAGE = "Expected non-zero value for ";
+
// Success messages
public static final String ADD_MESSAGE = "Successfully added new ";
public static final String DELETE_MESSAGE = "Successfully deleted ";
@@ -114,13 +115,13 @@
setResourceProperties(propertiesMapChanges);
client.click("resourceConfigurationForm:saveButton");
-
+
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Verify that the properties were set correctly
checkComponentProperties(propertiesMapChanges, resourceName, componentType);
}
-
+
/**
* Unset the specified properties for the given resource.
*
@@ -244,12 +245,12 @@
"Incorrect metric value for ");
if(summaryMetrics.size() > 0) {
-
- // Check values under the "Summary" tab
- HtmlAnchor summaryLink = (HtmlAnchor)client.getElement(SUMMARY_TAB);
- summaryLink.click();
- checkMetricValues(summaryMetrics.iterator(), metricsMap,
+ // Check values under the "Summary" tab
+ HtmlAnchor summaryLink = (HtmlAnchor)client.getElement(SUMMARY_TAB);
+ summaryLink.click();
+
+ checkMetricValues(summaryMetrics.iterator(), metricsMap,
"Incorrect summary metric value for ");
}
}
@@ -262,14 +263,39 @@
* @param metricsMap maps metric names to their expected values
*/
protected void checkMetricValues(Iterator i, Map<String, String> metricsMap, String errorMessage) {
-
- while(i.hasNext()) {
- String metricName = (String)i.next();
-
- String expected = metricsMap.get(metricName);
- String actual = getMetricValueFromTable(metricName, "dataTable");
- actual = normalizeIfDoubleExpected(expected, actual);
- assertEquals(errorMessage + " '"+ metricName + "'", expected, actual);
- }
+
+ while(i.hasNext()) {
+ String metricName = (String)i.next();
+
+ String expected = metricsMap.get(metricName);
+ String actual = getMetricValueFromTable(metricName, "dataTable");
+ actual = normalizeIfDoubleExpected(expected, actual);
+ assertEquals(errorMessage + " '" + metricName + "'", expected, actual);
+ }
}
+
+ /**
+ * Make sure that the specified metrics corresponding to the given resource
+ * are not equal to nullValue.
+ *
+ * @param i is an Iterator over the metrics we want to check
+ *
+ */
+ protected void checkResourceMetricsNotNull(String resourceCategory,
+ String resourceSubCategory,
+ String resourceName,
+ Iterator i,
+ String errorMessage,
+ String nullValue) throws Exception {
+
+ // Navigate to the metrics page for the resource
+ navigateToPage(resourceCategory, resourceSubCategory,
+ resourceName, METRICS_TAB);
+
+ while(i.hasNext()) {
+ String metricName = (String)i.next();
+ String actual = getMetricValueFromTable(metricName, "dataTable");
+ assertTrue(errorMessage + "'" + metricName + "' but was: " + actual, !actual.equals(nullValue));
+ }
+ }
}
Added: trunk/jsfunit/testdata/destinations/MetricsOneQueueReceiverExistingQueue-service.xml
===================================================================
--- trunk/jsfunit/testdata/destinations/MetricsOneQueueReceiverExistingQueue-service.xml (rev 0)
+++ trunk/jsfunit/testdata/destinations/MetricsOneQueueReceiverExistingQueue-service.xml 2009-03-23 14:24:42 UTC (rev 251)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=MetricsOneQueueReceiverExistingQueue" code="org.jboss.jms.server.destination.QueueService">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <attribute name="JNDIName">MetricsOneQueueReceiverExistingQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: trunk/jsfunit/testdata/destinations/QueueMetricsMultipleMessagesExistingQueue-service.xml
===================================================================
--- trunk/jsfunit/testdata/destinations/QueueMetricsMultipleMessagesExistingQueue-service.xml (rev 0)
+++ trunk/jsfunit/testdata/destinations/QueueMetricsMultipleMessagesExistingQueue-service.xml 2009-03-23 14:24:42 UTC (rev 251)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=QueueMetricsMultipleMessagesExistingQueue" code="org.jboss.jms.server.destination.QueueService">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <attribute name="JNDIName">QueueMetricsMultipleMessagesExistingQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: trunk/jsfunit/testdata/destinations/QueueMetricsOneMessageExistingQueue-service.xml
===================================================================
--- trunk/jsfunit/testdata/destinations/QueueMetricsOneMessageExistingQueue-service.xml (rev 0)
+++ trunk/jsfunit/testdata/destinations/QueueMetricsOneMessageExistingQueue-service.xml 2009-03-23 14:24:42 UTC (rev 251)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=QueueMetricsOneMessageExistingQueue" code="org.jboss.jms.server.destination.QueueService">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <attribute name="JNDIName">QueueMetricsOneMessageExistingQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: trunk/jsfunit/testdata/destinations/QueueMetricsReceiveMessageExistingQueue-service.xml
===================================================================
--- trunk/jsfunit/testdata/destinations/QueueMetricsReceiveMessageExistingQueue-service.xml (rev 0)
+++ trunk/jsfunit/testdata/destinations/QueueMetricsReceiveMessageExistingQueue-service.xml 2009-03-23 14:24:42 UTC (rev 251)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=QueueMetricsReceiveMessageExistingQueue" code="org.jboss.jms.server.destination.QueueService">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <attribute name="JNDIName">QueueMetricsReceiveMessageExistingQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: trunk/jsfunit/testdata/destinations/QueueMetricsScheduledMessagesExistingQueue-service.xml
===================================================================
--- trunk/jsfunit/testdata/destinations/QueueMetricsScheduledMessagesExistingQueue-service.xml (rev 0)
+++ trunk/jsfunit/testdata/destinations/QueueMetricsScheduledMessagesExistingQueue-service.xml 2009-03-23 14:24:42 UTC (rev 251)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=QueueMetricsScheduledMessagesExistingQueue" code="org.jboss.jms.server.destination.QueueService">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <attribute name="JNDIName">QueueMetricsScheduledMessagesExistingQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: trunk/jsfunit/testdata/destinations/QueueMetricsTimeLastUpdateExistingQueue-service.xml
===================================================================
--- trunk/jsfunit/testdata/destinations/QueueMetricsTimeLastUpdateExistingQueue-service.xml (rev 0)
+++ trunk/jsfunit/testdata/destinations/QueueMetricsTimeLastUpdateExistingQueue-service.xml 2009-03-23 14:24:42 UTC (rev 251)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=QueueMetricsTimeLastUpdateExistingQueue" code="org.jboss.jms.server.destination.QueueService">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <attribute name="JNDIName">QueueMetricsTimeLastUpdateExistingQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r250 - in trunk/core/src/main: webappBinary/images and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-03-20 20:54:16 -0400 (Fri, 20 Mar 2009)
New Revision: 250
Added:
trunk/core/src/main/webappBinary/images/favicon.png
Modified:
trunk/core/src/main/webapp/errorLayout.xhtml
trunk/core/src/main/webapp/layout.xhtml
trunk/core/src/main/webapp/login.xhtml
Log:
add the Jopr logo as a favicon (https://jira.jboss.org/jira/browse/EMBJOPR-103)
Modified: trunk/core/src/main/webapp/errorLayout.xhtml
===================================================================
--- trunk/core/src/main/webapp/errorLayout.xhtml 2009-03-21 00:53:41 UTC (rev 249)
+++ trunk/core/src/main/webapp/errorLayout.xhtml 2009-03-21 00:54:16 UTC (rev 250)
@@ -43,7 +43,10 @@
<link href="css/console-style.css" rel="stylesheet" type="text/css"/>
<link href="css/form-style.css" rel="stylesheet" type="text/css"/>
- <script type="text/javascript" src="js/embedded.js"></script>
+ <link rel="icon" type="image/png" href="images/favicon.png"/>
+ <link rel="apple-touch-icon" href="images/favicon.png"/>
+
+ <script type="text/javascript" src="js/embedded.js"></script>
</head>
<body >
<div class="container">
Modified: trunk/core/src/main/webapp/layout.xhtml
===================================================================
--- trunk/core/src/main/webapp/layout.xhtml 2009-03-21 00:53:41 UTC (rev 249)
+++ trunk/core/src/main/webapp/layout.xhtml 2009-03-21 00:54:16 UTC (rev 250)
@@ -37,10 +37,15 @@
<title>
<ui:insert name="title">#{messages['default.windowTitle']}</ui:insert>
</title>
+
<link href="css/console-style.css" rel="stylesheet" type="text/css"/>
<link href="css/form-style.css" rel="stylesheet" type="text/css"/>
+
+ <link rel="icon" type="image/png" href="images/favicon.png"/>
+ <link rel="apple-touch-icon" href="images/favicon.png"/>
+
<script type="text/javascript" src="js/embedded.js"></script>
-
+
<!--[if lt IE 7]>
<style type="text/css" media="screen">
/* let the IE expressions commence */
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2009-03-21 00:53:41 UTC (rev 249)
+++ trunk/core/src/main/webapp/login.xhtml 2009-03-21 00:54:16 UTC (rev 250)
@@ -36,7 +36,11 @@
<head>
<base href="#{navigationAction.baseUrl}"/>
<title><ui:insert name="title">#{messages['default.windowTitle']}</ui:insert></title>
+
<link href="css/console-style.css" rel="stylesheet" type="text/css"/>
+
+ <link rel="icon" type="image/png" href="images/favicon.png"/>
+ <link rel="apple-touch-icon" href="images/favicon.png"/>
</head>
<body onload="document.getElementById('login_form:name').focus();">
<div align="center" class="container">
Added: trunk/core/src/main/webappBinary/images/favicon.png
===================================================================
(Binary files differ)
Property changes on: trunk/core/src/main/webappBinary/images/favicon.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r249 - in trunk: jbas5 and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-03-20 20:53:41 -0400 (Fri, 20 Mar 2009)
New Revision: 249
Modified:
trunk/core/pom.xml
trunk/jbas5/pom.xml
Log:
don't touch web.xml in the dev profile anymore - it doesn't seem to be necessary to trigger a redeploy and was actually causing issues
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2009-03-20 18:46:05 UTC (rev 248)
+++ trunk/core/pom.xml 2009-03-21 00:53:41 UTC (rev 249)
@@ -377,9 +377,11 @@
<fileset dir="${basedir}/src/main/webappBinary" />
</copy>
<!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
-
+
+ <!--
<echo>*** Touching <jbas5.warDir>/WEB-INF/web.xml to force redeploy...</echo>
<touch file="${jbas5.warDir}/WEB-INF/web.xml" />
+ -->
</tasks>
</configuration>
<goals>
Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml 2009-03-20 18:46:05 UTC (rev 248)
+++ trunk/jbas5/pom.xml 2009-03-21 00:53:41 UTC (rev 249)
@@ -144,8 +144,10 @@
</patternset>
</unjar>
+ <!--
<echo>*** Touching <warDir>/WEB-INF/web.xml to force redeploy...</echo>
<touch file="${deployment.dir}/WEB-INF/web.xml" />
+ -->
</tasks>
</configuration>
<goals>
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r248 - trunk/core/src/main/webapp/WEB-INF/classes.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-03-20 14:46:05 -0400 (Fri, 20 Mar 2009)
New Revision: 248
Added:
trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties
Log:
Japanese message bundle (https://jira.jboss.org/jira/browse/EMBJOPR-64)
Added: trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties (rev 0)
+++ trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties 2009-03-20 18:46:05 UTC (rev 248)
@@ -0,0 +1,201 @@
+#
+# Embedded Jopr Project
+# Copyright (C) 2006-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 Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#
+# English message bundle for JBoss Admin Console GUI.
+#
+product.name=${product.name}
+product.version=${product.version}
+product.buildNumber=${buildNumber}
+product.copyright=© 2002-2008 Red Hat Middleware, LLC. All rights reserved. JBoss is a registered trademark of Red Hat, Inc.
+
+default.windowTitle=JBoss Application Server \u30b3\u30f3\u30bd\u30fc\u30eb
+#default.header=JBoss Application Server Console
+default.breadcrumb=default breadcrumb
+
+button.ok=OK
+
+tab.menu.summary=\u30b5\u30de\u30ea
+tab.menu.configuration=\u8a2d\u5b9a
+tab.menu.metrics=\u30e1\u30c8\u30ea\u30af\u30b9
+tab.menu.control=\u7ba1\u7406
+tab.menu.content=\u30b3\u30f3\u30c6\u30f3\u30c8
+
+resource.not.found=\u30ea\u30bd\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
+
+resource.template=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
+resource.template.select=\u30ea\u30bd\u30fc\u30b9\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9078\u629e
+resource.template.desc=\u8a2d\u5b9a\u30da\u30fc\u30b8\u306f\u9078\u629e\u3055\u308c\u305f\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5024\u304c\u4e8b\u524d\u306b\u5165\u529b\u3055\u308c\u307e\u3059
+
+resource.configuration.no.map.found=\u30ea\u30bd\u30fc\u30b9\u8a2d\u5b9a\u306b {0} \u3068\u3044\u3046\u540d\u524d\u306e\u30de\u30c3\u30d7\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
+resource.configuration.map.button.ok=OK
+resource.configuration.map.button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+resource.configuration.null=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u8a2d\u5b9a\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+
+resource.status.create.failure=\u30ea\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f. \u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30b5\u30fc\u30d0\u30fc\u30ed\u30b0\u3092\u3054\u89a7\u304f\u3060\u3055\u3044.
+resource.status.create.success=\u30ea\u30bd\u30fc\u30b9\u304c\u6b63\u5e38\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f.
+resource.status.update.validationErrors=\u4e0d\u6b63\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f.\u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044.
+resource.status.update.failure=\u30ea\u30bd\u30fc\u30b9\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f. \u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30b5\u30fc\u30d0\u30fc\u30ed\u30b0\u3092\u3054\u89a7\u304f\u3060\u3055\u3044.
+resource.status.update.success=\u30ea\u30bd\u30fc\u30b9\u304c\u6b63\u5e38\u306b\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f.
+resource.status.remove.failure=\u30ea\u30bd\u30fc\u30b9\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f. \u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30b5\u30fc\u30d0\u30fc\u30ed\u30b0\u3092\u3054\u89a7\u304f\u3060\u3055\u3044.
+resource.status.remove.success=\u30ea\u30bd\u30fc\u30b9\u304c\u6b63\u5e38\u306b\u524a\u9664\u3055\u308c\u307e\u3057\u305f.
+resource.status.invalidProps=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024\u304c\u4e0d\u6b63\u3067\u3059.\u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044.
+
+resource.edit.title=\u30ea\u30bd\u30fc\u30b9\u306e\u8a2d\u5b9a
+
+resourcetype.no.action=\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u3042\u308a\u307e\u305b\u3093
+#the following 3 are currently used in NavigationAction, but can be deleted once those usages are cleaned up
+datasource.list.jndiName=JNDI \u540d
+datasource.list.type=\u30bf\u30a4\u30d7
+datasource.list.status=\u30b9\u30c6\u30fc\u30bf\u30b9
+
+resource.view.button.save=\u4fdd\u5b58
+resource.view.button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+resource.view.requiredFields=\u5fc5\u9808\u9805\u76ee
+
+resource.add.pageTitlePrefix=\u65b0\u3057\u304f\u8ffd\u52a0
+resource.add.button.continue=\u7d9a\u3051\u308b
+resource.add.button.save=\u4fdd\u5b58
+resource.add.button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+
+resource.content.button.update=\u66f4\u65b0
+
+component.dataPaginator.firstpage=\u6700\u521d
+component.dataPaginator.lastpage=\u6700\u5f8c
+component.dataPaginator.previouspage=\u524d
+component.dataPaginator.nextpage=\u6b21
+component.dataPaginator.fastforward=\u9806\u9001\u308a
+component.dataPaginator.fastbackward=\u5dfb\u304d\u623b\u3057
+
+summary.root.title=\u30b5\u30de\u30ea
+
+summary.resourceInstance.configuration=\u4e00\u822c\u60c5\u5831
+summary.resourceInstance.configuration.name=\u540d\u524d:
+summary.resourceInstance.configuration.version=\u30d0\u30fc\u30b8\u30e7\u30f3:
+summary.resourceInstance.configuration.description=\u8aac\u660e:
+summary.resourceInstance.traits=\u30ea\u30bd\u30fc\u30b9\u306e\u7279\u6027
+summary.resourceInstance.metrics=\u30e1\u30c8\u30ea\u30af\u30b9\u306e\u30b5\u30de\u30ea
+summary.resourceInstance.metrics.name=\u540d\u524d
+summary.resourceInstance.metrics.value=\u5024
+
+summary.resourceType.name=\u540d\u524d
+summary.resourceType.status=\u30b9\u30c6\u30fc\u30bf\u30b9
+summary.resourceType.actions=\u30a2\u30af\u30b7\u30e7\u30f3
+summary.resourceType.delete=\u524a\u9664
+summary.resourceType.addNew=\u65b0\u898f\u30ea\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0
+summary.resourceType.confirmDelete=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3092\u672c\u5f53\u306b\u524a\u9664\u3057\u3066\u826f\u3044\u3067\u3059\u304b\uff1f
+
+summary.category.type=\u30bf\u30a4\u30d7
+summary.category.types=\u30bf\u30a4\u30d7
+
+#Messages for resourceInstanceMetrics.xhtml
+metrics.resourceInstance.title=\u30e1\u30c8\u30ea\u30af\u30b9
+metrics.resourceInstance.numericMetricValues=\u30e1\u30c8\u30ea\u30af\u30b9\u5024
+metrics.resourceInstance.traitValues=\u7279\u6027\u5024
+metrics.resourceInstance.category=\u30ab\u30c6\u30b4\u30ea
+metrics.resourceInstance.name=\u540d\u524d
+metrics.resourceInstance.value=\u5024
+metrics.resourceInstance.description=\u8aac\u660e
+metrics.resourceInstance.refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
+metrics.resourceInstance.pageDescription=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306e\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30e1\u30c8\u30ea\u30af\u30b9\u3092\u898b\u308b.
+
+#Messages for resourceInstanceControl.xhtml
+control.resourceInstance.title=\u7ba1\u7406\u64cd\u4f5c
+control.resourceInstance.name=\u540d\u524d
+control.resourceInstance.error.noOperations=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u53ef\u80fd\u306a\u64cd\u4f5c\u306f\u3042\u308a\u307e\u305b\u3093
+control.resourceInstance.select=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u53ef\u80fd\u306a\u64cd\u4f5c:
+control.resourceInstance.button.execute=\u5b9f\u884c
+control.resourceInstance.previous=\u4ee5\u524d\u306e\u64cd\u4f5c
+control.resourceInstance.error.noPrevious=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u884c\u308f\u308c\u305f\u4ee5\u524d\u306e\u64cd\u4f5c\u306f\u3042\u308a\u307e\u305b\u3093
+control.resourceInstance.previous.executedAt=\u5b9f\u884c\u6642:
+control.resourceInstance.previous.operation=\u64cd\u4f5c\u540d
+control.resourceInstance.previous.status=\u30b9\u30c6\u30fc\u30bf\u30b9
+control.resourceInstance.previous.viewLog=(\u30ed\u30b0\u3092\u898b\u308b)
+control.resourceInstance.previous.closeLog=(\u30ed\u30b0\u3092\u9589\u3058\u308b)
+control.resourceInstance.previous.success=\u6210\u529f
+control.resourceInstance.previous.inProgress=\u9032\u884c\u4e2d
+control.resourceInstance.previous.failure=\u5931\u6557
+control.resourceInstance.previous.showHideDetails=(\u8a73\u7d30\u3092\u8868\u793a/\u975e\u8868\u793a)
+control.resourceInstance.previous.closeDetails=(\u9589\u3058\u308b)
+control.resourceInstance.previous.details=\u8a73\u7d30
+control.resourceInstance.previous.parameters=\u30d1\u30e9\u30e1\u30fc\u30bf
+control.resourceInstance.previous.results=\u7d50\u679c
+control.resourceInstance.previous.error=\u30a8\u30e9\u30fc
+control.resourceInstance.previous.map.button.ok=OK
+control.resourceInstance.previous.map.buttonLabel.ok=\u7ba1\u7406\u30bf\u30d6\u306b\u623b\u308b
+
+#This is a workaround for JBMANCON-370. This can be deleted once
+#JBMANCON-370 is resolved.
+control.resourceInstance.status.details1a=\u6700\u65b0\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u78ba\u8a8d\u3059\u308b\u306b\u306f\u3053\u306e\u30da\u30fc\u30b8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u304f\u3060\u3055\u3044
+control.resourceInstance.status.details1b=
+
+#Messages for resourceInstanceContent.xhtml
+content.resourceInstance.title=\u30b3\u30f3\u30c6\u30f3\u30c8
+content.resourceInstance.pageDescription=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306e\u30d0\u30c3\u30ad\u30f3\u30b0\u30b3\u30f3\u30c6\u30f3\u30c8\u3092\u898b\u308b
+content.resourceInstance.name=\u540d\u524d
+content.resourceInstance.architecture=\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
+content.resourceInstance.packagetype=\u30d1\u30c3\u30b1\u30fc\u30b8\u30bf\u30a4\u30d7
+content.resourceInstance.version=\u30d0\u30fc\u30b8\u30e7\u30f3
+
+#Messages for resourceContentCreate.xhtml
+content.resourceInstance.create=\u30c7\u30d7\u30ed\u30a4\u3057\u305f\u3044\u30ed\u30fc\u30ab\u30eb\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044."\u7d9a\u3051\u308b"\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u30c7\u30d7\u30ed\u30a4\u3067\u304d\u307e\u3059
+content.resourceInstance.create.noFileSelected=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044.
+content.resourceInstance.create.resourceTypeHasNoCreationPackageType=\u3053\u306e\u30bf\u30a4\u30d7\u306e\u30ea\u30bd\u30fc\u30b9\u306f\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093. \u3053\u306e\u30ea\u30bd\u30fc\u30b9\u30bf\u30a4\u30d7\u306f\u30d1\u30c3\u30b1\u30fc\u30b8\u30bf\u30a4\u30d7\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u305b\u3093.
+content.resourceInstance.create.unableToCreateTempFile=\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u4e2d\u306b\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f.
+content.resourceInstance.create.success=\u30ea\u30bd\u30fc\u30b9 {0} \u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f!
+content.resourceInstance.create.failure=\u30ea\u30bd\u30fc\u30b9 {0} \u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f - \u539f\u56e0: {1}
+
+#Messages for resourceInstanceContent.xhtml
+content.resourceInstance.update.noFileSelected=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044.
+content.resourceInstance.update.wrongFileName=\u30d5\u30a1\u30a4\u30eb\u306f\u65e2\u306b\u30c7\u30d7\u30ed\u30a4\u3055\u308c\u3066\u3044\u308b {0} \u3068\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u540d\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059 ({1}).
+content.resourceInstance.update.success={0} {1} \u304c\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3055\u308c\u307e\u3057\u305f.
+content.resourceInstance.update.failure={0} \u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f ({1}).
+
+exception.heading=\u5185\u90e8\u30a8\u30e9\u30fc
+exception.paragraph1=\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+exception.paragraph2a=\u30e1\u30a4\u30f3\u30da\u30fc\u30b8\u3078
+exception.paragraph2b=\u623b\u308b\u3068
+exception.paragraph2c=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30ea\u30bb\u30c3\u30c8\u3055\u308c\u307e\u3059
+
+
+help.link=\u30d8\u30eb\u30d7
+
+security.username=\u30e6\u30fc\u30b6\u540d
+security.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+security.login=\u30ed\u30b0\u30a4\u30f3
+security.logout=\u30ed\u30b0\u30a2\u30a6\u30c8
+security.loggedIn=\u30ed\u30b0\u30a4\u30f3\u4e2d:
+security.NotLoggedIn=\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3044\u307e\u305b\u3093
+
+org.jboss.seam.loginSuccessful=
+org.jboss.seam.loginFailed=\u30ed\u30b0\u30a4\u30f3\u306b\u5931\u6557\u3057\u307e\u3057\u305f, \u30e6\u30fc\u30b6\u540d\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
+org.jboss.seam.NotLoggedIn=
+
+javax.faces.component.UIInput.REQUIRED=\u5165\u529b\u5fc5\u9808\u9805\u76ee\u3067\u3059.
+
+javax.faces.validator.DoubleRangeValidator.MAXIMUM=\u5024\u304c\u6700\u5927\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+javax.faces.validator.DoubleRangeValidator.MINIMUM=\u5024\u304c\u6700\u5c0f\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=\u5024\u306f {0} \u301c {1} \u306e\u7bc4\u56f2\u5185\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059.
+javax.faces.validator.DoubleRangeValidator.TYPE=\u5024\u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u6570\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
+javax.faces.validator.LengthValidator.MAXIMUM=\u5024\u304c\u6700\u5927\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+javax.faces.validator.LengthValidator.MINIMUM=\u5024\u304c\u6700\u5c0f\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+javax.faces.validator.LongRangeValidator.MAXIMUM=\u5024\u304c\u6700\u5927\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+javax.faces.validator.LongRangeValidator.MINIMUM=\u5024\u304c\u6700\u5c0f\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059
+javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=\u5024\u306f {0} \u301c {1} \u306e\u7bc4\u56f2\u5185\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059.
+javax.faces.validator.LongRangeValidator.TYPE=\u5024\u306f\u6574\u6570\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
Property changes on: trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
15 years, 1 month
- 1
- 0
EMBJOPR SVN: r247 - 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-03-20 11:21:36 -0400 (Fri, 20 Mar 2009)
New Revision: 247
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java
Log:
make several Seam components Serializable in order to quiet warnings from Seam; neaten up some debug log messages
Modified: trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -19,6 +19,7 @@
package org.jboss.on.embedded;
import java.util.Set;
+import java.util.HashSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,31 +35,28 @@
public void resourcesAdded(Set<Resource> resources)
{
- log.debug("The following resources have been added");
- log(resources);
+ log.debug("The following Resources have been added: " + toString(resources));
}
public void resourcesRemoved(Set<Resource> resources)
{
- log.debug("The following resources have been removed");
- log(resources);
+ log.debug("The following Resources have been removed: " + toString(resources));
return;
}
public void resourceActivated(Resource resource)
{
- log.debug("The following resource has been activated");
- log(resource);
+ Set resources = new HashSet();
+ resources.add(resource);
+ log.debug("The following Resource has been activated: " + toString(resources));
return;
}
-
- private void log(Set<Resource> resources) {
- for (Resource resource : resources) {
- log(resource);
- }
+
+ private static String toString(Set<Resource> resources) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Resource resource : resources)
+ stringBuilder.append("Resource[").append(resource.getId()).append("]: ").append(resource.getName()).append(", ");
+ stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length());
+ return stringBuilder.toString();
}
-
- private void log(Resource resource) {
- log.debug("Resource[" + resource.getId() + "]: " + resource.getName());
- }
}
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 2009-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -23,6 +23,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.io.Serializable;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -65,7 +66,7 @@
// Most actions should be dealing with CommonActionUtil for getting hold of resources etc.
@Name("navigationAction")
@Scope(ScopeType.SESSION)
-public class NavigationAction
+public class NavigationAction implements Serializable
{
private Set<JONTreeNode> expandedYet = new HashSet<JONTreeNode>();
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-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -33,10 +33,11 @@
import java.util.List;
import java.util.Set;
import java.util.ArrayList;
+import java.io.Serializable;
@Name("contentDisplayAction")
@Scope(ScopeType.SESSION)
-public class SingleResourceContentAction
+public class SingleResourceContentAction implements Serializable
{
@Out(value = "currentResource", required = false, scope = ScopeType.PAGE)
private Resource resource;
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2009-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -49,6 +49,7 @@
import java.util.Set;
import java.util.Map;
import java.util.HashMap;
+import java.io.Serializable;
import javax.faces.application.FacesMessage;
@@ -58,7 +59,7 @@
*/
@Name("operationAction")
@Scope(value = ScopeType.CONVERSATION)
-public class SingleResourceOperationAction
+public class SingleResourceOperationAction implements Serializable
{
@In
private transient FacesMessages facesMessages;
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-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -48,6 +48,7 @@
import java.util.Map;
import java.util.Set;
import java.util.ResourceBundle;
+import java.io.Serializable;
/**
* Managed Bean to handle Resource Configuration pages. Both Create and Edit Resource configurations
@@ -57,7 +58,7 @@
*/
@Name("resourceConfigurationUIBean")
@Scope(ScopeType.CONVERSATION)
-public class ResourceConfigurationUIBean extends AbstractResourceConfigurationUIBean
+public class ResourceConfigurationUIBean extends AbstractResourceConfigurationUIBean implements Serializable
{
public static final String MANAGED_BEAN_NAME = "resourceConfigurationUIBean";
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2009-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import javax.faces.application.FacesMessage;
@@ -57,7 +58,8 @@
*/
@Name("createContentBackedResourceAction")
@Scope(ScopeType.CONVERSATION)
-public class CreateContentBackedResourceAction extends AbstractFileUploadAction {
+public class CreateContentBackedResourceAction extends AbstractFileUploadAction implements Serializable
+{
private static final String INITIAL_PACKAGE_VERSION = "1.0";
private final Log log = LogFactory.getLog(this.getClass());
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2009-03-20 13:03:03 UTC (rev 246)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2009-03-20 15:21:36 UTC (rev 247)
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
@@ -61,7 +62,8 @@
*/
@Name("updateBackingContentAction")
@Scope(ScopeType.CONVERSATION)
-public class UpdateBackingContentAction extends AbstractFileUploadAction {
+public class UpdateBackingContentAction extends AbstractFileUploadAction implements Serializable
+{
private final Log log = LogFactory.getLog(this.getClass());
@Out
15 years, 1 month
- 1
- 0