August 2009 - embjopr-commits - Jboss List Archives

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-08-17 17:47:24 -0400 (Mon, 17 Aug 2009) New Revision: 674 Modified: trunk/jsfunit/pom.xml Log: * POM - added a profile enabling remote jmx Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-08-14 23:36:39 UTC (rev 673) +++ trunk/jsfunit/pom.xml 2009-08-17 21:47:24 UTC (rev 674) @@ -6,6 +6,7 @@ <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version> <jvm.args.debug></jvm.args.debug>  <jvm.args.profiler></jvm.args.profiler>  + <jvm.args.exposejmx></jvm.args.exposejmx>  <cargo.jboss.configuration>default</cargo.jboss.configuration> <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address> @@ -16,7 +17,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -369,7 +370,7 @@    - <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs> + <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>   <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> @@ -586,6 +587,17 @@ </properties> </profile> + +  + <profile> + <id>jmx</id> + <properties> + <jvm.args.exposejmx>-Dcom.sun.management.jmxremote.port=9002 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.awt.headless=true</jvm.args.exposejmx> + </properties> + </profile> + + +  <profile> <id>profile</id>

14 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r673 - in trunk/jbas5/etc/overlay/server: default/conf and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-08-14 19:36:39 -0400 (Fri, 14 Aug 2009) New Revision: 673 Modified: trunk/jbas5/etc/overlay/server/all/conf/jboss-log4j.xml trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml Log: limit EMS logging to WARN level Modified: trunk/jbas5/etc/overlay/server/all/conf/jboss-log4j.xml =================================================================== --- trunk/jbas5/etc/overlay/server/all/conf/jboss-log4j.xml 2009-08-13 16:12:20 UTC (rev 672) +++ trunk/jbas5/etc/overlay/server/all/conf/jboss-log4j.xml 2009-08-14 23:36:39 UTC (rev 673) @@ -348,6 +348,11 @@ <priority value="ERROR"/> </category> +  + <category name="org.mc4j.ems"> + <priority value="WARN"/> + </category> +    Modified: trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml 2009-08-13 16:12:20 UTC (rev 672) +++ trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml 2009-08-14 23:36:39 UTC (rev 673) @@ -348,6 +348,11 @@ <priority value="ERROR"/> </category> +  + <category name="org.mc4j.ems"> + <priority value="WARN"/> + </category> +

14 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r672 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-08-13 12:12:20 -0400 (Thu, 13 Aug 2009) New Revision: 672 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java Log: * EmbjoprTestCase - cleanup code added to tearUp(). Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-08-12 23:31:36 UTC (rev 671) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-08-13 16:12:20 UTC (rev 672) @@ -23,10 +23,10 @@ package org.jboss.jopr.jsfunit; import com.gargoylesoftware.htmlunit.BrowserVersion; +import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.html.*; import java.io.IOException; import java.util.*; -import java.util.logging.Level; import org.jboss.logging.*; import org.apache.cactus.ServletTestCase; import org.jboss.jsfunit.framework.WebClientSpec; @@ -36,7 +36,6 @@ import javax.faces.application.FacesMessage; //import org.jboss.jmx.adaptor.rmi.RMIAdaptor; // Needs dependency: jmx-adaptor-plugin import java.util.regex.Pattern; -import javax.xml.xpath.XPathException; import org.jboss.profileservice.spi.ProfileService; import org.jboss.profileservice.spi.NoSuchDeploymentException; import javax.naming.InitialContext; @@ -70,6 +69,8 @@ protected boolean isJBoss4; + protected WebClient webClient; + protected JSFClientSession client; protected JSFServerSession server; @@ -128,30 +129,31 @@ // Browser branch and version - BrowserVersion browser = BrowserVersion.FIREFOX_3; + BrowserVersion browserVersion = BrowserVersion.FIREFOX_3; String browserProp = System.getProperty("htmlunit.browser"); if( "ff3".equals(browserProp) || "firefox3".equals(browserProp) ){ - browser = BrowserVersion.FIREFOX_3; + browserVersion = BrowserVersion.FIREFOX_3; }else if( "ff2".equals(browserProp) || "firefox2".equals(browserProp) ){ - browser = BrowserVersion.FIREFOX_2; + browserVersion = BrowserVersion.FIREFOX_2; }else if( "ie7".equals(browserProp) || "internetexplorer7".equals(browserProp) ){ - browser = BrowserVersion.INTERNET_EXPLORER_7_0; + browserVersion = BrowserVersion.INTERNET_EXPLORER_7_0; }else if( "ie6".equals(browserProp) || "internetexplorer6".equals(browserProp) ){ - browser = BrowserVersion.INTERNET_EXPLORER_6_0; + browserVersion = BrowserVersion.INTERNET_EXPLORER_6_0; } - log.info("Simulating browser: "+browser.getNickName() + "('htmlunit.browser' sysprop: "+browserProp+")"); + log.info("Simulating browser: "+browserVersion.getNickName() + "('htmlunit.browser' sysprop: "+browserProp+")"); // Initial JSF request - WebClientSpec wcSpec = new WebClientSpec("/", browser); + WebClientSpec wcSpec = new WebClientSpec("/", browserVersion); + // This is temporary because embedded Jopr can't find /js/rhq.js wcSpec.getWebClient().setThrowExceptionOnFailingStatusCode(true); @@ -160,6 +162,8 @@ wcSpec.setInitialRequestStrategy(new JoprLoginStrategy( this.getLoginUser(), this.getLoginPass())); // logs in + this.webClient = wcSpec.getWebClient(); + JSFSession jsfSession = new JSFSession(wcSpec); this.client = jsfSession.getJSFClientSession(); this.server = jsfSession.getJSFServerSession(); @@ -170,6 +174,15 @@ @Override protected void tearDown() throws Exception { + + // Clean up. + this.webClient.closeAllWindows(); + this.webClient.getCache().clear(); + this.webClient.getCookieManager().clearCookies(); + this.webClient = null; + this.client = null; + this.server = null; + // Denounce this test in the JBoss log. log.info("------ END OF TEST "+this.getName()+" - took "+((System.currentTimeMillis() - this.testStartTime)/1000)+" seconds. -------"); }

