EMBJOPR SVN: r590 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit/as5/jbcache and 2 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-27 16:40:38 -0400 (Mon, 27 Jul 2009)
New Revision: 590
Added:
trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-client.jar
trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek.ear
Removed:
trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-java15-B.ear
Modified:
trunk/jsfunit/pom.xml
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
trunk/jsfunit/testdata/jbcache/info.txt
Log:
* Updated JBossCacheTest
* Added client jar for JBossCacheTest (as a system dependency)
* JBossCacheTest EAR renamed
Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml 2009-07-27 17:13:05 UTC (rev 589)
+++ trunk/jsfunit/pom.xml 2009-07-27 20:40:38 UTC (rev 590)
@@ -32,6 +32,16 @@
</pluginRepositories>
<dependencies>
+
+ <!-- Test cases deps. -->
+ <dependency>
+ <groupId>org.jboss.qa.jbcache</groupId>
+ <artifactId>jboss-cache-testop-client</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/testdata/jbcache/JBossCacheTest-by-fdrabek-client.jar</systemPath>
+ </dependency>
+
<!-- Dropping back to HtmlUnit 2.3 with Rhino until bug can be addressed -->
<dependency>
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java 2009-07-27 17:13:05 UTC (rev 589)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java 2009-07-27 20:40:38 UTC (rev 590)
@@ -1,10 +1,16 @@
package org.jboss.jopr.jsfunit.as5.jbcache;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.qa.jbcache.testear.*;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
import org.jboss.jopr.jsfunit.exceptions.ActionOutOfSyncException;
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
@@ -25,11 +31,23 @@
public final DeployableTypes APP_TYPE = DeployableTypes.JBCACHE;
// Cache which is active by default.
- private static final String DEFAULT_JBCACHE = "jboss.cache:config=ha-partition,service=Cache";
+ private static final String JBCACHE_HA_PARTITION = "jboss.cache:config=ha-partition,service=Cache";
+ private static final String JBCACHE_MVCC_ENTITY = "jboss.cache:config=mvcc-entity,service=Cache";
+ private static final String JBCACHE_PESSIMISTIC_SHARED = "jboss.cache:config=pessimistic-shared,service=Cache";
+ private static final String JBCACHE_TIMESTAMPS = "jboss.cache:config=timestamps-cache,service=Cache";
+ // Subnodes
+ private static final String SUBNODE_CACHE = "Cache";
+ private static final String SUBNODE_INTERCEPTOR = "Interceptor";
+ private static final String SUBNODE_DATA_CONTAINER = "Data Container";
+ private static final String SUBNODE_RPC_MANAGER = "RPC Manager";
+ private static final String SUBNODE_REGION_MANAGER = "RegionManager";
+ private static final String SUBNODE_TRANSACTION_TABLE = "Transaction Table";
+
+
private boolean isJBossConfigWithoutCache(){
boolean isJBossConfigWithoutCache = ! ejtt.getJBossConfig().equals("all");
if( isJBossConfigWithoutCache )
@@ -60,8 +78,9 @@
List<ContentTableRow> rows = table.getRows();
assertTrue( "Caches list should contain at least one cache.", rows.size() > 0 );
- // Check that default cache is present.
- boolean defaultPresent = false;
+ // The ha-partition cache is active by default.
+ // Check that it's present.
+ boolean haparPresent = false;
// Check that all caches are UP.
for( ContentTableRow row : rows ){
String name = row.getCellByColumnName(COL_RESOURCE_NAME).getTextContent().trim();
@@ -69,11 +88,11 @@
log.info("Cache '"+name+" - status '"+status+"'.");
if( ! "UP".equals( status ) )
fail("Cache '"+name+"' is not UP, but '"+status+"'.");
- if( DEFAULT_JBCACHE.equals(name) )
- defaultPresent = true;
+ if( JBCACHE_HA_PARTITION.equals(name) )
+ haparPresent = true;
}
- if( !defaultPresent)
- throw new EmbJoprTestException("The default cache, '"+DEFAULT_JBCACHE+"', is not present.");
+ if( !haparPresent)
+ throw new EmbJoprTestException("The '"+JBCACHE_HA_PARTITION+"' cache is not present.");
// Click on the first row link.
rows.get(0).getFirstLinkFromColumn(COL_RESOURCE_NAME).click();
@@ -85,15 +104,60 @@
+ /**
+ * Test the navigation to JBoss Cache nodes.
+ */
+ public void testJBossCacheNavigation() throws HtmlElementNotFoundException, IOException, EmbJoprTestException {
+ if( isJBossConfigWithoutCache() ) return;
+ NavTreeNode haparNode = ejtt.getNavTree().getNodeByLabel(JBCACHE_HA_PARTITION);
+
+ // All expected subnodes:
+ String[] subnodesNames = new String[]{
+ SUBNODE_CACHE,
+ SUBNODE_INTERCEPTOR,
+ SUBNODE_DATA_CONTAINER,
+ SUBNODE_RPC_MANAGER,
+ SUBNODE_REGION_MANAGER,
+ SUBNODE_TRANSACTION_TABLE
+ };
+
+
+ // Check whether all expected child nodes are present.
+ List<String> names = new ArrayList();
+ CollectionUtils.addAll(names, subnodesNames);
+
+ // Remove the names which we find.
+ List<NavTreeNode> children = haparNode.getChildren();
+ for( NavTreeNode node : children ){
+ names.remove( node.getName() );
+ }
+ // The remaining names are missing.
+ if( names.size() > 0 ){
+ throw new EmbJoprTestException("These cache nodes are not present: "+StringUtils.join(names, ", "));
+ }
+
+
+ // Click through all the subnodes (exception could occur).
+ for( String name : subnodesNames ){
+ ejtt.getNavTree().getNodeByLabel(name).click();
+ }
+
+ }
+
+
+
+
/**
* JBoss Cache Summary tab.
*/
public void testJBossCacheSummary() throws EmbJoprTestException, IOException {
if( isJBossConfigWithoutCache() ) return;
- ejtt.navTree.getNodeByLabel(DEFAULT_JBCACHE).click();
+ ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand();
+ ejtt.navTree.getNodeByLabel(SUBNODE_CACHE).click();
+
/*
General Properties
Name:jboss.cache:config=ha-partition,service=Cache
@@ -108,7 +172,7 @@
assertEquals("Traits - Name", DEFAULT_JBCACHE, props.getProperty("Name"));/**/
Properties props = new Properties();
- props.setProperty("Name", DEFAULT_JBCACHE);
+ props.setProperty("Name", "Cache");
ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValues(props);
@@ -133,7 +197,8 @@
public void testJBossCacheMetrics() throws HtmlElementNotFoundException, IOException, EmbJoprTestException {
if( isJBossConfigWithoutCache() ) return;
- ejtt.navTree.getNodeByLabel(DEFAULT_JBCACHE).click();
+ ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand();
+ ejtt.navTree.getNodeByLabel(SUBNODE_CACHE).click();
ejtt.tabMenu.clickMetricsTab();
assertTrue( "Metrics tab is not active", ejtt.tabMenu.isTabActive(TAB_NAME_METRICS) );
@@ -171,18 +236,18 @@
}
+
/**
- * JBoss Cache Control tab.
- *
- * Destroy this cache.
- * Print lock info as HTML.
- *
+ * JBoss Cache Control tab - test operations.
+ * Currently only testing whether the operations fails, because the print operations don't return usable information.
+ * @see JOPR-319.
*/
public void testJBossCacheControl() throws HtmlElementNotFoundException, IOException, ActionOutOfSyncException, EmbJoprTestException {
if( isJBossConfigWithoutCache() ) return;
- ejtt.navTree.getNodeByLabel(DEFAULT_JBCACHE).click();
+ ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand();
+ ejtt.navTree.getNodeByLabel(SUBNODE_CACHE).click();
ejtt.tabMenu.clickControlTab();
assertTrue( "Control tab is not active", ejtt.tabMenu.isTabActive(TAB_NAME_CONTROL) );
@@ -201,18 +266,118 @@
// Now test the operations, one by one.
Map<String, String> operationsToTest = new HashMap();
- operationsToTest.put("Print cache details.", "See JOPR-319.");
+ //operationsToTest.put("Print cache details.", "See JOPR-319.");
+
+ operationsToTest.put("Print cache details.", null);
+ operationsToTest.put("Print cache details as HTML.", null);
+ operationsToTest.put("Print lock information.", null);
+ operationsToTest.put("Print lock info as HTML.", null);
+ operationsToTest.put("Print configuration as plain text.", null);
+ operationsToTest.put("Print configuration as HTML.", null);
+
+
for( String opName : operationsToTest.keySet() ){
ejtt.operations.testOperation( opName, operationsToTest.get(opName) );
}
-
+ }
+
+
+
+
+
+ /**
+ * Interceptor Summary tab.
+ */
+ public void testJBossCacheInterceptorSummary() throws IOException, EmbJoprTestException {
+ if( isJBossConfigWithoutCache() ) return;
+
+ ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand();
+ ejtt.navTree.getNodeByLabel(SUBNODE_INTERCEPTOR).click();
+
+ // Gen Props - nothing useful.
+ Properties props = new Properties();
+ props.setProperty("Name", "Interceptor");
+ ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValues(props);
+
+
/*
- ejtt.tabMenu.getTabContentBox().getButtonByLabel("Create this cache.").click();
- ejtt.tabMenu.getTabContentBox().getButtonByLabel("Destroy this cache.").click();
- */
+ Numeric Metrics
+ Hit/Miss Ratio 0 Hit/Miss Ratio
+ Read/Write Ratio 0 Read/Write Ratio
+ Number Of Attributes 0 the number of cache attributes
+ Average Write Time 0.0ms the average amount of time per write operation
+ Average Read Time 0.0ms the average amount of time per read operation
+ */
+ props = new Properties();
+ props.setProperty("Hit/Miss Ratio", "0");
+ props.setProperty("Read/Write Ratio", "0");
+ props.setProperty("Number Of Attributes", "0.0ms");
+ props.setProperty("Average Write Time", "0.0ms");
+ props.setProperty("Average Read Time", "0.0ms");
+ ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props);
}
+
+
+
+
+
+ /**
+ * Interceptor Summary tab after querying Hibernate.
+ */
+ public void testJBossCacheInterceptorSummary_AfterQuery() throws IOException, EmbJoprTestException, NamingException {
+ if( isJBossConfigWithoutCache() ) return;
+
+
+ final String BEAN_JNDI = "TestOperationBean/remote";
+
+ // Query the bean.
+ log.info("Looking up "+BEAN_JNDI+"...");
+ InitialContext ctx = new InitialContext();
+ TestOperation bean = (TestOperation) ctx.lookup(BEAN_JNDI);
+
+ log.info("Sending request...");
+ bean.test();
+
+
+
+
+ ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand();
+ ejtt.navTree.getNodeByLabel(SUBNODE_INTERCEPTOR).click();
+
+ // Gen Props - nothing useful.
+ Properties props = new Properties();
+ props.setProperty("Name", "Interceptor");
+ ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValues(props);
+
+
+ /*
+ Numeric Metrics
+ Hit/Miss Ratio 0 Hit/Miss Ratio
+ Read/Write Ratio 0 Read/Write Ratio
+ Number Of Attributes 0 the number of cache attributes
+ Average Write Time 0.0ms the average amount of time per write operation
+ Average Read Time 0.0ms the average amount of time per read operation
+ */
+ props = new Properties();
+ props.setProperty("Hit/Miss Ratio", "0");
+ props.setProperty("Read/Write Ratio", "0");
+ props.setProperty("Number Of Attributes", "0.0ms");
+ props.setProperty("Average Write Time", "0.0ms");
+ props.setProperty("Average Read Time", "0.0ms");
+ ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props);
+
+ }
+
+
+
+
+
+
+
+
+
}// class
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-27 17:13:05 UTC (rev 589)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-27 20:40:38 UTC (rev 590)
@@ -422,6 +422,11 @@
this.elem = nodeTable;
}
+ /** Returns the display name of the node. */
+ public String getName(){
+ return this.elem.getTextContent().trim();
+ }
+
/** Returns true if this node is expanded. */
public boolean isExpanded() throws EmbJoprTestException
{
@@ -1220,6 +1225,9 @@
log.info("Actual property: '"+propName+"': '"+propsActual.getProperty(propName)+"'");
}
+ // List of non-equal properties.
+ List<String> failures = new ArrayList<String>();
+
// Check all the properties.
for( Object key : propsExpected.keySet() ){
String propName = (String)key;
@@ -1233,8 +1241,13 @@
if( !StringUtils.equals( exp, act ) ){
// If this table has a name, use it in the exception message.
String msgFormat = (null == this.getTableName() ? "%2$s: expected '%3$s', actual '%4$s'." : "%s - %s: expected '%s', actual '%s'.");
- throw new EmbJoprTestException( String.format(msgFormat, this.getTableName(), propName, exp, act) );
+ failures.add( String.format(msgFormat, this.getTableName(), propName, exp, act) );
}
+
+ // If some did not match, throw an exception with their list.
+ if( failures.size() != 0 ){
+ throw new EmbJoprTestException( String.format("Non-matching properties: (%d of %d expected):\n", failures.size(), propsExpected.size()) + StringUtils.join(failures, "\n") );
+ }
}
}
@@ -1852,7 +1865,7 @@
public void testOperation( String operationName, String expectedOutput ) throws EmbJoprTestException, IOException {
Properties results = performOperation(operationName);
String output = results.getProperty(EmbJoprTestConstants.OPERATION_OUTPUT_PROPERTY);
- if( ! StringUtils.equals(expectedOutput, output) ){
+ if( expectedOutput != null && ! StringUtils.equals(expectedOutput, output) ){
throw new EmbJoprTestException( String.format("Operation %s: Expected: '%s', actual: '%s'", operationName, expectedOutput, output) );
}
}
Added: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-client.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-java15-B.ear
===================================================================
(Binary files differ)
Added: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek.ear
===================================================================
(Binary files differ)
Property changes on: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsfunit/testdata/jbcache/info.txt
===================================================================
--- trunk/jsfunit/testdata/jbcache/info.txt 2009-07-27 17:13:05 UTC (rev 589)
+++ trunk/jsfunit/testdata/jbcache/info.txt 2009-07-27 20:40:38 UTC (rev 590)
@@ -1,9 +1,13 @@
-JBossCacheTest-by-fdrabek-java15-B.ear :
+JBossCacheTest-by-fdrabek.ear :
- Deploy to all config to activate caches to make them appear in EmbJopr.
- URL: https://svn.devel.redhat.com/repos/jboss-qa/jbcache/JBossCacheTestEar
+JBossCacheTest-by-fdrabek-client.jar :
+- Client interfaces / entities to work with the EAR.
+
JBossCacheTest-service.xml :
- Deploy to the all config.
-- Using descriptor, the cache can have any name. This -service.xml is used to test this feature.
\ No newline at end of file
+- Using descriptor, the cache can have any name. This -service.xml is used to test this feature.
+
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r589 - trunk/jsfunit/testdata/jbcache.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-27 13:13:05 -0400 (Mon, 27 Jul 2009)
New Revision: 589
Added:
trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-java15-B.ear
trunk/jsfunit/testdata/jbcache/info.txt
Modified:
trunk/jsfunit/testdata/jbcache/JBossCacheTest-service.xml
Log:
Test EAR and -service.xml added.
Added: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-java15-B.ear
===================================================================
(Binary files differ)
Property changes on: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek-java15-B.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsfunit/testdata/jbcache/JBossCacheTest-service.xml
===================================================================
--- trunk/jsfunit/testdata/jbcache/JBossCacheTest-service.xml 2009-07-27 17:12:55 UTC (rev 588)
+++ trunk/jsfunit/testdata/jbcache/JBossCacheTest-service.xml 2009-07-27 17:13:05 UTC (rev 589)
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
-<mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
-name="foo:config=test,testName=testValue,Dname=testName,service=ExampleCacheJmxWrapper">
-<attribute name="TransactionManagerLookupClass">
-org.jboss.cache.transaction.JBossTransactionManagerLookup
-</attribute>
-<attribute name="MuxChannelFactory"><inject bean="JChannelFactory"/></attribute>
-<attribute name="MultiplexerStack">udp</attribute>
-<attribute name="ClusterName">Example-EntityCache</attribute>
-<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-<attribute name="CacheMode">REPL_SYNC</attribute>
-<attribute name="InitialStateRetrievalTimeout">15000</attribute>
-<attribute name="SyncReplTimeout">20000</attribute>
-<attribute name="LockAcquisitionTimeout">15000</attribute>
-<attribute name="ExposeManagementStatistics">true</attribute>
-</mbean>
-
+ <mbean code="org.jboss.cache.jmx.CacheJmxWrapper"
+ name="foo:config=test,testName=testValue,Dname=testName,service=ExampleCacheJmxWrapper">
+ <attribute name="TransactionManagerLookupClass">
+ org.jboss.cache.transaction.JBossTransactionManagerLookup
+ </attribute>
+ <attribute name="MuxChannelFactory"><inject bean="JChannelFactory"/></attribute>
+ <attribute name="MultiplexerStack">udp</attribute>
+ <attribute name="ClusterName">Example-EntityCache</attribute>
+ <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+ <attribute name="CacheMode">REPL_SYNC</attribute>
+ <attribute name="InitialStateRetrievalTimeout">15000</attribute>
+ <attribute name="SyncReplTimeout">20000</attribute>
+ <attribute name="LockAcquisitionTimeout">15000</attribute>
+ <attribute name="ExposeManagementStatistics">true</attribute>
+ </mbean>
</server>
Added: trunk/jsfunit/testdata/jbcache/info.txt
===================================================================
--- trunk/jsfunit/testdata/jbcache/info.txt (rev 0)
+++ trunk/jsfunit/testdata/jbcache/info.txt 2009-07-27 17:13:05 UTC (rev 589)
@@ -0,0 +1,9 @@
+
+
+JBossCacheTest-by-fdrabek-java15-B.ear :
+- Deploy to all config to activate caches to make them appear in EmbJopr.
+- URL: https://svn.devel.redhat.com/repos/jboss-qa/jbcache/JBossCacheTestEar
+
+JBossCacheTest-service.xml :
+- Deploy to the all config.
+- Using descriptor, the cache can have any name. This -service.xml is used to test this feature.
\ No newline at end of file
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r588 - in trunk/jbas5/etc/overlay/server/all: deploy and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-07-27 13:12:55 -0400 (Mon, 27 Jul 2009)
New Revision: 588
Added:
trunk/jbas5/etc/overlay/server/all/deploy/
trunk/jbas5/etc/overlay/server/all/deploy/MyLocalTxCF-ds.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyNoTxCF-ds.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyOracleLocalTxDS-ds.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyOracleNoTxDS-ds.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyOracleXADS-ds.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyQueue-service.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyQueueWithSecurityConfig-service.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyTopic-service.xml
trunk/jbas5/etc/overlay/server/all/deploy/MyXATxCF-ds.xml
trunk/jbas5/etc/overlay/server/all/deploy/messaging/
trunk/jbas5/etc/overlay/server/all/deploy/messaging/example-destinations-service.xml
trunk/jbas5/etc/overlay/server/all/deploy/vhosts-test.war
Log:
add the sample apps/services to the 'all' config too
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyLocalTxCF-ds.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyLocalTxCF-ds.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyLocalTxCF-ds.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<connection-factories>
+ <tx-connection-factory>
+ <jndi-name>MyLocalTxCF</jndi-name>
+ <rar-name>jms-ra.rar</rar-name>
+ <use-java-context>true</use-java-context>
+ <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+ <jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <blocking-timeout-millis>30000</blocking-timeout-millis>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <prefill>false</prefill>
+ <background-validation>false</background-validation>
+ <background-validation-millis>0</background-validation-millis>
+ <validate-on-match>true</validate-on-match>
+ <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter
+ </statistics-formatter>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
+ <metadata/>
+ <local-transaction/>
+ <xa-resource-timeout>0</xa-resource-timeout>
+ </tx-connection-factory>
+</connection-factories>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyLocalTxCF-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyNoTxCF-ds.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyNoTxCF-ds.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyNoTxCF-ds.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<connection-factories>
+ <no-tx-connection-factory>
+ <jndi-name>MyNoTxCF</jndi-name>
+ <rar-name>jms-ra.rar</rar-name>
+ <use-java-context>true</use-java-context>
+ <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+ <jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <blocking-timeout-millis>30000</blocking-timeout-millis>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <prefill>false</prefill>
+ <background-validation>false</background-validation>
+ <background-validation-millis>0</background-validation-millis>
+ <validate-on-match>true</validate-on-match>
+ <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter
+ </statistics-formatter>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <interleaving/>
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
+ <metadata/>
+ </no-tx-connection-factory>
+</connection-factories>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyNoTxCF-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyOracleLocalTxDS-ds.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyOracleLocalTxDS-ds.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyOracleLocalTxDS-ds.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>MyOracleLocalTxDS</jndi-name>
+ <rar-name>jboss-local-jdbc.rar</rar-name>
+ <use-java-context>false</use-java-context>
+ <connection-definition>javax.sql.DataSource</connection-definition>
+ <jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>0</max-pool-size>
+ <blocking-timeout-millis>0</blocking-timeout-millis>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <prefill>false</prefill>
+ <background-validation>false</background-validation>
+ <background-validation-millis>0</background-validation-millis>
+ <validate-on-match>false</validate-on-match>
+ <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter
+ </statistics-formatter>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>0</allocation-retry-wait-millis>
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ <type-mapping>oracle.jdbc.driver.OracleDriver</type-mapping>
+ <local-transaction/>
+ <check-valid-connection-sql>SELECT * FROM DUAL</check-valid-connection-sql>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
+ </exception-sorter-class-name>
+ <prepared-statement-cache-size>0</prepared-statement-cache-size>
+ <share-prepared-statements>false</share-prepared-statements>
+ <set-tx-query-timeout>false</set-tx-query-timeout>
+ <query-timeout>0</query-timeout>
+ <use-try-lock>60000</use-try-lock>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <connection-url>jdbc:oracle:oci:@youroracle-tns-name</connection-url>
+ </local-tx-datasource>
+</datasources>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyOracleLocalTxDS-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyOracleNoTxDS-ds.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyOracleNoTxDS-ds.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyOracleNoTxDS-ds.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<datasources>
+ <no-tx-datasource>
+ <jndi-name>MyOracleNoTxDS</jndi-name>
+ <rar-name>jboss-local-jdbc.rar</rar-name>
+ <use-java-context>false</use-java-context>
+ <connection-definition>javax.sql.DataSource</connection-definition>
+ <jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>0</max-pool-size>
+ <blocking-timeout-millis>0</blocking-timeout-millis>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <prefill>false</prefill>
+ <background-validation>false</background-validation>
+ <background-validation-millis>0</background-validation-millis>
+ <validate-on-match>false</validate-on-match>
+ <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter
+ </statistics-formatter>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <interleaving/>
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>0</allocation-retry-wait-millis>
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ <type-mapping>oracle.jdbc.driver.OracleDriver</type-mapping>
+ <check-valid-connection-sql>SELECT * FROM DUAL</check-valid-connection-sql>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
+ </exception-sorter-class-name>
+ <prepared-statement-cache-size>0</prepared-statement-cache-size>
+ <share-prepared-statements>false</share-prepared-statements>
+ <set-tx-query-timeout>false</set-tx-query-timeout>
+ <query-timeout>0</query-timeout>
+ <use-try-lock>60000</use-try-lock>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <connection-url>jdbc:oracle:oci:@youroracle-tns-name</connection-url>
+ </no-tx-datasource>
+</datasources>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyOracleNoTxDS-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyOracleXADS-ds.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyOracleXADS-ds.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyOracleXADS-ds.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<datasources>
+ <xa-datasource>
+ <jndi-name>MyOracleXADS</jndi-name>
+ <rar-name>jboss-xa-jdbc.rar</rar-name>
+ <use-java-context>false</use-java-context>
+ <connection-definition>javax.sql.DataSource</connection-definition>
+ <jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>0</max-pool-size>
+ <blocking-timeout-millis>0</blocking-timeout-millis>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <prefill>false</prefill>
+ <background-validation>false</background-validation>
+ <background-validation-millis>0</background-validation-millis>
+ <validate-on-match>false</validate-on-match>
+ <no-tx-separate-pools/>
+ <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter
+ </statistics-formatter>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>0</allocation-retry-wait-millis>
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
+ </exception-sorter-class-name>
+ <prepared-statement-cache-size>0</prepared-statement-cache-size>
+ <share-prepared-statements>false</share-prepared-statements>
+ <set-tx-query-timeout>false</set-tx-query-timeout>
+ <query-timeout>0</query-timeout>
+ <use-try-lock>60000</use-try-lock>
+ <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+ <xa-resource-timeout>0</xa-resource-timeout>
+ </xa-datasource>
+</datasources>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyOracleXADS-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyQueue-service.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyQueue-service.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyQueue-service.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=MyQueue"
+ 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">MyQueue</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyQueue-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyQueueWithSecurityConfig-service.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyQueueWithSecurityConfig-service.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyQueueWithSecurityConfig-service.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml"
+ name="jboss.messaging.destination:service=Queue,name=MyQueueWithSecurityConfig"
+ 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">MyQueueWithSecurityConfig</attribute>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="consumer" read="true" write="false" create="false"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="administrator" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+
+ </mbean>
+</server>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyQueueWithSecurityConfig-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyTopic-service.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyTopic-service.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyTopic-service.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<server>
+ <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=MyTopic"
+ code="org.jboss.jms.server.destination.TopicService">
+ <annotation>
+ @org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)
+ </annotation>
+ <attribute name="JNDIName">MyTopic</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyTopic-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/MyXATxCF-ds.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/MyXATxCF-ds.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/MyXATxCF-ds.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<connection-factories>
+ <tx-connection-factory>
+ <jndi-name>MyXATxCF</jndi-name>
+ <rar-name>jms-ra.rar</rar-name>
+ <use-java-context>true</use-java-context>
+ <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+ <jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ <blocking-timeout-millis>30000</blocking-timeout-millis>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <prefill>false</prefill>
+ <background-validation>false</background-validation>
+ <background-validation-millis>0</background-validation-millis>
+ <validate-on-match>true</validate-on-match>
+ <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter
+ </statistics-formatter>
+ <isSameRM-override-value>false</isSameRM-override-value>
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
+ <metadata/>
+ <xa-resource-timeout>0</xa-resource-timeout>
+ <xa-transaction/>
+ </tx-connection-factory>
+</connection-factories>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/MyXATxCF-ds.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/messaging/example-destinations-service.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/all/deploy/messaging/example-destinations-service.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/all/deploy/messaging/example-destinations-service.xml 2009-07-27 17:12:55 UTC (rev 588)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Example Messaging Destinations deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!--
+ Example destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=securedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=B"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=C"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=D"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ex"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <!--
+ Example clustered destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+</server>
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/messaging/example-destinations-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/overlay/server/all/deploy/vhosts-test.war
===================================================================
(Binary files differ)
Property changes on: trunk/jbas5/etc/overlay/server/all/deploy/vhosts-test.war
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r587 - trunk/jbas5/etc/overlay/server/default/deploy/messaging.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-07-27 13:11:34 -0400 (Mon, 27 Jul 2009)
New Revision: 587
Added:
trunk/jbas5/etc/overlay/server/default/deploy/messaging/example-destinations-service.xml
Removed:
trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml
Log:
renamed and removed DLQ and expiryQueue, which are already deployed out of box
Deleted: trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml
===================================================================
--- trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml 2009-07-27 17:10:59 UTC (rev 586)
+++ trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml 2009-07-27 17:11:34 UTC (rev 587)
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Destinations deployment descriptor.
-
- $Id$
- -->
-
-<server>
-
- <!--
- The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
- -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=DLQ"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <!--
- The Default Expiry Queue.
- -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <!--
- Example destinations.
- -->
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=testTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=securedTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="publisher" read="true" write="true" create="false"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=testQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="SecurityConfig">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="noacc" read="false" write="false" create="false"/>
- </security>
- </attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=A"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=B"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=C"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=D"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=ex"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <!-- It's possible for indiviual queues and topics to use a specific queue for
-an expiry or DLQ -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
- <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
- <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
- </mbean>
-
- <!-- Queues and Topics can also specify their own redelivery delay -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="RedeliveryDelay">5000</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="RedeliveryDelay">5000</attribute>
- </mbean>
-
- <!--
- Example clustered destinations.
- -->
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="Clustered">true</attribute>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="Clustered">true</attribute>
- </mbean>
-
-</server>
Copied: trunk/jbas5/etc/overlay/server/default/deploy/messaging/example-destinations-service.xml (from rev 585, trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml)
===================================================================
--- trunk/jbas5/etc/overlay/server/default/deploy/messaging/example-destinations-service.xml (rev 0)
+++ trunk/jbas5/etc/overlay/server/default/deploy/messaging/example-destinations-service.xml 2009-07-27 17:11:34 UTC (rev 587)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Example Messaging Destinations deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!--
+ Example destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=securedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=B"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=C"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=D"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ex"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <!--
+ Example clustered destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+</server>
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r586 - trunk/jsfunit/testdata/jbcache.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-27 13:10:59 -0400 (Mon, 27 Jul 2009)
New Revision: 586
Removed:
trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek.ear
Log:
* JBossCacheTest updated
Deleted: trunk/jsfunit/testdata/jbcache/JBossCacheTest-by-fdrabek.ear
===================================================================
(Binary files differ)
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r585 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: util and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-24 15:02:36 -0400 (Fri, 24 Jul 2009)
New Revision: 585
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
* JBossCacheTest updated
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-24 17:02:05 UTC (rev 584)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-07-24 19:02:36 UTC (rev 585)
@@ -829,7 +829,7 @@
* @param value The string to check.
* @returns true if the
*/
- protected boolean looksLikeDouble(String value) {
+ public static boolean looksLikeDouble(String value) {
try{
Double.parseDouble(value);
}catch(NumberFormatException ex){
@@ -845,7 +845,7 @@
* @param expected
* @param actual
*/
- protected String normalizeIfDoubleExpected(String expected, String actual) {
+ public static String normalizeIfDoubleExpected(String expected, String actual) {
//return looksLikeDouble(expected) ? actual.replace(',', '.') : actual;
if( !looksLikeDouble(expected) )
@@ -854,12 +854,35 @@
String converted = actual.replace(',', '.');
return looksLikeDouble(converted) ? converted : actual;
}
+
+
+
+ /** Converts a decimal number in either english or german notation to Java-like double. */
+ public static String normalizeIfNumber( String val ){
+ String val2 = val.replace(",", "");
+ // English notation - 1,322.51
+ if( EmbjoprTestCase.looksLikeDouble(val2) )
+ return val2;
+
+ // Still can be numbe: 1 358,84
+ val2 = val.replace(" ", "");
+ val2 = val.replace(" ", "").replace(',', '.');
+ if( EmbjoprTestCase.looksLikeDouble(val2) )
+ return val2;
+
+ return val;
+ }
+
+
+
+
+
/**
* Transform the given map of Strings to MetaValues into a
* map of Strings to Strings.
*/
- protected Map<String, String> formatPropertiesMap(Map<String, MetaValue> propertiesMap) {
+ protected static Map<String, String> formatPropertiesMap(Map<String, MetaValue> propertiesMap) {
Map<String, String> formattedPropertiesMap = new HashMap<String, String>();
for(String propertyName : propertiesMap.keySet()) {
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-24 17:02:05 UTC (rev 584)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-24 19:02:36 UTC (rev 585)
@@ -7,7 +7,6 @@
import java.net.UnknownHostException;
import java.util.*;
-import java.util.logging.Level;
import javax.management.MalformedObjectNameException;
import javax.naming.NamingException;
import org.jboss.jopr.jsfunit.exceptions.*;
@@ -30,7 +29,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.jboss.jopr.jsfunit.AppConstants;
@@ -1198,6 +1196,9 @@
return props;
}
+ /**
+ * Calls getProperties( key, value ) with default column names (Name and Value).
+ */
public Properties getProperties() throws HtmlElementNotFoundException {
return this.getProperties(EmbJoprTestConstants.COL_PROP_NAME, EmbJoprTestConstants.COL_PROP_VALUE);
}
@@ -1225,6 +1226,10 @@
log.info("Checking '"+propName+"'...");
String exp = propsExpected.getProperty(propName);
String act = propsActual.getProperty(propName);
+
+ exp = EmbjoprTestCase.normalizeIfNumber(exp);
+ act = EmbjoprTestCase.normalizeIfNumber(act);
+
if( !StringUtils.equals( exp, act ) ){
// If this table has a name, use it in the exception message.
String msgFormat = (null == this.getTableName() ? "%2$s: expected '%3$s', actual '%4$s'." : "%s - %s: expected '%s', actual '%s'.");
@@ -1234,6 +1239,7 @@
}
+
}// inner class ContentTable
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r584 - in trunk/core/src/main: webapp/secure and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-07-24 13:02:05 -0400 (Fri, 24 Jul 2009)
New Revision: 584
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java
trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml
Log:
list traits in a single column on Metrics tab (https://jira.jboss.org/jira/browse/EMBJOPR-99)
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-07-24 16:05:54 UTC (rev 583)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-07-24 17:02:05 UTC (rev 584)
@@ -112,7 +112,7 @@
if (traitDataList != null)
{
traitDisplayList = new ArrayList<Map<String, MeasurementDisplay>>();
- String[] columnNames = new String[]{"a", "b", "c"};
+ String[] columnNames = new String[]{"a", "b"};
int columnCount = 0;
Map<String, MeasurementDisplay> currentMap = new HashMap<String, MeasurementDisplay>();
Modified: trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-07-24 16:05:54 UTC (rev 583)
+++ trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-07-24 17:02:05 UTC (rev 584)
@@ -57,18 +57,14 @@
id="metricsTraitsTable"
var="trait"
columnClasses="standard-traitscolumn" width="100%">
- <rich:column rendered="#{trait['a'] ne null}" width="33%">
+ <rich:column rendered="#{trait['a'] ne null}" width="50%">
<b>#{measurementDefinitionMap[trait['a'].measurementData.name].displayName}:</b>
#{trait['a'].measurementValueAndUnits}
</rich:column>
- <rich:column rendered="#{trait['b'] ne null}" width="34%">
+ <rich:column rendered="#{trait['b'] ne null}" width="50%">
<b>#{measurementDefinitionMap[trait['b'].measurementData.name].displayName}:</b>
#{trait['b'].measurementValueAndUnits}
</rich:column>
- <rich:column rendered="#{trait['c'] ne null}" width="33%">
- <b>#{measurementDefinitionMap[trait['c'].measurementData.name].displayName}:</b>
- #{trait['c'].measurementValueAndUnits}
- </rich:column>
</rich:dataTable>
<h:panelGroup layout="block" rendered="#{empty traitDisplayList}">
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r583 - trunk/core/src/main/java/org/jboss/on/embedded/ui.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2009-07-24 12:05:54 -0400 (Fri, 24 Jul 2009)
New Revision: 583
Added:
trunk/core/src/main/java/org/jboss/on/embedded/ui/SessionInfoAction.java
Removed:
trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java
Log:
store the baseUrl Seam variable in SESSION, rather than APPLICATION, scope (fix for https://jira.jboss.org/jira/browse/EMBJOPR-218); rename ApplicationInfoAction to SessionInfoAction to reflect its new scope
Deleted: trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java 2009-07-24 01:29:30 UTC (rev 582)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java 2009-07-24 16:05:54 UTC (rev 583)
@@ -1,54 +0,0 @@
-/*
- * Embedded Jopr Project
- * Copyright (C) 2006-2009 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.
- */
-package org.jboss.on.embedded.ui;
-
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Factory;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
-
-/**
- * @author Ian Springer
- */
-@Name("applicationInfoAction")
-(a)Scope(ScopeType.APPLICATION)
-@Startup
-public class ApplicationInfoAction
-{
- private final Log log = LogFactory.getLog(this.getClass());
-
- @Factory(value = "baseUrl")
- public String getBaseUrl()
- {
- FacesContext context = FacesContext.getCurrentInstance();
- HttpServletRequest request = (HttpServletRequest)context.getExternalContext().getRequest();
- int indexAfterContextRoot = request.getRequestURL().indexOf(request.getServletPath());
- String baseUrl = request.getRequestURL().substring(0, indexAfterContextRoot) + "/";
- log.debug("Base URL: " + baseUrl);
- return baseUrl;
- }
-}
Copied: trunk/core/src/main/java/org/jboss/on/embedded/ui/SessionInfoAction.java (from rev 579, trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java)
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SessionInfoAction.java (rev 0)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SessionInfoAction.java 2009-07-24 16:05:54 UTC (rev 583)
@@ -0,0 +1,58 @@
+/*
+ * Embedded Jopr Project
+ * Copyright (C) 2006-2009 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.
+ */
+package org.jboss.on.embedded.ui;
+
+import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.Startup;
+
+/**
+ * A Seam component for exposing miscellaneous information specific to the current session.
+ *
+ * @author Ian Springer
+ */
+@Name("sessionInfoAction")
+(a)Scope(ScopeType.SESSION)
+@Startup
+public class SessionInfoAction
+{
+ private final Log log = LogFactory.getLog(this.getClass());
+
+ @Factory(value = "baseUrl")
+ public String getBaseUrl()
+ {
+ FacesContext context = FacesContext.getCurrentInstance();
+ HttpServletRequest request = (HttpServletRequest)context.getExternalContext().getRequest();
+ int indexAfterContextRoot = request.getRequestURL().indexOf(request.getServletPath());
+ String baseUrl = request.getRequestURL().substring(0, indexAfterContextRoot) + "/";
+ HttpSession session = request.getSession();
+ log.debug("Base URL for HTTP session with id " + session.getId() + ": " + baseUrl);
+ return baseUrl;
+ }
+}
Property changes on: trunk/core/src/main/java/org/jboss/on/embedded/ui/SessionInfoAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r582 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-23 21:29:30 -0400 (Thu, 23 Jul 2009)
New Revision: 582
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
* JBossCacheTest updated
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-24 01:21:21 UTC (rev 581)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-24 01:29:30 UTC (rev 582)
@@ -1079,7 +1079,7 @@
if( 0 == element.getRowCount() )
return Collections.EMPTY_LIST;
- String xPath = "./tbody/tr[not contains( @class , 'categoryRow')]";
+ String xPath = "./tbody/tr[not( contains( @class , 'categoryRow') )]";
List<HtmlTableRow> trList = (List) element.getByXPath(xPath);
List<ContentTableRow> rows = new ArrayList(trList.size());
for (HtmlTableRow tr : trList) {
14 years, 9 months
- 1
- 0
EMBJOPR SVN: r581 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/jbcache and 2 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-07-23 21:21:21 -0400 (Thu, 23 Jul 2009)
New Revision: 581
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
* JBossCacheTest updated
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-23 21:21:07 UTC (rev 580)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-24 01:21:21 UTC (rev 581)
@@ -49,7 +49,7 @@
EMB_WAR(AppConstants.NAV_EMB_WAR,"Embbedded WAR", "", ".war", null, "application/war"),
// TODO: Create a superclass for non-app resource types - ResourceTypes.
- JBCACHE(AppConstants.NAV_JBCACHE, "Jboss Cache", null, null, null, null), // TODO: Should be JBoss
+ JBCACHE(AppConstants.NAV_JBCACHE, "JBoss Cache", null, null, null, null), // TODO: Should be JBoss
HBN(AppConstants.NAV_HBN, "Hibernate", null, null, null, null);
@@ -141,7 +141,7 @@
public static final String NAV_SBMS = "Service Binding Managers";
public static final String NAV_SBM = "ServiceBindingManager";
public static final String NAV_JBCACHE = "JBoss Cache";
- public static final String NAV_JBCACHES = "Jboss Caches";
+ public static final String NAV_JBCACHES = "JBoss Caches";
public static final String NAV_HBN = "Hibernate";
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-07-23 21:21:07 UTC (rev 580)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-07-24 01:21:21 UTC (rev 581)
@@ -45,6 +45,10 @@
public static final String TAB_NAME_CONTROL = "Control";
public static final String TAB_NAME_CONTENT = "Content";
+
+ // Operations
+ public static final String OPERATION_OUTPUT_PROPERTY = "Output";
+
}// interface
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java 2009-07-23 21:21:07 UTC (rev 580)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java 2009-07-24 01:21:21 UTC (rev 581)
@@ -1,9 +1,12 @@
package org.jboss.jopr.jsfunit.as5.jbcache;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
+import org.jboss.jopr.jsfunit.exceptions.ActionOutOfSyncException;
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.ContentTable;
@@ -15,8 +18,6 @@
* @author Ondrej Zizka
*
* JBoss Cache is only present in 'all' JBoss AS profile.
- *
- * TODO: Implement when JBoss Cache support comes to EmbJopr.
*/
public class JBossCacheTest extends ApplicationTestBaseAS5 {
@@ -27,13 +28,19 @@
private static final String DEFAULT_JBCACHE = "jboss.cache:config=ha-partition,service=Cache";
+
+
private boolean isJBossConfigWithoutCache(){
boolean isJBossConfigWithoutCache = ! ejtt.getJBossConfig().equals("all");
if( isJBossConfigWithoutCache )
- log.warn("JBoss instance is not running the 'all' configuration - has no JBoss Cache. Skipping this test.");
+ log.warn("JBoss instance is not running the 'all' configuration ('"+ejtt.getJBossConfig()+"' instead) - " +
+ "thus, has no JBoss Cache. Set -Dcargo.jboss.configuration=all for maven.");
return isJBossConfigWithoutCache;
}
+
+
+
/**
* Test the navigation to JBoss Cache nodes.
*/
@@ -57,15 +64,16 @@
boolean defaultPresent = false;
// Check that all caches are UP.
for( ContentTableRow row : rows ){
- String name = row.getCellByColumnName(COL_RESOURCE_NAME).getTextContent();
+ String name = row.getCellByColumnName(COL_RESOURCE_NAME).getTextContent().trim();
String status = row.getCellByColumnName(COL_RESOURCE_STATUS).getTextContent().trim();
+ log.info("Cache '"+name+" - status '"+status+"'.");
if( ! "UP".equals( status ) )
fail("Cache '"+name+"' is not UP, but '"+status+"'.");
if( DEFAULT_JBCACHE.equals(name) )
defaultPresent = true;
}
if( !defaultPresent)
- fail("The default cache, '"+DEFAULT_JBCACHE+"', is not present.");
+ throw new EmbJoprTestException("The default cache, '"+DEFAULT_JBCACHE+"', is not present.");
// Click on the first row link.
rows.get(0).getFirstLinkFromColumn(COL_RESOURCE_NAME).click();
@@ -76,6 +84,8 @@
}
+
+
/**
* JBoss Cache Summary tab.
*/
@@ -126,24 +136,24 @@
ejtt.navTree.getNodeByLabel(DEFAULT_JBCACHE).click();
ejtt.tabMenu.clickMetricsTab();
- assertTrue( ejtt.tabMenu.isTabActive(TAB_NAME_METRICS) );
+ assertTrue( "Metrics tab is not active", ejtt.tabMenu.isTabActive(TAB_NAME_METRICS) );
Properties props = new Properties();
- props.setProperty("Node Locking Scheme:", "PESSIMISTIC");
- props.setProperty("Expose Management Statistics?:", "true");
- props.setProperty("Register JMX Resource?:", "true");
- props.setProperty("Multiplexer Stack:", "udp");
- props.setProperty("Cluster Name:", "DefaultPartition-HAPartitionCache");
- props.setProperty("Inactive on Startup?:", "false");
- props.setProperty("Cache Mode:", "REPL_SYNC");
- props.setProperty("Isolation Level:", "REPEATABLE_READ");
- props.setProperty("Replication Version:", "3.1.0");
- props.setProperty("Fetch In-Memory State?:", "true");
- props.setProperty("Use Replication Queue?:", "false");
- props.setProperty("Use Region-Based Marshalling?:", "false");
- props.setProperty("Sync Commit Phase?:", "false");
- props.setProperty("State:", "3");
- props.setProperty("Transaction Manager Lookup Class:", "org.jboss.cache.transaction.BatchModeTransactionManagerLookup");
+ props.setProperty("Node Locking Scheme", "PESSIMISTIC");
+ props.setProperty("Expose Management Statistics?", "true");
+ props.setProperty("Register JMX Resource?", "true");
+ props.setProperty("Multiplexer Stack", "udp");
+ props.setProperty("Cluster Name", "DefaultPartition-HAPartitionCache");
+ props.setProperty("Inactive on Startup?", "false");
+ props.setProperty("Cache Mode", "REPL_SYNC");
+ props.setProperty("Isolation Level", "REPEATABLE_READ");
+ props.setProperty("Replication Version", "3.1.0");
+ props.setProperty("Fetch In-Memory State?", "true");
+ props.setProperty("Use Replication Queue?", "false");
+ props.setProperty("Use Region-Based Marshalling?", "false");
+ props.setProperty("Sync Commit Phase?", "false");
+ props.setProperty("State", "3");
+ props.setProperty("Transaction Manager Lookup Class", "org.jboss.cache.transaction.BatchModeTransactionManagerLookup");
ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props);
@@ -164,15 +174,45 @@
/**
* JBoss Cache Control tab.
+ *
+ * Destroy this cache.
+ * Print lock info as HTML.
+ *
*/
- public void testJBossCacheControl() throws HtmlElementNotFoundException, IOException {
+ public void testJBossCacheControl() throws HtmlElementNotFoundException, IOException, ActionOutOfSyncException, EmbJoprTestException {
if( isJBossConfigWithoutCache() ) return;
ejtt.navTree.getNodeByLabel(DEFAULT_JBCACHE).click();
ejtt.tabMenu.clickControlTab();
- assertTrue( ejtt.tabMenu.isTabActive(TAB_NAME_CONTROL) );
+ assertTrue( "Control tab is not active", ejtt.tabMenu.isTabActive(TAB_NAME_CONTROL) );
+
+ // Click some buttons - should not harm.
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Print cache details as HTML.").click();
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Print lock information.").click();
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Print lock info as HTML.").click();
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Print configuration as plain text.").click();
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Print configuration as HTML.").click();
+
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Stop this cache.").click();
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Start this cache.").click();
+
+
+ // Now test the operations, one by one.
+ Map<String, String> operationsToTest = new HashMap();
+ operationsToTest.put("Print cache details.", "See JOPR-319.");
+
+ for( String opName : operationsToTest.keySet() ){
+ ejtt.operations.testOperation( opName, operationsToTest.get(opName) );
+ }
+
+
+ /*
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Create this cache.").click();
+ ejtt.tabMenu.getTabContentBox().getButtonByLabel("Destroy this cache.").click();
+ */
+
}
}// class
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java 2009-07-23 21:21:07 UTC (rev 580)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/exceptions/EmbJoprTestException.java 2009-07-24 01:21:21 UTC (rev 581)
@@ -46,10 +46,11 @@
if( null == test ) return;
+ String path = "target/"+test.getName() + getDumpSuffix()+".html";
try {
- DebugUtils.writeFile("target/"+test.getName() + "-ElmNotFoundEx.html", test.getClient().getPageAsText());
+ DebugUtils.writeFile(path, test.getClient().getPageAsText());
} catch (Throwable ex) {
- // ...
+ System.out.println("ERROR dumping to "+path);
}
}
@@ -63,5 +64,10 @@
public EmbJoprTestException() {
}
+
+ private String getDumpSuffix() {
+ //return "-ElmNotFoundEx";
+ return "-EmbJoprTestEx";
+ }
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-23 21:21:07 UTC (rev 580)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-07-24 01:21:21 UTC (rev 581)
@@ -797,7 +797,7 @@
}
/**
- * Returns the operation history table from the Content tab.
+ * Returns the operation history table from the Control tab.
*/
public OperationsHistoryTable getOperationsHistoryTable() throws HtmlElementNotFoundException {
@@ -809,13 +809,27 @@
throw new HtmlElementNotFoundException(
"Can't find the ops history table element, searched ID: " + elemID, currentTest);
}
-
return new OperationsHistoryTable( (HtmlTable)elem );
}
+ /**
+ * Returns the operation results table from the Control tab.
+ */
+ public ContentTable getOperationResultsTable() throws HtmlElementNotFoundException {
+ String elemID = "operationResults";
+ HtmlElement elem = (HtmlElement) client.getElement(elemID);
+ if( null == elem ){
+ throw new HtmlElementNotFoundException(
+ "Can't find the op results table element, searched ID: " + elemID, currentTest);
+ }
+ HtmlTable tableElm = elem.getFirstByXPath(".//table[@class='properties-table']");
+ return new ContentTable( (HtmlTable)tableElm );
+ }
+
+
/**
* Finds first button with given label inside this tab box.
*/
@@ -1057,11 +1071,15 @@
return new ContentTableRow(elm, this);
}
+
+ /**
+ * Returns a collection of wrapped rows of this table.
+ */
public List<ContentTableRow> getRows(){
if( 0 == element.getRowCount() )
return Collections.EMPTY_LIST;
- String xPath = "./tbody/tr";
+ String xPath = "./tbody/tr[not contains( @class , 'categoryRow')]";
List<HtmlTableRow> trList = (List) element.getByXPath(xPath);
List<ContentTableRow> rows = new ArrayList(trList.size());
for (HtmlTableRow tr : trList) {
@@ -1164,13 +1182,16 @@
public Properties getProperties( String keyColName, String valueColName ) throws HtmlElementNotFoundException
{
int keyColIndex = this.getColumnIndexByName(keyColName);
- int valColindex = this.getColumnIndexByName(valueColName);
+ int valColIndex = this.getColumnIndexByName(valueColName);
+
+ log.debug("keyColIndex: "+keyColIndex+", valColIndex: "+valColIndex);
Properties props = new Properties();
for( ContentTableRow row : this.getRows() ){
- String key = row.getCell( keyColIndex ).getTextContent();
- String value = row.getCell( valColindex ).getTextContent();
+ log.debug("Row ("+row.getElement().getCells().size()+" cells): "+row.getElement().getTextContent());
+ String key = row.getCell( keyColIndex ).getTextContent().trim();
+ String value = row.getCell( valColIndex ).getTextContent().trim();
props.setProperty(key, value);
}
@@ -1192,9 +1213,16 @@
// Get this tables properties. Different table types can override this.
Properties propsActual = this.getProperties();
+ // List the actual properties.
+ for( Object key : propsActual.keySet() ){
+ String propName = (String)key;
+ log.info("Actual property: '"+propName+"': '"+propsActual.getProperty(propName)+"'");
+ }
+
// Check all the properties.
for( Object key : propsExpected.keySet() ){
String propName = (String)key;
+ log.info("Checking '"+propName+"'...");
String exp = propsExpected.getProperty(propName);
String act = propsActual.getProperty(propName);
if( !StringUtils.equals( exp, act ) ){
@@ -1796,6 +1824,47 @@
}
+
+ /**
+ * Performs the operation, waits until it finishes, and checks whether the result was as expected.
+ * @param name
+ * @param expectedResult
+ */
+ public Properties performOperation( String operationName ) throws EmbJoprTestException, IOException {
+ getEjtt().tabMenu.getTabContentBox().getButtonByLabel(operationName).click();
+ getEjtt().operations.waitActivelyForOperationToFinish(operationName, 500, 5);
+ if( ! getEjtt().tabMenu.getTabContentBox().getOperationsHistoryTable().wasLastOperationSuccesful() ){
+ OperationStatusType status = getEjtt().tabMenu.getTabContentBox().getOperationsHistoryTable().getLastOperationStatus();
+ throw new EmbJoprTestException("Operation was not succesfull: "+operationName+" Status: "+status.getStatusText());
+ }
+ return getEjtt().operations.getLastOperationResults();
+ }
+
+ /**
+ * Performs the operation and checks whether the Output result property matches given expected output.
+ */
+ public void testOperation( String operationName, String expectedOutput ) throws EmbJoprTestException, IOException {
+ Properties results = performOperation(operationName);
+ String output = results.getProperty(EmbJoprTestConstants.OPERATION_OUTPUT_PROPERTY);
+ if( ! StringUtils.equals(expectedOutput, output) ){
+ throw new EmbJoprTestException( String.format("Operation %s: Expected: '%s', actual: '%s'", operationName, expectedOutput, output) );
+ }
+ }
+
+
+ /**
+ * Returns a Properties with the result of last performed operation.
+ * Assumes that we're on the Control tab.
+ */
+ public Properties getLastOperationResults() throws HtmlElementNotFoundException{
+ Properties props = new Properties();
+
+ ContentTable resultsTable = getEjtt().tabMenu.getTabContentBox().getOperationResultsTable();
+ props = resultsTable.getProperties();
+
+ return props;
+ }
+
}// class Operations
14 years, 9 months
- 1
- 0