October 2009 - embjopr-commits - Jboss List Archives

EMBJOPR SVN: r827 - in branches/EmbJopr_1_3_3_MyFaces/jsfunit: src/test/java/org/jboss/jopr/jsfunit and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2009-10-29 23:21:35 -0400 (Thu, 29 Oct 2009) New Revision: 827 Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java Log: test changes needed with this branch Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml 2009-10-30 03:21:35 UTC (rev 827) @@ -7,7 +7,10 @@ <jvm.args.debug></jvm.args.debug>  <jvm.args.profiler></jvm.args.profiler>  <jvm.args.exposejmx></jvm.args.exposejmx>  + <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump-sun -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common> + <jvm.args.vendor-specific></jvm.args.vendor-specific> + <cargo.jboss.configuration>default</cargo.jboss.configuration> <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address> <htmlunit.browser>ff3</htmlunit.browser> @@ -392,7 +395,7 @@ <containerId>jboss5x</containerId> <home>${JBOSS_HOME}</home>  <log>${basedir}/target/jboss5.x.logs/cargo.log</log> - <timeout>300000</timeout>  + <timeout>420000</timeout>  <systemProperties>  <jboss.server.log.threshold>ALL</jboss.server.log.threshold> @@ -407,6 +410,7 @@ <jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir> <htmlunit.browser>${htmlunit.browser}</htmlunit.browser> <jsfunit.jboss.isSecured>${jboss.isSecured}</jsfunit.jboss.isSecured> + <jboss.platform.mbeanserver>true</jboss.platform.mbeanserver>  </systemProperties> </container> @@ -687,7 +691,15 @@ </build> </profile>  +  + <profile> + <id>bind-all</id> + <properties> + <cargo.jboss.bind.address>0.0.0.0</cargo.jboss.bind.address> + </properties> + </profile> + <!-- Hudson profile (commented out - hesitating to hard-code version dir to pom.xml) <profile> <id>running-in-hudson</id> Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-10-30 03:21:35 UTC (rev 827) @@ -54,7 +54,7 @@ static{ - EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule"; + EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule,*"; EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1$s,jar=%1$s,service=EJB3"; } @@ -128,14 +128,14 @@ //public static final String NAV_EJB = "EJB Application (EJB JAR)s"; public static final String NAV_EJB2 = "EJB2 JARs"; public static final String NAV_EJB3 = "EJB3 JARs"; - public static final String NAV_EAR = "EARs"; + public static final String NAV_EAR = "Enterprise Application (EAR)s"; public static final String NAV_SAR = "SARs"; public static final String NAV_MC = "MC Beans"; public static final String NAV_PAR = "PARs"; - public static final String NAV_RAR = "RARs"; - public static final String NAV_WAR = "WARs"; - public static final String NAV_EMB_WAR = "Embedded WARs"; - public static final String NAV_EMB_RAR = "Embedded RARs"; + public static final String NAV_RAR = "Resource Adapter Archive (RAR)s"; + public static final String NAV_WAR = "Web Application (WAR)s"; + public static final String NAV_EMB_WAR = "Embedded Web Application (WAR)s"; + public static final String NAV_EMB_RAR = "Embedded Resource Adapter Archive (RAR)s"; // Non-app resource types. public static final String NAV_SBM = "Service Binding Manager"; Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-10-30 03:21:35 UTC (rev 827) @@ -20,10 +20,10 @@ public static String SYSPROP_CARGO_JBOSS_HOME_DIR = "jsfunit.jboss.home.dir"; - //public static final String AS_NODE_NAME_FORMAT = "JBoss AS 5 (%s)"; - public static final String AS_NODE_NAME_FORMAT = "JBoss EAP 5 (%s)"; - //public static final String AS_NODE_DESCRIPTION = "JBoss Application Server"; - public static final String AS_NODE_DESCRIPTION = "JBoss Enterprise Application Platform (EAP)"; + public static final String AS_NODE_NAME_FORMAT = "JBoss AS 5 (%s)"; + //public static final String AS_NODE_NAME_FORMAT = "JBoss EAP 5 (%s)"; + public static final String AS_NODE_DESCRIPTION = "JBoss Application Server"; + //public static final String AS_NODE_DESCRIPTION = "JBoss Enterprise Application Platform (EAP)"; public static final String LABEL_AS_SERVERS_SUMMARY = "JBoss Application Server"; Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-30 03:21:35 UTC (rev 827) @@ -1082,6 +1082,8 @@ * @param secured If true, JAAS secured ManagementView is used. */ protected boolean isDeployed(String deployment, boolean secured) throws Exception { + deployment = deployment.replace("/", System.getProperty("file.separator")); + ManagementView currentProfileView = getCurrentProfileView(secured); ManagedDeployment managedDeployment = null; Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -103,7 +103,7 @@ // Click the nav tree. - String linkLabel = "WARs"; + String linkLabel = "Web Application (WAR)s"; //HtmlAnchor warLink = getNavTreeLink(linkLabel); HtmlAnchor warLink = ejtt.navTree.getNodeLink(linkLabel); warLink.click(); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -489,6 +489,7 @@ String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME; + path = path.replace("/", System.getProperty("file.separator")); assertEquals(path, props.getProperty("Path").trim()); assertEquals("no", props.getProperty("Exploded?").trim()); @@ -843,6 +844,7 @@ log.debug("Traits: "+ props.toString()); String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME; + path = path.replace("/", System.getProperty("file.separator")); assertEquals(path, props.getProperty("Path").trim()); @@ -921,6 +923,7 @@ */ public void testDeployUnpackedWar() throws IOException, EmbJoprTestException { + final String DEPLOYABLE_NAME = WAR_UNPACKED; // Deploy the unpacked WAR. // We have to use hotdeploy - can't upload a directory. @@ -946,8 +949,12 @@ ejtt.getNavTree().getNodeByLabel(NAV_WAR).click(); - ContentTableRow row = ejtt.getDefaultContentTable().getFirstRowContainingLink(WAR_UNPACKED); + //ContentTableRow row = ejtt.getDefaultContentTable().getFirstRowContainingLink(WAR_UNPACKED); + if( ! ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, WAR_UNPACKED) ) + throw new EmbJoprTestException("Unpacked hotdeployed war not found: "+WAR_UNPACKED, this); + + // TODO: Finish // TODO: Check whether Exploded?: yes. EMBJOPR-95 Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -51,6 +51,9 @@ /** 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 { + // For all calling test. + if( isJBossConfigWithoutCache() ) return; + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); ejtt.navTree.getNodeByLabel(SUBNODE_DATA_CONTAINER).click(); ejtt.getTabMenu().clickControlTab(); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -58,6 +58,8 @@ */ public void testJBossCacheRegionManagerMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab(); @@ -74,6 +76,8 @@ */ public void testJBossCacheRegionManagerControl() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickControlTab(); ejtt.operations.performOperation(LABEL_DUMP_REGIONS); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -62,6 +62,8 @@ */ public void testJBossCacheRpcManagerMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab(); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-10-30 03:21:35 UTC (rev 827) @@ -34,8 +34,11 @@ protected static final String SUBNODE_TX_INTERCEPTOR = "Tx Interceptor"; + /** + * Some JBoss AS configurations don't have Cache included - + * in that case, skip all JBoss Cache tests (don't fail). + */ - protected boolean isJBossConfigWithoutCache(){ boolean isJBossConfigWithoutCache = ! ejtt.getJBossConfig().equals("all"); if( isJBossConfigWithoutCache ) @@ -45,8 +48,4 @@ } - - - - }// class Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -62,6 +62,8 @@ */ public void testJBossCacheTransactionTableMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab(); @@ -82,6 +84,8 @@ */ public void testJBossCacheTransactionTableControl() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickControlTab(); ejtt.operations.performOperation(LABEL_RESET_STATISTICS); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -66,6 +66,8 @@ */ public void testJBossCacheTxInterceptorMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab();

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r826 - in branches: EmbJopr_1_3_3_MyFaces and 6 other directories.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2009-10-29 18:55:47 -0400 (Thu, 29 Oct 2009) New Revision: 826 Added: branches/EmbJopr_1_3_3_MyFaces/ Modified: branches/EmbJopr_1_3_3_MyFaces/core/pom.xml branches/EmbJopr_1_3_3_MyFaces/core/src/main/webapp/WEB-INF/web.xml branches/EmbJopr_1_3_3_MyFaces/jbas4/pom.xml branches/EmbJopr_1_3_3_MyFaces/jbas5/pom.xml branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml branches/EmbJopr_1_3_3_MyFaces/pom.xml Log: creating branch for as 5.2.0.beta1 release Copied: branches/EmbJopr_1_3_3_MyFaces (from rev 825, tags/EmbJopr_1_3_2_GA) Modified: branches/EmbJopr_1_3_3_MyFaces/core/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/core/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/core/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -35,8 +35,8 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA/core</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3_MyF...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3_MyFace...</developerConnection> </scm> <properties> @@ -184,7 +184,7 @@ <scope>runtime</scope> </dependency> -  +  + <dependency> + <groupId>apache-myfaces</groupId> + <artifactId>myfaces-api</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>apache-myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + <version>1.2.7</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>apache-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.4-brew</version> + </dependency>  <dependency> Modified: branches/EmbJopr_1_3_3_MyFaces/core/src/main/webapp/WEB-INF/web.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/core/src/main/webapp/WEB-INF/web.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/core/src/main/webapp/WEB-INF/web.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -19,6 +19,11 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> + +  <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -87,9 +92,14 @@ <param-value>.xhtml</param-value> </context-param> -  +  + <context-param> + <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> + <param-value>true</param-value> + </context-param> + <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> </listener>  Modified: branches/EmbJopr_1_3_3_MyFaces/jbas4/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jbas4/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jbas4/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,8 +14,8 @@ <name>JBossAS 4.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA/jbas4</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA/jbas4</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3/jbas4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3/jbas4</developerConnection> </scm> <properties> @@ -199,4 +199,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/EmbJopr_1_3_3_MyFaces/jbas5/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jbas5/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jbas5/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,8 +14,8 @@ <name>JBossAS 5.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA/jbas5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA/jbas5</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3/jbas5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3/jbas5</developerConnection> </scm> <properties> @@ -217,4 +217,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jsfunit/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <properties> - <jopr.version>1.2.0-SNAPSHOT</jopr.version> + <jopr.version>>2.3.0.EmbJopr.1.3.0-4</jopr.version> <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version> <jvm.args.debug></jvm.args.debug>  <jvm.args.profiler></jvm.args.profiler>  @@ -17,7 +17,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -86,13 +86,13 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2</version> + <version>1.2_12</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-j2se</artifactId> - <version>5.0.1.GA</version> + <version>5.1.0.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -111,12 +111,12 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> <scope>provided</scope> - <version>2.8.1</version> + <version>2.9.1</version> </dependency> <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> - <version>1.0</version> + <version>1.1</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -132,7 +132,7 @@ <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-metatype</artifactId> - <version>2.1.0.SP1</version> + <version>2.1.1.GA</version> <scope>provided</scope> </dependency> <dependency> Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/jsfunit/src/main/webapp/WEB-INF/web.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -19,6 +19,11 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> + +  <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -36,13 +41,7 @@ <param-value>jboss-console</param-value> </context-param> -  - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - -  +  <filter> <filter-name>JSFUnitFilter</filter-name> <filter-class>org.jboss.jsfunit.framework.JSFUnitFilter</filter-class> @@ -51,74 +50,77 @@ <filter-mapping> <filter-name>JSFUnitFilter</filter-name> <servlet-name>ServletTestRunner</servlet-name> - </filter-mapping> - + </filter-mapping> + <filter-mapping> <filter-name>JSFUnitFilter</filter-name> <servlet-name>ServletRedirector</servlet-name> </filter-mapping> - + <servlet> <servlet-name>ServletRedirector</servlet-name> <servlet-class>org.jboss.jsfunit.framework.JSFUnitServletRedirector</servlet-class> </servlet> - + <servlet> <servlet-name>ServletTestRunner</servlet-name> <servlet-class>org.apache.cactus.server.runner.ServletTestRunner</servlet-class> - </servlet> - + </servlet> + <servlet-mapping> <servlet-name>ServletRedirector</servlet-name> <url-pattern>/ServletRedirector.jsfunit</url-pattern> - </servlet-mapping> - + </servlet-mapping> + <servlet-mapping> <servlet-name>ServletTestRunner</servlet-name> <url-pattern>/ServletTestRunner.jsfunit</url-pattern> - </servlet-mapping> - - -  + </servlet-mapping> +  + <context-param> + <param-name>org.jboss.on.embedded.LazyStartupListener</param-name> + <param-value>org.jboss.seam.servlet.SeamListener</param-value> + </context-param> <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + <listener-class>org.jboss.on.embedded.LazyStartupListener</listener-class> </listener> - - -  <filter> <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> +  + <filter-class>org.jboss.on.embedded.LazyStartupFilter</filter-class> + <init-param> + <param-name>org.jboss.on.embedded.LazyStartupFilter</param-name> + <param-value>org.jboss.seam.servlet.SeamFilter</param-value> + </init-param> </filter> <filter-mapping> <filter-name>Seam Filter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> - + </filter-mapping> +  - + <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.seam</url-pattern> - </servlet-mapping> + </servlet-mapping> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> <param-value>/WEB-INF/navigation.xml</param-value> </context-param> - + <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>client</param-value> + <param-value>server</param-value> </context-param> <context-param> @@ -126,12 +128,16 @@ <param-value>.xhtml</param-value> </context-param> -  - +  + <context-param> + <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> + <param-value>true</param-value> + </context-param> + <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> </listener> - +   @@ -167,6 +173,5 @@ <security-role> <role-name>JBossAdmin</role-name> </security-role> - </web-app> Modified: branches/EmbJopr_1_3_3_MyFaces/pom.xml =================================================================== --- tags/EmbJopr_1_3_2_GA/pom.xml 2009-10-29 19:15:48 UTC (rev 825) +++ branches/EmbJopr_1_3_3_MyFaces/pom.xml 2009-10-29 22:55:47 UTC (rev 826) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1.GA</version> + <version>1.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Embedded Jopr</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> @@ -42,8 +42,8 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_3_1_GA</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3_MyF...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_3_MyFaces</developerConnection> </scm> <issueManagement>

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r825 - in trunk: core and 3 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-10-29 15:15:48 -0400 (Thu, 29 Oct 2009) New Revision: 825 Modified: trunk/core/pom.xml trunk/jbas4/pom.xml trunk/jbas5/pom.xml trunk/jsfunit/pom.xml trunk/pom.xml Log: change version from 1.3.2-SNAPSHOT to 1.4.0-SNAPSHOT Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-10-29 17:25:23 UTC (rev 824) +++ trunk/core/pom.xml 2009-10-29 19:15:48 UTC (rev 825) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2009-10-29 17:25:23 UTC (rev 824) +++ trunk/jbas4/pom.xml 2009-10-29 19:15:48 UTC (rev 825) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-10-29 17:25:23 UTC (rev 824) +++ trunk/jbas5/pom.xml 2009-10-29 19:15:48 UTC (rev 825) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-10-29 17:25:23 UTC (rev 824) +++ trunk/jsfunit/pom.xml 2009-10-29 19:15:48 UTC (rev 825) @@ -1,6 +1,9 @@ <?xml version="1.0"?> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <properties> <jopr.version>1.2.0-SNAPSHOT</jopr.version> <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version> @@ -20,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-29 17:25:23 UTC (rev 824) +++ trunk/pom.xml 2009-10-29 19:15:48 UTC (rev 825) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Embedded Jopr</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description>

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r824 - trunk/jsfunit/testdata.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-10-29 13:25:23 -0400 (Thu, 29 Oct 2009) New Revision: 824 Modified: trunk/jsfunit/testdata/hudson_shell_script.sh Log: * Hudson script: removed "--update-snapshots" from mvn calls. Modified: trunk/jsfunit/testdata/hudson_shell_script.sh =================================================================== --- trunk/jsfunit/testdata/hudson_shell_script.sh 2009-10-28 03:07:16 UTC (rev 823) +++ trunk/jsfunit/testdata/hudson_shell_script.sh 2009-10-29 17:25:23 UTC (rev 824) @@ -121,7 +121,7 @@ if [ -n "$DONT_SPLIT" ] ; then echo "Running whole testsuite... (DONT_SPLIT)" - mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 + mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES install -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 else ## Include functions for Hudson. #. ~/config_repository/scripts/common/common_bash.sh @@ -136,7 +136,7 @@ echo "Killing JBoss AS..." killJBossAS rm -rf target/jboss5x # Empty Cargo's configuration dir - mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES verify -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never --update-snapshots -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 + mvn $M2_SETTINGS -Pjboss5x -Pfoo$ADD_PROFILES verify -Dcargo.jboss.configuration=$JBOSS_CONFIG -Dhtmlunit.browser=$BROWSER --fail-never -DJBOSS_HOME=$JBOSS_HOME -Dcargo.jboss.bind.address=$MYTESTIP_1 #mv target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite-$part.xml #mv target target-$part ls -l

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r823 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/connfactories and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-10-27 23:07:16 -0400 (Tue, 27 Oct 2009) New Revision: 823 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java Log: * EmbJoprTestCase::isDeployed() updated - now first tries to match ProfileService deployments by regex + handling of stupid exception thrown ni case of no match. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-28 02:10:23 UTC (rev 822) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-28 03:07:16 UTC (rev 823) @@ -1086,9 +1086,9 @@ * @param deployment - the deployment we are interested in * @param secured If true, JAAS secured ManagementView is used. */ - protected boolean isDeployed(String deployment, boolean secured) throws Exception + protected boolean isDeployed(String deploymentName, boolean secured) throws Exception { - deployment = deployment.replace("/", System.getProperty("file.separator")); + deploymentName = deploymentName.replace("/", System.getProperty("file.separator")); ManagementView currentProfileView = getCurrentProfileView(secured); @@ -1098,21 +1098,36 @@ for( String name: deploymentNames ) log.debug(" "+name); /**/ - Set<String> matchingNames = currentProfileView.getMatchingDeploymentName(deployment); - log.debug( String.format("Regex '%s' matched %d deployment names.", deployment, matchingNames.size()) ); - if( matchingNames.size() > 0 ) - return true; + log.debug("Querying the profile view for '"+deploymentName+"'."); + try { + /*ManagedDeployment managedDeployment = null; + log.info("Calling ManagementView#getDeployment('"+deploymentName+"')"); + managedDeployment = currentProfileView.getDeployment(deploymentName); + return managedDeployment != null; */ - ManagedDeployment managedDeployment = null; - try { - log.info("Calling ManagementView#getDeployment('"+deployment+"')"); - managedDeployment = currentProfileView.getDeployment(deployment); - } catch (NoSuchDeploymentException e) { - return false; + // Using regexp will hopefully make it bullet-proof for future wild name changes as was common during AS 5.x developement. + String regex = ".*"+deploymentName+".*"; + Set<String> matchingNames = currentProfileView.getMatchingDeploymentName(regex); + log.debug( String.format("Regex '%s' matched %d deployment names.", regex, matchingNames.size()) ); + return matchingNames.size() > 0; } + catch( Exception ex ){ + if( isNoSuchDeploymentException(ex) ) return false; + else throw ex; + } - return managedDeployment != null; + } + + private static final boolean isNoSuchDeploymentException( NoSuchDeploymentException ex ){ return true; } + private static final boolean isNoSuchDeploymentException( Exception ex ){ + if( ex.getCause() != null && ex.getCause().getCause() != null + && ex.getCause().getCause() instanceof NoSuchDeploymentException ){ + return true; + } + return false; + } + /** * Get the profile service. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-28 02:10:23 UTC (rev 822) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-28 03:07:16 UTC (rev 823) @@ -96,6 +96,7 @@ //assertTrue("Connection Factory is not deployed (isDeployed() returned false).", isDeployed(jndiName + "-ds.xml")); //String deploymentName = String.format("vfsfile:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/%s-ds.xml", jndiName.replace('/', '_') ); + //vfsfile:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/EJtest_CreateTxConnFactory-ds.xml String deploymentName = jndiName.replace('/', '_'); assertTrue("Connection Factory is not deployed (isDeployed('"+deploymentName+"') returned false).", isDeployed(deploymentName));

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r822 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/connfactories and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-10-27 22:10:23 -0400 (Tue, 27 Oct 2009) New Revision: 822 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java Log: * EmbJoprTestCase::isDeployed() updated - now first tries to match ProfileService deployments by regex. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-28 01:11:24 UTC (rev 821) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-28 02:10:23 UTC (rev 822) @@ -1086,12 +1086,26 @@ * @param deployment - the deployment we are interested in * @param secured If true, JAAS secured ManagementView is used. */ - protected boolean isDeployed(String deployment, boolean secured) throws Exception { + protected boolean isDeployed(String deployment, boolean secured) throws Exception + { deployment = deployment.replace("/", System.getProperty("file.separator")); ManagementView currentProfileView = getCurrentProfileView(secured); + + /*/// Debug + Set<String> deploymentNames = currentProfileView.getDeploymentNames(); + log.debug("*** Deployment names: ***"); + for( String name: deploymentNames ) + log.debug(" "+name); /**/ + + Set<String> matchingNames = currentProfileView.getMatchingDeploymentName(deployment); + log.debug( String.format("Regex '%s' matched %d deployment names.", deployment, matchingNames.size()) ); + if( matchingNames.size() > 0 ) + return true; + ManagedDeployment managedDeployment = null; try { + log.info("Calling ManagementView#getDeployment('"+deployment+"')"); managedDeployment = currentProfileView.getDeployment(deployment); } catch (NoSuchDeploymentException e) { return false; Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-28 01:11:24 UTC (rev 821) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-28 02:10:23 UTC (rev 822) @@ -92,11 +92,13 @@ String expectedMessage = ADD_MESSAGE; checkClientAndServerMessages(expectedMessage, expectedMessage, false); - // Make sure the ManagedComponent was created and that the properties are - // set correctly - assertTrue("Connection Factory is not deployed (isDeployed() returned false).", - isDeployed(jndiName + "-ds.xml")); + // Make sure the ManagedComponent was created and that the properties are set correctly + //assertTrue("Connection Factory is not deployed (isDeployed() returned false).", isDeployed(jndiName + "-ds.xml")); + //String deploymentName = String.format("vfsfile:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/%s-ds.xml", jndiName.replace('/', '_') ); + String deploymentName = jndiName.replace('/', '_'); + assertTrue("Connection Factory is not deployed (isDeployed('"+deploymentName+"') returned false).", isDeployed(deploymentName)); + checkComponentProperties(propertiesMapAsMetaValues, jndiName, componentType); // Clean up

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r821 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-10-27 21:11:24 -0400 (Tue, 27 Oct 2009) New Revision: 821 Modified: trunk/jsfunit/pom.xml Log: * pom updated. Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-10-27 23:41:40 UTC (rev 820) +++ trunk/jsfunit/pom.xml 2009-10-28 01:11:24 UTC (rev 821) @@ -20,7 +20,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -357,7 +357,7 @@ <phase>package</phase> <goals><goal>run</goal></goals> <configuration><tasks> - <echo>Exctracting war... ################################################</echo> + <echo>Exctracting war...</echo> <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}" toFile="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"/> <unzip src="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}" @@ -368,8 +368,8 @@ <id>dont_kill_appeal</id> <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> <configuration><tasks> - <echo>####### Please don't kill this job unless it takes more than six hours.</echo> - <echo>####### There's no logging visible on Hudson during test run.</echo> + <echo>########################## Please don't kill this job unless it takes more than six hours.</echo> + <echo>########################## There's no logging visible on Hudson during test run.</echo> </tasks></configuration> </execution> </executions>

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r820 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-10-27 19:41:40 -0400 (Tue, 27 Oct 2009) New Revision: 820 Modified: trunk/jsfunit/pom.xml Log: * pom updated. Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-10-27 23:40:19 UTC (rev 819) +++ trunk/jsfunit/pom.xml 2009-10-27 23:41:40 UTC (rev 820) @@ -20,7 +20,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.2-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -351,7 +351,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>extract_war_for_cargo</id> @@ -365,6 +364,14 @@ dest="${project.build.directory}/${project.build.finalName}.${project.packaging}"/> </tasks></configuration> </execution> + <execution> + <id>dont_kill_appeal</id> + <phase>pre-integration-test</phase> <goals><goal>run</goal></goals> + <configuration><tasks> + <echo>####### Please don't kill this job unless it takes more than six hours.</echo> + <echo>####### There's no logging visible on Hudson during test run.</echo> + </tasks></configuration> + </execution> </executions> </plugin> @@ -475,7 +482,7 @@ </configfile> --> </configfiles> - +  <files> <copy> @@ -852,3 +859,4 @@ </build> </project> +

14 years, 6 months

1
0
0 / 0

EMBJOPR SVN: r819 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app: war and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-10-27 19:40:19 -0400 (Tue, 27 Oct 2009) New Revision: 819 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java Log: * Rar and War tests updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java 2009-10-27 19:42:06 UTC (rev 818) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/rar/RarTest.java 2009-10-27 23:40:19 UTC (rev 819) @@ -31,6 +31,7 @@ import java.util.*; import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.RandomUtils; import org.jboss.jopr.jsfunit.AppConstants.DeployableTypes; @@ -114,13 +115,13 @@ /** * assertion: Verify the navigation sequence to Resource Adapters. - * - * test Strategy: + * + * test Strategy: * * From the root of the navigation tree:i - * Click JBossAS Servers ==> JBoss App Server:${config} - * ==> Applications ==> Resource Adapters - * + * Click JBossAS Servers ==> JBoss App Server:${config} + * ==> Applications ==> Resource Adapters + * */ public void testRarNavigation() throws IOException, HtmlElementNotFoundException, ActionOutOfSyncException, ActionNotAvailableException, EmbJoprTestException, InterruptedException @@ -193,34 +194,55 @@ // Concrete appliction node. { + final String DEPLOYABLE_NAME = "testRarNavigation02.rar"; + // Deploy the RAR. - String rarFilePath = System.getProperty(SYSPROP_TESTDATA_DIR) + "/rar/"+BASIC_RAR; - deployRar( rarFilePath ); + //String rarFilePath = System.getProperty(SYSPROP_TESTDATA_DIR) + "/rar/"+BASIC_RAR; + String rarFilePathOrig = ejtt.getTestFilePath(APP_TYPE, BASIC_RAR); + String rarFilePath = ejtt.getTempDir() + "/" + DEPLOYABLE_NAME; - ejtt.getNavTree().getNodeByLabel(NAV_RAR).click(); + FileUtils.copyFile( new File(rarFilePathOrig), new File(rarFilePath) ); - ContentTableRow rarRow = ejtt.getDefaultContentTable().getFirstRowContainingLink(BASIC_RAR); - assertTrue("Page doesn't list "+BASIC_RAR+" in Summary tab.", rarRow != null ); + //deployRar( rarFilePath ); + ejtt.deployment.deployViaEmbJopr(APP_TYPE, rarFilePath); - // Go to the summary through listed item. - rarRow.getLinkByLabel(BASIC_RAR).click(); - // Check that we have the summary tab for the selected RAR. - assertTrue( "RAR name ("+BASIC_RAR+") not found in the content box.", - ejtt.getTabMenu().getTabContentBox().getElement().getTextContent().contains(BASIC_RAR) ); + Exception ex = null; + try { - // Go to the summary through nav tree node. - NavTreeNode rarNode = ejtt.getNavTree().getNodeByLabel(NAV_RAR); - if( !rarNode.isExpanded() ){ - log.info("Expanding."); - rarNode.getArrowLink().click(); - Thread.sleep(2000); + ejtt.getNavTree().getNodeByLabel(NAV_RAR).click(); + + // FAILS: Can't find the link using... + ContentTableRow rarRow = ejtt.getDefaultContentTable().getFirstRowContainingLink(BASIC_RAR); + assertTrue("Page doesn't list "+BASIC_RAR+" in Summary tab.", rarRow != null ); + + // Go to the summary through listed item. + rarRow.getLinkByLabel(BASIC_RAR).click(); + // Check that we have the summary tab for the selected RAR. + assertTrue( "RAR name ("+BASIC_RAR+") not found in the content box.", + ejtt.getTabMenu().getTabContentBox().getElement().getTextContent().contains(BASIC_RAR) ); + + // Go to the summary through nav tree node. + NavTreeNode rarNode = ejtt.getNavTree().getNodeByLabel(NAV_RAR); + if( !rarNode.isExpanded() ){ + log.info("Expanding."); + rarNode.getArrowLink().click(); + Thread.sleep(2000); + } + ejtt.getNavTree().getNodeByLabel(BASIC_RAR).click(); + // Check that we have the summary tab for the selected RAR. + ejtt.getTabMenu().getTabContentBox().getElement().getTextContent().contains(BASIC_RAR); } - ejtt.getNavTree().getNodeByLabel(BASIC_RAR).click(); - // Check that we have the summary tab for the selected RAR. - ejtt.getTabMenu().getTabContentBox().getElement().getTextContent().contains(BASIC_RAR); + catch( Exception ex1 ){ ex = ex1; } + finally { + //undeployRar(BASIC_RAR); + try { + ejtt.deployment.undeployViaEmbJopr(APP_TYPE, BASIC_RAR); + } catch( Exception ex2 ){ + log.warn("Failed to undeploy: "+ex2.getMessage()); + if( ex == null ) ex = ex2; + } + } - undeployRar(BASIC_RAR); - } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-10-27 19:42:06 UTC (rev 818) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-10-27 23:40:19 UTC (rev 819) @@ -935,23 +935,23 @@ log.info("Unzipping "+archivePath+" to "+tempDir); ejtt.deployment.unzipArchive( archivePath, tempDir ); - log.info("Moving "+tempDir+"/"+WAR_UNPACKED+" to "+destDir+"/"+WAR_UNPACKED); - ejtt.deployment.moveDir(tempDir+"/"+WAR_UNPACKED, destDir+"/"+WAR_UNPACKED); + log.info("Moving "+tempDir+"/"+DEPLOYABLE_NAME+" to "+destDir+"/"+DEPLOYABLE_NAME); + ejtt.deployment.moveDir(tempDir+"/"+DEPLOYABLE_NAME, destDir+"/"+DEPLOYABLE_NAME); try { // Loop, wait for the app to appear. log.info("Waiting for WAR to appear."); - ejtt.deployment.waitActivelyForDeployment(DeployableTypes.WAR, WAR_UNPACKED, + ejtt.deployment.waitActivelyForDeployment(DeployableTypes.WAR, DEPLOYABLE_NAME, DEPLOY_UP_STATE_WAIT_CHECK_INTERVAL, DEPLOY_UP_STATE_WAIT_CHECK_RETRIES, this); ejtt.getNavTree().getNodeByLabel(NAV_WAR).click(); //ContentTableRow row = ejtt.getDefaultContentTable().getFirstRowContainingLink(WAR_UNPACKED); - if( ! ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, WAR_UNPACKED) ) - throw new EmbJoprTestException("Unpacked hotdeployed war not found: "+WAR_UNPACKED, this); + if( ! ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME) ) + throw new EmbJoprTestException("Unpacked hotdeployed war not found: "+DEPLOYABLE_NAME, this); @@ -965,7 +965,9 @@ } finally { // Delete the WAR dir. - ejtt.deployment.deleteFromDeployDir(WAR_UNPACKED); + //Couldn't delete following files: + // /home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/unpacked-web1.war + ejtt.deployment.deleteFromDeployDir(DEPLOYABLE_NAME); } }

14 years, 6 months

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-10-27 15:42:06 -0400 (Tue, 27 Oct 2009) New Revision: 818 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java Log: include faces messages in message that is logged when validation fails, but log the message at DEBUG, rather than INFO Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2009-10-23 19:34:16 UTC (rev 817) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2009-10-27 19:42:06 UTC (rev 818) @@ -19,6 +19,8 @@ */ package org.jboss.on.embedded.ui; +import java.util.List; + import javax.faces.application.FacesMessage; import org.apache.commons.logging.Log; @@ -138,10 +140,25 @@ } } - // TODO just a test @Observer("org.jboss.seam.validationFailed") public void validationFailed() { - log.info("validation failed"); + FacesMessages messages = FacesMessages.instance(); + List<FacesMessage> currentMessages = messages.getCurrentMessages(); + StringBuilder buffer = new StringBuilder("["); + for (FacesMessage message : currentMessages) { + buffer.append(toString(message)).append(", "); + } + if (!currentMessages.isEmpty()) { + // chop off the last ", " + buffer.setLength(currentMessages.size() - 2); + } + buffer.append("]"); + log.debug("Validation failed - FacesMessages: " + buffer); } + + private static String toString(FacesMessage message) { + return FacesMessage.class.getSimpleName() + "[(" + message.getSeverity() + ") " + message.getSummary() + ": " + + message.getDetail() + "]"; + } }

14 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits October 2009