14 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r671 - trunk/core/src/main/webapp/secure.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-08-12 19:31:36 -0400 (Wed, 12 Aug 2009) New Revision: 671 Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml Log: add a disabled a4j:log tag that can be enabled for debugging AJAX requests on the page Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-08-12 23:30:00 UTC (rev 670) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-08-12 23:31:36 UTC (rev 671) @@ -44,6 +44,7 @@ </ui:define> <ui:define name="body"> + <div class="tabmenubox"> <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> @@ -244,6 +245,8 @@ </rich:panel> + <a4j:log rendered="false" popup="false" level="ALL" style="width: 800px; height: 400px;"/> + </div> </ui:define>

14 years, 9 months

1
0
0 / 0

EMBJOPR SVN: r670 - trunk/core/src/main/java/org/jboss/on/embedded.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-08-12 19:30:00 -0400 (Wed, 12 Aug 2009) New Revision: 670 Modified: trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java Log: implement the resourceDeactivated() method, which was just added to the InventoryEventListener PC interface Modified: trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2009-08-12 03:28:47 UTC (rev 669) +++ trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2009-08-12 23:30:00 UTC (rev 670) @@ -91,6 +91,10 @@ return; } + public void resourceDeactivated(Resource resource) { + return; + } + @Observer(ResourceManager.NAV_TREE_INITIALIZED) public void navTreeInitialized() { Modified: trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-08-12 03:28:47 UTC (rev 669) +++ trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-08-12 23:30:00 UTC (rev 670) @@ -37,6 +37,7 @@ public void resourcesAdded(Set<Resource> resources) { log.trace("The following Resources have been added: " + toString(resources)); + return; } public void resourcesRemoved(Set<Resource> resources) @@ -53,11 +54,19 @@ return; } + public void resourceDeactivated(Resource resource) { + Set resources = new HashSet(); + resources.add(resource); + log.trace("The following Resource has been deactivated: " + toString(resources)); + return; + } + private static String toString(Set<Resource> resources) { StringBuilder stringBuilder = new StringBuilder(); - for (Resource resource : resources) + for (Resource resource : resources) { stringBuilder.append("Resource[").append(resource.getId()).append("]: ").append(resource.getName()).append(", "); + } stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length()); return stringBuilder.toString(); }

14 years, 9 months

1
0
0 / 0

EMBJOPR SVN: r669 - 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-08-11 23:28:47 -0400 (Tue, 11 Aug 2009) New Revision: 669 Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheCacheTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ValuesValidator.java Log: * JBossCache tests added. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheCacheTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheCacheTest.java 2009-08-11 23:49:51 UTC (rev 668) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheCacheTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -14,6 +14,8 @@ import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.ContentTable; import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.ContentTableRow; import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.NavTreeNode; +import org.jboss.jopr.jsfunit.util.SingleProperties; +import org.jboss.jopr.jsfunit.util.ValuesValidator; /** * @@ -186,7 +188,7 @@ 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("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"); @@ -195,7 +197,12 @@ props.setProperty("Transaction Manager Lookup Class", "org.jboss.cache.transaction.BatchModeTransactionManagerLookup"); ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValuesEqual(props); + props = new SingleProperties("Replication Version", "\\d+.\\d+.\\d+"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props, ValuesValidator.MATCHES); + + + // Numeric metrics props = new Properties(); props.setProperty("Replication Queue Max Elements", "1,000"); Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java (rev 0) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -0,0 +1,99 @@ +package org.jboss.jopr.jsfunit.as5.jbcache; + +import java.io.IOException; +import java.util.Properties; +import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; +import org.jboss.jopr.jsfunit.util.SingleProperties; +import org.jboss.jopr.jsfunit.util.ValuesValidator; + +/** + * + * @author Ondrej Zizka + * + * JBoss Cache is only present in 'all' JBoss AS profile. + */ +public class JBossCacheDataContainerTest extends JBossCacheTestBase { + + + + /** + * Interceptor Summary tab. + */ + public void testJBossCacheDataContainerSummary() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + + try { + + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); + ejtt.navTree.getNodeByLabel(SUBNODE_DATA_CONTAINER).click(); + + // Gen Props - nothing useful. + Properties props = new Properties(); + props.setProperty("Name", "Data Container"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValuesEqual(props); + + } + finally { + } + + } + + + + // Operations + private static final String LABEL_NUMBER_OF_NODES = "Get the number of nodes."; + private static final String LABEL_NUMBER_OF_ATTRIBUTES = "Get the number of attributes."; + private static final String LABEL_DETAILS_TEXT = "Print details as plain text."; + private static final String LABEL_DETAILS_HTML = "Print details as HTML."; + + + + /** Helper method - performs an operation, collects the results and checks whether the values are as expected. */ + public void checkOperationResults( String opName, Properties expected, ValuesValidator validator ) throws EmbJoprTestException, IOException + { + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); + ejtt.navTree.getNodeByLabel(SUBNODE_DATA_CONTAINER).click(); + ejtt.getTabMenu().clickControlTab(); + + // Perform the operation, get the values, and check them. + Properties actual = ejtt.operations.performOperation( opName ); + ejtt.checkValues(expected, actual, validator); + } + + + + /** Number of Nodes. */ + public void testJBossCacheDataContainerNumNodes() throws EmbJoprTestException, IOException + { + checkOperationResults(LABEL_NUMBER_OF_NODES, new SingleProperties("Output", "1"), ValuesValidator.EQUAL ); + } + + + /** Number of Attributes. */ + public void testJBossCacheDataContainerNumAttributes() throws EmbJoprTestException, IOException + { + checkOperationResults(LABEL_NUMBER_OF_ATTRIBUTES, new SingleProperties("Output", "0"), ValuesValidator.EQUAL ); + } + + + /** Print details as plain text. Just a check for currently returned value, can change in future. */ + public void testJBossCacheDataContainerDetailsAsText() throws EmbJoprTestException, IOException + { + checkOperationResults(LABEL_DETAILS_TEXT, new SingleProperties("Output", "/ {} /__HA_JNDI__ {}"), ValuesValidator.CONTAINS ); + } + + + /** Print details as HTML. Just a check for currently returned value, can change in future. */ + public void testJBossCacheDataContainerDetailsAsHtml() throws EmbJoprTestException, IOException + { + checkOperationResults(LABEL_DETAILS_HTML, new SingleProperties("Output", "/  {}<br/>  /__HA_JNDI__  {}"), ValuesValidator.CONTAINS ); + } + + + + + + + + +}// class Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java 2009-08-11 23:49:51 UTC (rev 668) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -268,9 +268,10 @@ Properties propsSecond = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).getProperties(); ejtt.tabMenu.clickControlTab(); - ejtt.tabMenu.getTabContentBox().getButtonInputByLabel("Reset Statistics"); + ejtt.tabMenu.clickMetricsTab(); + // Check that these metrics didn't stay at their previous values. ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(propsSecond, ValuesValidator.NOT_EQUAL); Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java (rev 0) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -0,0 +1,90 @@ +package org.jboss.jopr.jsfunit.as5.jbcache; + +import java.io.IOException; +import java.util.Properties; +import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; +import org.jboss.jopr.jsfunit.util.SingleProperties; +import org.jboss.jopr.jsfunit.util.ValuesValidator; + +/** + * + * @author Ondrej Zizka + * + * JBoss Cache is only present in 'all' JBoss AS profile. + */ +public class JBossCacheRegionManagerTest extends JBossCacheTestBase { + + + private static final String LABEL_DUMP_REGIONS = "Dump Regions"; + + + /** Navigates to the node being tested. */ + private void navigateToNode() throws EmbJoprTestException, IOException { + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); + ejtt.navTree.getNodeByLabel(SUBNODE_REGION_MANAGER).click(); + } + + private void dumpRegions() throws EmbJoprTestException, IOException{ + navigateToNode(); + ejtt.getTabMenu().clickControlTab(); + ejtt.operations.performOperation(LABEL_DUMP_REGIONS); + } + + + /** + * Region Manager Summary tab. + */ + public void testJBossCacheRegionManagerSummary() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + + try { + + navigateToNode(); + + // Gen Props - nothing useful. + Properties props = new Properties(); + props.setProperty("Name", "RegionManager"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValuesEqual(props); + + } + finally { + } + + } + + + /** + * + */ + public void testJBossCacheRegionManagerMetrics() throws IOException, EmbJoprTestException { + + navigateToNode(); + ejtt.getTabMenu().clickMetricsTab(); + + + // Metrics. + Properties props = new SingleProperties("Number of Regions", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + + + /** + * + */ + public void testJBossCacheRegionManagerControl() throws IOException, EmbJoprTestException { + + navigateToNode(); + ejtt.getTabMenu().clickControlTab(); + ejtt.operations.performOperation(LABEL_DUMP_REGIONS); + + } + + + + + + + + +}// class Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java (rev 0) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -0,0 +1,105 @@ +package org.jboss.jopr.jsfunit.as5.jbcache; + +import java.io.IOException; +import java.util.Properties; +import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; +import org.jboss.jopr.jsfunit.util.SingleProperties; +import org.jboss.jopr.jsfunit.util.ValuesValidator; + +/** + * + * @author Ondrej Zizka + * + * JBoss Cache is only present in 'all' JBoss AS profile. + */ +public class JBossCacheRpcManagerTest extends JBossCacheTestBase { + + + /** Navigates to the node being tested. */ + private void navigateToNode() throws EmbJoprTestException, IOException { + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); + ejtt.navTree.getNodeByLabel(SUBNODE_RPC_MANAGER).click(); + } + + private void resetStatistics() throws EmbJoprTestException, IOException{ + navigateToNode(); + ejtt.getTabMenu().clickControlTab(); + ejtt.operations.performOperation("Reset Statistics"); + } + + + /** + * RPC Manager Summary tab. + */ + public void testJBossCacheRpcManagerSummary() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + + try { + + resetStatistics(); + navigateToNode(); + + // Gen Props - nothing useful. + Properties props = new Properties(); + props.setProperty("Name", "RPC Manager"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValuesEqual(props); + + // Metrics. + props = new Properties(); + props.setProperty("Failed Replications", "0"); + props.setProperty("Successful Replications", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + finally { + } + + } + + + /** + * + */ + public void testJBossCacheRpcManagerMetrics() throws IOException, EmbJoprTestException { + + navigateToNode(); + ejtt.getTabMenu().clickMetricsTab(); + + /* + Traits + RPC Enabled?: true + Local Address: 127.0.1.1:60357 + Statistics Enabled: false + Success Ratio: N/A + Members: [127.0.1.1:60357] + */ + Properties props = new Properties(); + props.setProperty("RPC Enabled?", "true"); + props.setProperty("Statistics Enabled", "false"); + props.setProperty("Success Ratio", "N/A"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props, ValuesValidator.EQUAL); + + //props = new SingleProperties("Members", "[127.0.\\d+.\\d+:\\d+]"); + //ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props, ValuesValidator.MATCHES); + props = new Properties(); + props.setProperty("Members", "[127.0."); + props.setProperty("Local Address", "127.0."); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props, ValuesValidator.CONTAINS); + + + // Metrics. + props = new Properties(); + props.setProperty("Failed Replications", "0"); + props.setProperty("Successful Replications", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + + + + + + + + +}// class Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-08-11 23:49:51 UTC (rev 668) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-08-12 03:28:47 UTC (rev 669) @@ -31,6 +31,7 @@ protected static final String SUBNODE_RPC_MANAGER = "RPC Manager"; protected static final String SUBNODE_REGION_MANAGER = "RegionManager"; protected static final String SUBNODE_TRANSACTION_TABLE = "Transaction Table"; + protected static final String SUBNODE_TX_INTERCEPTOR = "Tx Interceptor"; Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java (rev 0) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -0,0 +1,98 @@ +package org.jboss.jopr.jsfunit.as5.jbcache; + +import java.io.IOException; +import java.util.Properties; +import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; +import org.jboss.jopr.jsfunit.util.SingleProperties; +import org.jboss.jopr.jsfunit.util.ValuesValidator; + +/** + * + * @author Ondrej Zizka + * + * JBoss Cache is only present in 'all' JBoss AS profile. + */ +public class JBossCacheTransactionTableTest extends JBossCacheTestBase { + + + private static final String LABEL_RESET_STATISTICS = "Reset Statistics"; + + + /** Navigates to the node being tested. */ + private void navigateToNode() throws EmbJoprTestException, IOException { + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); + ejtt.navTree.getNodeByLabel(SUBNODE_TRANSACTION_TABLE).click(); + } + + private void resetStatistics() throws EmbJoprTestException, IOException{ + navigateToNode(); + ejtt.getTabMenu().clickControlTab(); + ejtt.operations.performOperation(LABEL_RESET_STATISTICS); + } + + + /** + * Transaction Table Summary tab. + */ + public void testJBossCacheTransactionTableSummary() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + + try { + + navigateToNode(); + + // Gen Props - nothing useful. + Properties props = new Properties(); + props.setProperty("Name", "Transaction Table"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValuesEqual(props); + + // Metrics. + props = new SingleProperties("Number Of Registered Transactions", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + finally { + } + + } + + + /** + * + */ + public void testJBossCacheTransactionTableMetrics() throws IOException, EmbJoprTestException { + + navigateToNode(); + ejtt.getTabMenu().clickMetricsTab(); + + + // Traits + Properties props = new SingleProperties("Transaction Map", "{}"); // null + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props, ValuesValidator.EQUAL); + + // Metrics. + props = new SingleProperties("Number Of Registered Transactions", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + + + /** + * + */ + public void testJBossCacheTransactionTableControl() throws IOException, EmbJoprTestException { + + navigateToNode(); + ejtt.getTabMenu().clickControlTab(); + ejtt.operations.performOperation(LABEL_RESET_STATISTICS); + + } + + + + + + + + +}// class Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java (rev 0) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java 2009-08-12 03:28:47 UTC (rev 669) @@ -0,0 +1,96 @@ +package org.jboss.jopr.jsfunit.as5.jbcache; + +import java.io.IOException; +import java.util.Properties; +import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; +import org.jboss.jopr.jsfunit.util.SingleProperties; +import org.jboss.jopr.jsfunit.util.ValuesValidator; + +/** + * + * @author Ondrej Zizka + * + * JBoss Cache is only present in 'all' JBoss AS profile. + */ +public class JBossCacheTxInterceptorTest extends JBossCacheTestBase { + + + private static final String LABEL_REFRESH = "Refresh"; + + + /** Navigates to the node being tested. */ + private void navigateToNode() throws EmbJoprTestException, IOException { + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); + ejtt.navTree.getNodeByLabel(SUBNODE_TX_INTERCEPTOR).click(); + } + + private void refreshMetrics() throws EmbJoprTestException, IOException{ + navigateToNode(); + ejtt.getTabMenu().clickMetricsTab(); + ejtt.getTabMenu().getTabContentBox().getButtonByLabel(LABEL_REFRESH).click(); + } + + + /** + * TxInterceptor Summary tab. + */ + public void testJBossCacheTxInterceptorSummary() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + + try { + + navigateToNode(); + + // Gen Props - nothing useful. + Properties props = new Properties(); + props.setProperty("Name", "Tx Interceptor"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_GENERAL_PROPERTIES).checkValuesEqual(props); + + // Metrics. + props = new Properties(); + props.setProperty("Commits", "0"); + props.setProperty("Rollbacks", "0"); + props.setProperty("Prepares", "0"); + props.setProperty("Number Of Syncs Registered", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + finally { + } + + } + + + /** + * + */ + public void testJBossCacheTxInterceptorMetrics() throws IOException, EmbJoprTestException { + + navigateToNode(); + ejtt.getTabMenu().clickMetricsTab(); + + + // Traits + Properties props = new SingleProperties("Statistics Enabled?", "true"); + ejtt.getTabMenu().getTabContentBox().getTableUnformatted(LABEL_TRAITS).checkValues(props, ValuesValidator.EQUAL); + + // Metrics. + props = new Properties(); + props.setProperty("Commits", "0"); + props.setProperty("Rollbacks", "0"); + props.setProperty("Prepares", "0"); + props.setProperty("Number Of Syncs Registered", "0"); + ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props, ValuesValidator.EQUAL); + + } + + + + + + + + + + +}// 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-08-11 23:49:51 UTC (rev 668) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-08-12 03:28:47 UTC (rev 669) @@ -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,11 +29,6 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.collections.Closure; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Transformer; -import org.apache.commons.collections.functors.ClosureTransformer; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.jboss.jopr.jsfunit.AppConstants; @@ -1361,7 +1355,22 @@ for( ContentTableRow row : this.getRows() ){ 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(); + + // Get the cell. + HtmlTableCell cell = row.getCell(valColIndex); + String value; + // If it contains one input, get the value of the input. + List<HtmlTextInput> inputs = (List<HtmlTextInput>) cell.getByXPath("./input[@type='text']"); + + log.debug("Value cell has "+inputs.size()+" <input> elements."); + if( inputs.size() == 1 ){ + value = ((HtmlTextInput)inputs.get(0)).asText(); //getValueAttribute(); + } + // Otherwise, get the text content of the cell. + else{ + value = cell.getTextContent().trim(); + } + props.setProperty(key, value); } @@ -1427,6 +1436,9 @@ // Get this tables properties. Different table types can override this. Properties propsActual = this.getProperties(); + selfEjtt.checkValues(propsExpected, propsActual, validator, this.getTableName() ); + + /* // List the actual properties. for( Object key : propsActual.keySet() ){ String propName = (String)key; @@ -1458,6 +1470,7 @@ throw new EmbJoprTestException( String.format("Non-matching properties: (%d of %d expected):\n", failures.size(), propsExpected.size()) + StringUtils.join(failures, "\n") ); } } + */ } @@ -2124,8 +2137,14 @@ */ public Properties getLastOperationResults() throws HtmlElementNotFoundException{ Properties props = new Properties(); + + TabContentBox tabContentBox = getEjtt().tabMenu.getTabContentBox(); + + // Operation has no result (table not displayed). + if( tabContentBox.getElement().getTextContent().contains("The operation did not return any results.")) + return props; - ContentTable resultsTable = getEjtt().tabMenu.getTabContentBox().getOperationResultsTable(); + ContentTable resultsTable = tabContentBox.getOperationResultsTable(); props = resultsTable.getProperties(); return props; @@ -2609,5 +2628,49 @@ + public final void checkValues( Properties propsExpected, Properties propsActual, ValuesValidator validator ) throws EmbJoprTestException + { + checkValues(propsExpected, propsActual, validator, null); + } + public final void checkValues( Properties propsExpected, Properties propsActual, ValuesValidator validator, String name ) throws EmbJoprTestException + { + + // List the actual properties. + for( Object key : propsActual.keySet() ){ + String propName = (String)key; + 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; + log.info("Checking '"+propName+"'..."); + String exp = propsExpected.getProperty(propName); + String act = propsActual.getProperty(propName); + + exp = EmbjoprTestCase.normalizeIfNumber(exp); + act = EmbjoprTestCase.normalizeIfNumber(act); + + String validationError = validator.validate( exp, act ); + if( null != validationError ){ + failures.add( propName+": " + validationError ); + } + + // If some did not match, throw an exception with their list. + if( failures.size() != 0 ){ + String realm = StringUtils.isBlank(name) ? "" : name+": "; + String exceptionMsg = String.format("%sNon-matching properties: (%d of %d expected):\n", + realm, failures.size(), propsExpected.size()) + StringUtils.join(failures, "\n"); + throw new EmbJoprTestException( exceptionMsg, currentTest ); + } + } + + } + + + }// class EmbJoprTestToolkit Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ValuesValidator.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ValuesValidator.java 2009-08-11 23:49:51 UTC (rev 668) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/ValuesValidator.java 2009-08-12 03:28:47 UTC (rev 669) @@ -34,5 +34,24 @@ } }; + + public static final ValuesValidator CONTAINS = new ValuesValidator() { + public String validate( String exp, String act ){ + if( ! StringUtils.contains( act, exp ) ){ + return String.format( "String does not contain '%s': %s", exp, act ); + } + return null; + } + }; + + public static final ValuesValidator MATCHES = new ValuesValidator() { + public String validate( String exp, String act ){ + if( ! act.matches(exp) ){ + return String.format( "String does not match '%s': %s", exp, act ); + } + return null; + } + }; + }

14 years, 9 months

1
0
0 / 0

EMBJOPR SVN: r668 - in trunk/core/src/main/webapp: css and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-08-11 19:49:51 -0400 (Tue, 11 Aug 2009) New Revision: 668 Modified: trunk/core/src/main/webapp/css/console-style.css trunk/core/src/main/webapp/login.xhtml Log: fix the CSS for the welcome message on the login page and fix the color of the product name header Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-08-11 23:29:31 UTC (rev 667) +++ trunk/core/src/main/webapp/css/console-style.css 2009-08-11 23:49:51 UTC (rev 668) @@ -106,8 +106,11 @@ /* ------- Common Elements ---------- */ -p { - margin: 0px; +p + p { + /* Only set a top margin on paragraphs that follow other paragraphs + (i.e. it will not set the margin of the first paragraph on the page, + or the first paragraph in a section). */ + margin-top: 0.5em; } a { @@ -164,6 +167,7 @@ .headerText { font-size: 24px; font-weight: normal; + color: #DDD; } .tabmenubox { Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2009-08-11 23:29:31 UTC (rev 667) +++ trunk/core/src/main/webapp/login.xhtml 2009-08-11 23:49:51 UTC (rev 668) @@ -61,18 +61,21 @@ <h:messages layout="table" styleClass="loginerror-msg"/> <h:form id="login_form"> <div> - <h2>#{messages['login.welcome.paragraph1']} #{messages['product.name']}#{messages['login.welcome.paragraph2']}</h2> - - <h2>#{messages['login.loginToProceed']}</h2> - - <p/> - <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> - <h:inputText id="name" value="#{identity.username}" size="20"/></div> - <div style="padding-top: 10px;"><h:outputLabel for="password" value="#{messages['security.password']}"/><br/> - <h:inputSecret id="password" value="#{identity.password}" size="20"/></div> - <div style="padding-top: 10px;"><h:commandButton value="#{messages['security.login']}" id="submit" - action="#{identity.login()}" styleClass="buttonmed"/> + <p>#{messages['login.welcome.paragraph1']} #{messages['product.name']}#{messages['login.welcome.paragraph2']}</p> + <p>#{messages['login.loginToProceed']}</p> + <p> + <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> + <h:inputText id="name" value="#{identity.username}" size="20"/> + </p> </div> + <div style="padding-top: 10px;"> + <h:outputLabel for="password" value="#{messages['security.password']}"/><br/> + <h:inputSecret id="password" value="#{identity.password}" size="20"/> + </div> + <div style="padding-top: 10px;"> + <h:commandButton value="#{messages['security.login']}" id="submit" + action="#{identity.login()}" styleClass="buttonmed"/> + </div> </h:form> </div> <div style="margin-top:130px;">

14 years, 9 months

1
0
0 / 0

EMBJOPR SVN: r667 - in trunk/core: src/main and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-08-11 19:29:31 -0400 (Tue, 11 Aug 2009) New Revision: 667 Added: trunk/core/src/main/resources/ trunk/core/src/main/resources/seam.properties Removed: trunk/core/src/main/webapp/WEB-INF/classes/seam.properties Modified: trunk/core/pom.xml Log: bundle the core EmbJopr classes inside a jar in WEB-INF/lib/, rather than placing them in WEB-INF/classes/ (https://jira.jboss.org/jira/browse/EMBJOPR-229); also generate an "attachment" artifact for this jar in case we want to publish it to the Maven repo Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-08-11 20:25:03 UTC (rev 666) +++ trunk/core/pom.xml 2009-08-11 23:29:31 UTC (rev 667) @@ -282,6 +282,8 @@ </directory> </resource> </webResources> + <archiveClasses>true</archiveClasses> + <attachClasses>true</attachClasses> <archive> <manifest> <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> Copied: trunk/core/src/main/resources/seam.properties (from rev 663, trunk/core/src/main/webapp/WEB-INF/classes/seam.properties) =================================================================== --- trunk/core/src/main/resources/seam.properties (rev 0) +++ trunk/core/src/main/resources/seam.properties 2009-08-11 23:29:31 UTC (rev 667) @@ -0,0 +1,22 @@ +# +# 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. +# +# NOTE: The presence of this file tells Seam to scan this JAR for Seam +# components (i.e. classes with Name annotations) and to deploy +# any that it finds. Deleted: trunk/core/src/main/webapp/WEB-INF/classes/seam.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/seam.properties 2009-08-11 20:25:03 UTC (rev 666) +++ trunk/core/src/main/webapp/WEB-INF/classes/seam.properties 2009-08-11 23:29:31 UTC (rev 667) @@ -1,22 +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. -# -# NOTE: The presence of this file tells Seam to scan this JAR for Seam -# components (i.e. classes with Name annotations) and to deploy -# any that it finds.

14 years, 9 months

1
0
0 / 0

EMBJOPR SVN: r666 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-08-11 16:25:03 -0400 (Tue, 11 Aug 2009) New Revision: 666 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java Log: * All EarTests enabled again. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-08-11 20:02:06 UTC (rev 665) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-08-11 20:25:03 UTC (rev 666) @@ -154,7 +154,7 @@ verify the archive has been deployed successfully. */ - public void XtestEarMalformedDescriptorDeployment() throws IOException, EmbJoprTestException { + public void testEarMalformedDescriptorDeployment() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_MALFORMED_APP_FILENAME; @@ -187,7 +187,7 @@ * * Was failing because of EMBJOPR-226. */ - public void XtestEarDeployFineThenRedeployMalformedDescriptor() throws IOException, EmbJoprTestException { + public void testEarDeployFineThenRedeployMalformedDescriptor() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_NOT_MALFORMED_APP_FILENAME; final String DEPLOYABLE_2_NAME = EAR_MALFORMED_APP_FILENAME_2; @@ -258,7 +258,7 @@ * PASSED. */ - public void XtestEarNavigation() throws IOException, EmbJoprTestException, InterruptedException + public void testEarNavigation() throws IOException, EmbJoprTestException, InterruptedException { // JBossAS Servers node @@ -335,7 +335,7 @@ /** * Deploys an EAR and clicks a bit through the UI. */ - public void XtestEarDeploymentNavigation() throws IOException, EmbJoprTestException { + public void testEarDeploymentNavigation() throws IOException, EmbJoprTestException { // Concrete appliction node. { @@ -397,7 +397,7 @@ * junit.framework.ComparisonFailure: expected:<eardeployment.ear> but was:<ondra-redhat> at org.jboss.jopr.jsfunit.as5.EarTest.testEarSummaryTab(EarTest.java:323) */ - public void XtestEarSummaryTab() throws EmbJoprTestException, IOException, Exception { + public void testEarSummaryTab() throws EmbJoprTestException, IOException, Exception { final String DEPLOYABLE_NAME = BASIC_EAR; @@ -581,7 +581,7 @@ * Fails because of EMBJOPR-42 - javax.el.ELException: org.jboss.seam.RequiredException: * @Out attribute requires non-null value: updateBackingContentAction.packageDetails */ - public void XtestEarRedeployment() throws IOException, EmbJoprTestException { + public void testEarRedeployment() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = BASIC_EAR; @@ -659,7 +659,7 @@ /** * Checks EAR metrics tab. */ - public void XtestEarMetricsTab() throws IOException, EmbJoprTestException { + public void testEarMetricsTab() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = BASIC_EAR; @@ -706,7 +706,7 @@ * * FAILS because some of the values are read-only. EMBJOPR-96 */ - public void XtestEarMetricsTabRefreshButton() throws IOException, EmbJoprTestException { + public void testEarMetricsTabRefreshButton() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = BASIC_EAR; @@ -751,7 +751,7 @@ * PASSED. * Now fails, because EAR does not appear. */ - public void XtestEarDeployUnpacked() throws IOException, EmbJoprTestException { + public void testEarDeployUnpacked() throws IOException, EmbJoprTestException { // Deploy the unpacked EAR. @@ -792,7 +792,7 @@ /** * Deploys an EAR with WAR as a module, and checks whether the web app runs. */ - public void XtestEarWithWar() throws IOException, EmbJoprTestException { + public void testEarWithWar() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_WITH_WAR; @@ -851,7 +851,7 @@ * Was failing because of EMBJOPR-133. * Now FAILS because of EMBJOPR-172. */ - public void XtestEarStopAndStart() throws IOException, EmbJoprTestException + public void testEarStopAndStart() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_WITH_WAR_COUNTER; @@ -947,7 +947,7 @@ * * FAILS because of EMBJOPR-133. */ - public void XtestEarRestart() throws IOException, EmbJoprTestException + public void testEarRestart() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_WITH_WAR_COUNTER; @@ -1032,7 +1032,7 @@ * FAILS because of EMBJOPR-137 - EAR with unsatisfied dependencies * show error upon deploy, but then shows as UP. */ - public void XtestEarWithUnsatisfiedDeps() throws IOException, EmbJoprTestException + public void testEarWithUnsatisfiedDeps() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_EXT_DEPENDENCIES; @@ -1068,7 +1068,7 @@ - public void XtestEarRedeployDifferentName() throws IOException, EmbJoprTestException + public void testEarRedeployDifferentName() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_WITH_WAR_COUNTER; @@ -1135,7 +1135,7 @@ /** * Deploys an EAR, then re-deploys (Content tab) EAR with the same name, but different content. */ - public void XtestEarRedeployDifferentVersion() throws IOException, EmbJoprTestException + public void testEarRedeployDifferentVersion() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_WITH_WAR_COUNTER; @@ -1202,7 +1202,7 @@ * deployed. Undeploy the archive for test clean up purposes. * */ - public void XtestEarRarInEarDeployment() throws IOException, EmbJoprTestException + public void testEarRarInEarDeployment() throws IOException, EmbJoprTestException { final String DEPLOYABLE_NAME = EAR_WITH_RAR;

14 years, 9 months

1
0
0 / 0

EMBJOPR SVN: r665 - in trunk/core/src/main/webapp: secure and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-08-11 16:02:06 -0400 (Tue, 11 Aug 2009) New Revision: 665 Modified: trunk/core/src/main/webapp/css/console-style.css trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml Log: fix font size for general props and traits on the Summary tab (https://jira.jboss.org/jira/browse/EMBJOPR-233); update CSS classes for h1, h2, etc. Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-08-11 17:37:33 UTC (rev 664) +++ trunk/core/src/main/webapp/css/console-style.css 2009-08-11 20:02:06 UTC (rev 665) @@ -28,9 +28,7 @@ margin: 0; padding: 0; font-family: "Lucida Grand", Verdana, Arial, Helvetica, sans-serif; - font-size: .8em; color: #454545; - } /* ----------- MAIN LAYOUT COMPONENTS ------------ */ @@ -82,7 +80,7 @@ overflow: auto; background: #eff2f4; border-right: 1px solid #dee6ee; - + font-size: 0.75em; } #footer { @@ -129,30 +127,36 @@ } h1 { - font-size: 14px; + font-size: 1.25em; font-weight: bold; color: #50667c; } h2 { - font-size: 12px; + font-size: 1.2em; font-weight: bold; color: #32444d; /* border-bottom: 1px solid #e6eaef; */ } h3 { - font-size: 11px; + font-size: 1.15em; font-weight: bold; color: #32444d; /* border-bottom: 1px solid #e6eaef; */ } h4 { + font-size: 1.1em; + font-weight: bold; } h5 { + font-size: 1.05em; + font-weight: bold; } h6 { + font-size: 1em; + font-weight: bold; } /* -------------------- this is the content container ----------------------------- */ Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-08-11 17:37:33 UTC (rev 664) +++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-08-11 20:02:06 UTC (rev 665) @@ -45,37 +45,41 @@ <ui:include src="/WEB-INF/facelets/displayGlobalMessages.xhtml"/> <h2>#{messages['summary.resourceInstance.configuration']}</h2> - <table border="0"> - <tr> - <td><span - style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.name']}</strong></span>#{resource.resource.name} - </td> - </tr> - <tr> - <td><span - style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.version']}</strong></span><h:outputText - rendered="#{not empty resource.resource.version}">#{resource.resource.version}</h:outputText> - <h:outputText rendered="#{empty resource.resource.version}">--</h:outputText></td> - </tr> - <tr> - <td><span - style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.description']}</strong></span><h:outputText - rendered="#{not empty resource.resource.description}">#{resource.resource.description}</h:outputText> - <h:outputText rendered="#{empty resource.resource.description}">--</h:outputText></td> - </tr> - </table> + <h:panelGrid border="0" columns="1" columnClasses="dr-table-cell rich-table-cell standard-traitscolumn"> + <h:panelGroup layout="block"> + <span style="padding-right:3px;"> + <strong>#{messages['summary.resourceInstance.configuration.name']}</strong> + </span> + #{resource.resource.name} + </h:panelGroup> + <h:panelGroup layout="block"> + <span style="padding-right:3px;"> + <strong>#{messages['summary.resourceInstance.configuration.version']}</strong> + </span> + <h:outputText rendered="#{not empty resource.resource.version}">#{resource.resource.version}</h:outputText> + <h:outputText rendered="#{empty resource.resource.version}">--</h:outputText> + </h:panelGroup> + <h:panelGroup layout="block"> + <span style="padding-right:3px;"> + <strong>#{messages['summary.resourceInstance.configuration.description']}</strong> + </span> + <h:outputText rendered="#{not empty resource.resource.description}">#{resource.resource.description}</h:outputText> + <h:outputText rendered="#{empty resource.resource.description}">--</h:outputText> + </h:panelGroup> + </h:panelGrid> + <h:panelGroup rendered="#{not empty summaryTraitDisplayList}"> <h2>#{messages['summary.resourceInstance.traits']}</h2> - <h:dataTable value="#{summaryTraitDisplayList}" - var="trait" - columnClasses="standard-traitscolumn"> - <h:column> + <rich:dataTable value="#{summaryTraitDisplayList}" + var="trait" + columnClasses="standard-traitscolumn"> + <rich:column> <strong>#{ summaryMeasurementDefinitionMap[trait.measurementData.name].displayName}:</strong> #{trait.measurementValueAndUnits} - </h:column> - </h:dataTable> + </rich:column> + </rich:dataTable> </h:panelGroup> <h:panelGroup rendered="#{not empty summaryMeasurementDisplayList}">

14 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits August 2009