April 2009 - embjopr-commits - Jboss List Archives

EMBJOPR SVN: r359 - in trunk/jsfunit: testdata and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-27 15:46:16 -0400 (Mon, 27 Apr 2009) New Revision: 359 Added: trunk/jsfunit/testdata/ejb3/ trunk/jsfunit/testdata/ejb3/BasicEJB3.jar Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java Log: Updated EJB3 test Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java 2009-04-27 19:43:47 UTC (rev 358) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EjbTest.java 2009-04-27 19:46:16 UTC (rev 359) @@ -92,9 +92,15 @@ log.info("renderResponse() called: " + server.getFacesContext().getRenderResponse() ); log.info("responseComplete() called: " + server.getFacesContext().getResponseComplete() ); + String errorMessage = + ( server.getFacesMessages().hasNext() + && server.getFacesMessages().next().getSeverity() != FacesMessage.SEVERITY_INFO ) ? + " Faces message: "+server.getFacesMessages().next() + : ""; // Awful code + // FAILS because of NPE and HTTP 500. // assert that the success message appeared on the client side - assertTrue("Success message not found.", client.getPageAsText().contains("Resource " + BASIC_JAR + " created successfully!")); + assertTrue("Success message not found."+errorMessage, client.getPageAsText().contains("Resource " + BASIC_JAR + " created successfully!")); // assert text and severity level for FacesMessage on server side assertTrue(server.getFacesMessages().hasNext()); Added: trunk/jsfunit/testdata/ejb3/BasicEJB3.jar =================================================================== (Binary files differ) Property changes on: trunk/jsfunit/testdata/ejb3/BasicEJB3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years

1
0
0 / 0

EMBJOPR SVN: r358 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit/as5 and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-27 15:43:47 -0400 (Mon, 27 Apr 2009) New Revision: 358 Added: trunk/jsfunit/testdata/war/hellothere10.war Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java Log: Updated EAR and WAR tests. Added WarTest#testStandaloneWarDoesntAppearInEmbeddedWars(). Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-04-27 19:05:14 UTC (rev 357) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-04-27 19:43:47 UTC (rev 358) @@ -41,15 +41,15 @@ */ public enum DeployableTypes { - // Mandatory: first, fourth // Nav tree link label, testdata/$dir, extension, suffix, mime type. - EAR(AppConstants.NAV_EAR, "ear", ".ear", null, "application/ear"), - WAR(AppConstants.NAV_WAR, "war", ".war", null, "application/war"), - EJB2(AppConstants.NAV_EJB2, "ejb2", ".jar", null, " application/java-archive"), - EJB3(AppConstants.NAV_EJB3, "ejb3", ".jar", null, " application/java-archive"), + EAR(AppConstants.NAV_EAR, "ear", ".ear", null, "application/ear"), + WAR(AppConstants.NAV_WAR, "war", ".war", null, "application/war"), + EJB2(AppConstants.NAV_EJB2, "ejb2", ".jar", null, "application/java-archive"), + EJB3(AppConstants.NAV_EJB3, "ejb3", ".jar", null, "application/java-archive"), SAR(AppConstants.NAV_SAR, "sar", ".sar", "-service.xml", "application/sar"), - RAR(AppConstants.NAV_RAR, "rar", ".rar", null, "application/rar"), - MC_BEAN(AppConstants.NAV_MC, "mc", "", null, "application/java-archive"); + RAR(AppConstants.NAV_RAR, "rar", ".rar", null, "application/rar"), + MC_BEAN(AppConstants.NAV_MC, "mc", "", null, "application/java-archive"), + EMB_WAR(AppConstants.NAV_EMB_WAR,"",".war", null, "application/war"); // -- Fields -- @@ -111,6 +111,7 @@ public static final String NAV_PAR = "Persistence Unit (PAR)s"; public static final String NAV_RAR = "Resource Adaptor (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 EAR_MALFORMED_APP_FILENAME = "malformed-application-xml.ear"; public static final String WAR_FILENAME_MALFORMED_APP = "malformed-web-xml.war"; @@ -141,6 +142,7 @@ public static final String BASIC_WAR_07 = "hellothere07.war"; public static final String BASIC_WAR_08 = "hellothere08.war"; public static final String BASIC_WAR_09 = "hellothere09.war"; + public static final String BASIC_WAR_10 = "hellothere10.war"; public static final String BASIC_WAR_DUD = "hellothere-DUD.war"; public static final String BASIC_WAR_DUD_RETRY = "hellothere-DUD_RETRY.war"; public static final String BASIC_WAR_STOPSTART = "hellothere-STOP_START.war"; Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-04-27 19:05:14 UTC (rev 357) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-04-27 19:43:47 UTC (rev 358) @@ -844,7 +844,7 @@ // Assert that the app is stopped. page = (HtmlPage)webClient.getPage(testPageUrl); - assert( 200 != page.getWebResponse().getStatusCode() ); + assertTrue( 200 != page.getWebResponse().getStatusCode() ); // Click the Start button. @@ -864,7 +864,7 @@ // Assert that the app is running. page = (HtmlPage)webClient.getPage(testPageUrl); - assert( 200 == page.getWebResponse().getStatusCode() ); + assertTrue( 200 == page.getWebResponse().getStatusCode() ); assertTrue(page.asText().contains("HELLO WORLD")); // Get the counter number. @@ -952,7 +952,7 @@ // Assert that the app is running. page = (HtmlPage)webClient.getPage(testPageUrl); - assert( 200 == page.getWebResponse().getStatusCode() ); + assertTrue( 200 == page.getWebResponse().getStatusCode() ); assertTrue(page.asText().contains("HELLO WORLD")); // Get the counter number. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-04-27 19:05:14 UTC (rev 357) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-04-27 19:43:47 UTC (rev 358) @@ -901,7 +901,7 @@ // Assert that the app is stopped. page = (HtmlPage)webClient.getPage(testPageUrl); - assert( 200 != page.getWebResponse().getStatusCode() ); + assertTrue( 200 != page.getWebResponse().getStatusCode() ); // Click the Start button. @@ -918,7 +918,7 @@ // Assert that the app is running. page = (HtmlPage)webClient.getPage(testPageUrl); - assert( 200 == page.getWebResponse().getStatusCode() ); + assertTrue( 200 == page.getWebResponse().getStatusCode() ); assertTrue(page.asText().contains("HELLO WORLD")); // Get the counter number. @@ -1062,16 +1062,42 @@ + public void testStandaloneWarDoesntAppearInEmbeddedWars() throws IOException, EmbJoprTestException + { + final String DEPLOYABLE_NAME = BASIC_WAR_10; + // Deploy the WAR. + String appFilePath = ejtt.getTestDataDir() + "/war/"+DEPLOYABLE_NAME; + try { + + deployWAR( appFilePath ); + ejtt.navTree.getNodeByLabel(DeployableTypes.EMB_WAR.getNavTreeLabel()).getLabelLink().click(); + assertFalse( ejtt.deployment.isDeployedAccordingToEmbJopr(DeployableTypes.EMB_WAR, DEPLOYABLE_NAME, false) ); + } + finally { + // Undeploy for the case it was (errorneously) deployed. + try { + undeployWAR(DEPLOYABLE_NAME); + } catch( Exception ex ){ + log.debug("Cathed an expected exception when trying to undeploy "+DEPLOYABLE_NAME+": "+ex ); + } + } + } + + + + + + /** * Deploys WAR. */ Added: trunk/jsfunit/testdata/war/hellothere10.war =================================================================== (Binary files differ) Property changes on: trunk/jsfunit/testdata/war/hellothere10.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years

1
0
0 / 0

EMBJOPR SVN: r357 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-27 15:05:14 -0400 (Mon, 27 Apr 2009) New Revision: 357 Modified: trunk/jsfunit/pom.xml Log: POM: Changed the bundled EmbJopr war file name (for removal before testing) Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-27 17:36:48 UTC (rev 356) +++ trunk/jsfunit/pom.xml 2009-04-27 19:05:14 UTC (rev 357) @@ -1,508 +1,508 @@ -<?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.jboss.configuration>default</cargo.jboss.configuration> - </properties> - - <parent> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jsfunit</artifactId> - <packaging>war</packaging> - <name>JSFUnit Tests for Embedded Admin Console</name> - - <pluginRepositories> - <pluginRepository> - <id>codehaus snapshot repository</id> - <url>http://snapshots.repository.codehaus.org/</url> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> - - <dependencies> - -  - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <scope>compile</scope> - <version>2.3</version> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <scope>compile</scope> - <version>1.7R1</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsfunit</groupId> - <artifactId>jboss-jsfunit-core</artifactId> - <version>1.0.0.GA</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.jsfunit</groupId> - <artifactId>jboss-jsfunit-richfaces</artifactId> - <version>1.0.0.GA</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-j2se</artifactId> - <version>5.0.1.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <scope>provided</scope> - <version>2.7.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>provided</scope> - <version>2.8.1</version> - </dependency> - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.jboss.integration</groupId> - <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.CR2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-metatype</artifactId> - <version>2.1.0.CR4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jboss.messaging</groupId> - <artifactId>jboss-messaging-client</artifactId> - <version>1.4.3.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>5.0.1.GA</version> - <scope>provided</scope> - </dependency> - </dependencies> - - - <profiles> - -  - <profile> - <id>jboss4.2</id> - <dependencies> - <dependency> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jbas4</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - </dependencies> - - <build> - <plugins> - -  - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0-SNAPSHOT</version> - <configuration> - <wait>false</wait> - <container> - <containerId>jboss42x</containerId> - <home>${JBOSS_HOME}</home> - <log>${basedir}/target/jboss4.2.logs/cargo.log</log> - <timeout>300000</timeout>  - <systemProperties> - <jboss.server.log.threshold>ALL</jboss.server.log.threshold> -  - <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> - <jsfunit.tempdir>${basedir}/target/jboss42x/tmp</jsfunit.tempdir> - <jsfunit.deploy.dir>${basedir}/target/jboss42x/deploy</jsfunit.deploy.dir> - <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> - <jsfunit.jboss.home.dir>${basedir}/target/jboss42x</jsfunit.jboss.home.dir> - </systemProperties> - </container> - -  - <configuration> -  - <type>standalone</type> - <home>target/jboss4.2</home> - <properties> - <cargo.java.home>${JAVA_HOME}</cargo.java.home> -  - <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> - </properties> -  - <configfiles> - </configfiles> - </configuration> -  - - </configuration> - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <includes> - <include>**/as4/*Test.java</include> - <include>**/jsfunit/*Test.java</include> - </includes> - <excludes><exclude>**/as5/**</exclude></excludes> - <systemProperties> - <property> - <name>cactus.contextURL</name> - <value>http://localhost:8080/admin-console</value> - </property> - <property> - <name>cactus.servletRedirectorName</name> - <value>ServletRedirector.jsfunit</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss5x</id> - <dependencies> - <dependency> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jbas5</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - -  - <plugin> - <groupId>bakersoftware</groupId> - <artifactId>maven-replacer-plugin</artifactId> - <version>0.0.9</version> - <executions> - <execution><id>mrp1</id> - <phase>initialize</phase><goals><goal>replace</goal></goals> - <configuration> - <file>${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml</file> - <token>attribute name="EnableMessageCounters">false</token> - <value>attribute name="EnableMessageCounters">true</value> - </configuration> - </execution> - <execution><id>mrp2</id> - <phase>initialize</phase><goals><goal>replace</goal></goals> - <configuration> - <file>${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml</file> - <token>attribute name="EnableMessageCounters">false</token> - <value>attribute name="EnableMessageCounters">true</value> - </configuration> - </execution> - <execution><id>mrp3</id> - <phase>initialize</phase><goals><goal>replace</goal></goals> - <configuration> - <file>${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml</file> - <token>attribute name="EnableMessageCounters">false</token> - <value>attribute name="EnableMessageCounters">true</value> - </configuration> - </execution> - </executions> - </plugin> - - -  - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven2-plugin</artifactId> - <version>1.0-SNAPSHOT</version> - <configuration> - <wait>false</wait> - <container> - <containerId>jboss5x</containerId> - <home>${JBOSS_HOME}</home>  - <log>${basedir}/target/jboss5.x.logs/cargo.log</log> - <timeout>300000</timeout>  - <systemProperties> -  - <jboss.server.log.threshold>ALL</jboss.server.log.threshold> -  - <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> - <jsfunit.tempdir>${basedir}/target/jboss5x/tmp</jsfunit.tempdir> - <jsfunit.deploy.dir>${basedir}/target/jboss5x/deploy</jsfunit.deploy.dir> - <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> -  - <jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir> - </systemProperties> - </container> - -  - <configuration> -  -  - <type>standalone</type> - <home>target/jboss5x</home> - <properties> - <cargo.java.home>${JAVA_HOME}</cargo.java.home> -  - <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs> -  -  - <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> - </properties> -  - <configfiles> -  - <configfile> - <file>${basedir}/testdata/jboss-configuration/conf/jboss-log4j.xml</file> - <tofile>conf/jboss-log4j.xml</tofile> - </configfile> -  - <configfile> - <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file> - <tofile>deploy/jbossweb.sar/server.xml</tofile> - </configfile> -  - <configfile> - <file>${basedir}/testdata/jboss-configuration/conf/props/jmx-console-roles.properties</file> - <tofile>conf/props/jmx-console-roles.properties</tofile> - </configfile> - <configfile> - <file>${basedir}/testdata/jboss-configuration/conf/props/jmx-console-users.properties</file> - <tofile>conf/props/jmx-console-users.properties</tofile> - </configfile> -  - </configfiles> - -  - <files> - <copy> - <file>${basedir}/testdata/destinations</file> - <toDir>deploy</toDir> - </copy> - <copy> - <file>${basedir}/testdata/datasources/testFiles</file> - <toDir>deploy</toDir> - </copy> - </files> - </configuration> -  - - </configuration> - <executions> - <execution> - <id>start-container</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - </execution> - <execution> - <id>stop-container</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <includes> - <include>**/as5/*Test.java</include> - <include>**/jsfunit/*Test.java</include> -  - </includes> - <excludes> - <exclude>**/as4/**</exclude> -  - </excludes> - <systemProperties> - <property> - <name>cactus.contextURL</name> - <value>http://localhost:8080/admin-console</value> - </property> - <property> - <name>cactus.servletRedirectorName</name> - <value>ServletRedirector.jsfunit</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - -  - - </profiles> - - - <build> - <sourceDirectory>src/test/java</sourceDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <finalName>admin-console-jsfunit</finalName> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <useCache>false</useCache> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - <dependentWarIncludes>**,**/jboss-structure.xml</dependentWarIncludes> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - <executions> - <execution> - <phase>initialize</phase> - <configuration><tasks> - <echo>Deleting ${JBOSS_HOME}/server/default/deploy/jopr-embedded-jbas5.war</echo> - <delete dir="${JBOSS_HOME}/server/default/deploy/jopr-embedded-jbas5.war" /> - </tasks></configuration> - <goals><goal>run</goal></goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> +<?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.jboss.configuration>default</cargo.jboss.configuration> + </properties> + + <parent> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-parent</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jsfunit</artifactId> + <packaging>war</packaging> + <name>JSFUnit Tests for Embedded Admin Console</name> + + <pluginRepositories> + <pluginRepository> + <id>codehaus snapshot repository</id> + <url>http://snapshots.repository.codehaus.org/</url> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + + <dependencies> + +  + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <scope>compile</scope> + <version>2.3</version> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <scope>compile</scope> + <version>1.7R1</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsfunit</groupId> + <artifactId>jboss-jsfunit-core</artifactId> + <version>1.0.0.GA</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jsfunit</groupId> + <artifactId>jboss-jsfunit-richfaces</artifactId> + <version>1.0.0.GA</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-j2se</artifactId> + <version>5.0.1.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <scope>provided</scope> + <version>2.7.1</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>provided</scope> + <version>2.8.1</version> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.CR2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.man</groupId> + <artifactId>jboss-metatype</artifactId> + <version>2.1.0.CR4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss.messaging</groupId> + <artifactId>jboss-messaging-client</artifactId> + <version>1.4.3.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>5.0.1.GA</version> + <scope>provided</scope> + </dependency> + </dependencies> + + + <profiles> + +  + <profile> + <id>jboss4.2</id> + <dependencies> + <dependency> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jbas4</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + </dependencies> + + <build> + <plugins> + +  + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + <configuration> + <wait>false</wait> + <container> + <containerId>jboss42x</containerId> + <home>${JBOSS_HOME}</home> + <log>${basedir}/target/jboss4.2.logs/cargo.log</log> + <timeout>300000</timeout>  + <systemProperties> + <jboss.server.log.threshold>ALL</jboss.server.log.threshold> +  + <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> + <jsfunit.tempdir>${basedir}/target/jboss42x/tmp</jsfunit.tempdir> + <jsfunit.deploy.dir>${basedir}/target/jboss42x/deploy</jsfunit.deploy.dir> + <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> + <jsfunit.jboss.home.dir>${basedir}/target/jboss42x</jsfunit.jboss.home.dir> + </systemProperties> + </container> + +  + <configuration> +  + <type>standalone</type> + <home>target/jboss4.2</home> + <properties> + <cargo.java.home>${JAVA_HOME}</cargo.java.home> +  + <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> + </properties> +  + <configfiles> + </configfiles> + </configuration> +  + + </configuration> + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <includes> + <include>**/as4/*Test.java</include> + <include>**/jsfunit/*Test.java</include> + </includes> + <excludes><exclude>**/as5/**</exclude></excludes> + <systemProperties> + <property> + <name>cactus.contextURL</name> + <value>http://localhost:8080/admin-console</value> + </property> + <property> + <name>cactus.servletRedirectorName</name> + <value>ServletRedirector.jsfunit</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + +  + <profile> + <id>jboss5x</id> + <dependencies> + <dependency> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jbas5</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + +  + <plugin> + <groupId>bakersoftware</groupId> + <artifactId>maven-replacer-plugin</artifactId> + <version>0.0.9</version> + <executions> + <execution><id>mrp1</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters">false</token> + <value>attribute name="EnableMessageCounters">true</value> + </configuration> + </execution> + <execution><id>mrp2</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters">false</token> + <value>attribute name="EnableMessageCounters">true</value> + </configuration> + </execution> + <execution><id>mrp3</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters">false</token> + <value>attribute name="EnableMessageCounters">true</value> + </configuration> + </execution> + </executions> + </plugin> + + +  + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + <configuration> + <wait>false</wait> + <container> + <containerId>jboss5x</containerId> + <home>${JBOSS_HOME}</home>  + <log>${basedir}/target/jboss5.x.logs/cargo.log</log> + <timeout>300000</timeout>  + <systemProperties> +  + <jboss.server.log.threshold>ALL</jboss.server.log.threshold> +  + <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> + <jsfunit.tempdir>${basedir}/target/jboss5x/tmp</jsfunit.tempdir> + <jsfunit.deploy.dir>${basedir}/target/jboss5x/deploy</jsfunit.deploy.dir> + <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> +  + <jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir> + </systemProperties> + </container> + +  + <configuration> +  +  + <type>standalone</type> + <home>target/jboss5x</home> + <properties> + <cargo.java.home>${JAVA_HOME}</cargo.java.home> +  + <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs> +  +  + <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> + </properties> +  + <configfiles> +  + <configfile> + <file>${basedir}/testdata/jboss-configuration/conf/jboss-log4j.xml</file> + <tofile>conf/jboss-log4j.xml</tofile> + </configfile> +  + <configfile> + <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file> + <tofile>deploy/jbossweb.sar/server.xml</tofile> + </configfile> +  + <configfile> + <file>${basedir}/testdata/jboss-configuration/conf/props/jmx-console-roles.properties</file> + <tofile>conf/props/jmx-console-roles.properties</tofile> + </configfile> + <configfile> + <file>${basedir}/testdata/jboss-configuration/conf/props/jmx-console-users.properties</file> + <tofile>conf/props/jmx-console-users.properties</tofile> + </configfile> +  + </configfiles> + +  + <files> + <copy> + <file>${basedir}/testdata/destinations</file> + <toDir>deploy</toDir> + </copy> + <copy> + <file>${basedir}/testdata/datasources/testFiles</file> + <toDir>deploy</toDir> + </copy> + </files> + </configuration> +  + + </configuration> + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <includes> + <include>**/as5/*Test.java</include> + <include>**/jsfunit/*Test.java</include> +  + </includes> + <excludes> + <exclude>**/as4/**</exclude> +  + </excludes> + <systemProperties> + <property> + <name>cactus.contextURL</name> + <value>http://localhost:8080/admin-console</value> + </property> + <property> + <name>cactus.servletRedirectorName</name> + <value>ServletRedirector.jsfunit</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + +  + + </profiles> + + + <build> + <sourceDirectory>src/test/java</sourceDirectory> + <testSourceDirectory>src/test/java</testSourceDirectory> + <finalName>admin-console-jsfunit</finalName> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <useCache>false</useCache> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + <dependentWarIncludes>**,**/jboss-structure.xml</dependentWarIncludes> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <phase>initialize</phase> + <configuration><tasks> + <echo>Deleting ${JBOSS_HOME}/server/default/deploy/admin-console.war</echo> + <delete dir="${JBOSS_HOME}/server/default/deploy/admin-console.war" /> + </tasks></configuration> + <goals><goal>run</goal></goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project>

15 years

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: fjuma Date: 2009-04-27 13:36:48 -0400 (Mon, 27 Apr 2009) New Revision: 356 Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java Log: Modifying the operations tests for JMS destinations to match the new layout for the operations page. Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-04-27 16:54:42 UTC (rev 355) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-04-27 17:36:48 UTC (rev 356) @@ -200,7 +200,7 @@ rendered="#{selectedHistory.status eq 'INPROGRESS'}"> <i>The operation has not completed yet.</i> </h:panelGroup> - <h:panelGroup layout="block" + <h:panelGroup id="operationResults" layout="block" rendered="#{selectedHistory.status eq 'SUCCESS' and selectedHistory.results ne null and selectedHistory.operationDefinition.resultsConfigurationDefinition ne null}"> <onc:config configurationDefinition="#{selectedHistory.operationDefinition.resultsConfigurationDefinition}" configuration="#{selectedHistory.results}" @@ -209,7 +209,7 @@ nullConfigurationMessage="null config!" nullConfigurationStyle="InfoBlock"/> </h:panelGroup> - <h:panelGroup layout="block" + <h:panelGroup id="noResults" layout="block" rendered="#{selectedHistory.status eq 'SUCCESS' and (selectedHistory.results eq null or empty selectedHistory.results.map)}"> <i>The operation did not return any results.</i> </h:panelGroup> Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-04-27 16:54:42 UTC (rev 355) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-04-27 17:36:48 UTC (rev 356) @@ -1445,7 +1445,7 @@ checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(), DestinationType.QUEUE); } - + /** * Test Name: testQueueMetricsAfterCreatingReceiver * Assertion: Verify that queue metrics are correct after creating @@ -2677,13 +2677,10 @@ performResourceOperation(JMS_NAV_LABEL, destinationType.getNavLabel(), jndiName, operationName, takesParameters); - // Click on the "Show/Hide Details" link - HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); - detailsLink.click(); - // Get the result of the operation - HtmlForm form = (HtmlForm)client.getElement(OPERATION_HISTORY_FORM); - HtmlInput input = (HtmlInput)form.getFirstByXPath(".//input[@class='property-value-input']"); + HtmlDivision historyPanel = (HtmlDivision)client.getElement(OPERATION_HISTORY_FORM); + HtmlInput input = (HtmlInput)historyPanel.getFirstByXPath(".//input[@class='property-value-input']"); + assertNotNull("Could not get the result of the operation", input); String result = input.getValueAttribute(); @@ -2715,13 +2712,9 @@ performResourceOperation(JMS_NAV_LABEL, destinationType.getNavLabel(), jndiName, operationName, takesParameters); - // Click on the "Show/Hide Details" link - HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); - detailsLink.click(); - // Get the result of the operation - HtmlForm form = (HtmlForm)client.getElement(OPERATION_HISTORY_FORM); - HtmlInput input = (HtmlInput)form.getFirstByXPath(".//input[@class='property-value-input']"); + HtmlDivision historyPanel = (HtmlDivision)client.getElement(OPERATION_HISTORY_FORM); + HtmlInput input = (HtmlInput)historyPanel.getFirstByXPath(".//input[@class='property-value-input']"); assertNotNull("Could not get the result of the operation", input); String result = input.getValueAttribute(); @@ -3028,13 +3021,8 @@ performResourceOperation(JMS_NAV_LABEL, DestinationType.TOPIC.getNavLabel(), jndiName, operationName, Boolean.FALSE); - // Make sure the operation parameters and results are displayed - // correctly - HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); - detailsLink.click(); + String actualOperationResults = ((HtmlDivision)client.getElement(OPERATION_RESULTS)).getTextContent(); - String actualOperationResults = ((HtmlSpan)client.getElement(OPERATION_RESULTS)).getTextContent(); - String shortenedResult = actualOperationResults.substring(actualOperationResults.indexOf("Viewing"), actualOperationResults.indexOf("]") + 1); log.info("Operation result was: " + shortenedResult); Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-04-27 16:54:42 UTC (rev 355) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-04-27 17:36:48 UTC (rev 356) @@ -68,7 +68,7 @@ public static final String OPERATION_DETAILS = "(Show/Hide Details)"; // Operations table constants - public static final String OPERATION_HISTORY_FORM = "operationHistoryForm"; + public static final String OPERATION_HISTORY_FORM = "historyDetailsPanel"; public static final String DATA_TABLE = "dataTable"; public static final String INPROGRESS = "In Progress"; public static final String SUCCESSFUL = "Successful"; @@ -79,7 +79,8 @@ public static final String NO_PARAMETERS = "noParameters"; public static final String NO_RESULTS = "noResults"; public static final String OPERATION_RESULTS = "operationResults"; - public static final String NONE = "None"; + public static final String NO_RESULTS_MESSAGE = "The operation did not return any results"; + public static final String NO_PARAMETERS_MESSAGE = "This operation does not take any parameters"; public static final String EMPTY_LIST = "[]"; public static final String TABLE_CELL_DELIM = "<td>"; public static final String TABLE_CELL_END_DELIM = "</td>"; @@ -420,18 +421,15 @@ // Make sure the operation parameters and results are displayed // correctly - HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); - detailsLink.click(); - String actualOperationParameters = ((HtmlSpan)client.getElement(NO_PARAMETERS)).getTextContent(); - String actualOperationResults = ((HtmlSpan)client.getElement(NO_RESULTS)).getTextContent(); + String actualOperationResults = ((HtmlDivision)client.getElement(NO_RESULTS)).getTextContent(); assertTrue("Incorrect operation parameters displayed in the operations history table: " - + "expected: " + NONE + " but was: " + actualOperationParameters, - actualOperationParameters.contains(NONE)); + + "expected: " + NO_PARAMETERS_MESSAGE + " but was: " + actualOperationParameters, + actualOperationParameters.contains(NO_PARAMETERS_MESSAGE)); assertTrue("Incorrect operation results displayed in the operations history table: " - + "expected: " + NONE + " but was: " + actualOperationResults, - actualOperationResults.contains(NONE)); + + "expected: " + NO_RESULTS_MESSAGE + " but was: " + actualOperationResults, + actualOperationResults.contains(NO_RESULTS_MESSAGE)); } /**

15 years

1
0
0 / 0

EMBJOPR SVN: r355 - trunk.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-27 12:54:42 -0400 (Mon, 27 Apr 2009) New Revision: 355 Modified: trunk/pom.xml Log: Embedded Jopr build 1.2.0.CR3 (done) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-04-27 16:52:48 UTC (rev 354) +++ trunk/pom.xml 2009-04-27 16:54:42 UTC (rev 355) @@ -25,7 +25,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.2.0.CR2</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -64,9 +64,9 @@  <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.6</jaxb-impl.version> - <jopr.version>2.2.0.EmbJopr_1_2_0-2</jopr.version> + <jopr.version>2.2.0-SNAPSHOT</jopr.version> <richfaces.version>3.3.0.GA</richfaces.version> - <rhq.version>1.2.0.CR2</rhq.version> + <rhq.version>1.2.0-SNAPSHOT</rhq.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version> <!-- This is a special patched version of not-yet-released Facelets 1.1.15,

15 years

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-27 12:52:48 -0400 (Mon, 27 Apr 2009) New Revision: 354 Modified: trunk/core/pom.xml trunk/jbas4/pom.xml trunk/jbas5/pom.xml trunk/jsfunit/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-04-27 16:52:33 UTC (rev 353) +++ trunk/core/pom.xml 2009-04-27 16:52:48 UTC (rev 354) @@ -23,19 +23,19 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.CR3</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> - <version>1.2.0.CR3</version> + <version>1.2.0-SNAPSHOT</version> <packaging>war</packaging> <name>Embedded Jopr Core</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/core</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/core/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/core/</developerConnection> </scm> <properties> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2009-04-27 16:52:33 UTC (rev 353) +++ trunk/jbas4/pom.xml 2009-04-27 16:52:48 UTC (rev 354) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.CR3</version> + <version>1.2.0-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_2_0_CR3/jbas4</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/jbas4</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas4/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas4/</developerConnection> </scm> <properties> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-04-27 16:52:33 UTC (rev 353) +++ trunk/jbas5/pom.xml 2009-04-27 16:52:48 UTC (rev 354) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.CR3</version> + <version>1.2.0-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_2_0_CR3/jbas5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/jbas5</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas5/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas5/</developerConnection> </scm> <properties> Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-27 16:52:33 UTC (rev 353) +++ trunk/jsfunit/pom.xml 2009-04-27 16:52:48 UTC (rev 354) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.CR3</version> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-04-27 16:52:33 UTC (rev 353) +++ trunk/pom.xml 2009-04-27 16:52:48 UTC (rev 354) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.CR3</version> + <version>1.2.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> @@ -42,8 +42,8 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/</developerConnection> </scm> <issueManagement>

15 years

1
0
0 / 0

EMBJOPR SVN: r353 - tags.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-27 12:52:33 -0400 (Mon, 27 Apr 2009) New Revision: 353 Added: tags/EmbJopr_1_2_0_CR3/ Log: [maven-scm] copy for tag EmbJopr_1_2_0_CR3 Copied: tags/EmbJopr_1_2_0_CR3 (from rev 352, trunk)

15 years

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-27 12:52:29 -0400 (Mon, 27 Apr 2009) New Revision: 352 Modified: trunk/core/pom.xml trunk/jbas4/pom.xml trunk/jbas5/pom.xml trunk/jsfunit/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release EmbJopr_1_2_0_CR3 Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-04-27 16:49:14 UTC (rev 351) +++ trunk/core/pom.xml 2009-04-27 16:52:29 UTC (rev 352) @@ -23,19 +23,19 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR3</version> </parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR3</version> <packaging>war</packaging> <name>Embedded Jopr Core</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/core/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/core/</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/core</developerConnection> </scm> <properties> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2009-04-27 16:49:14 UTC (rev 351) +++ trunk/jbas4/pom.xml 2009-04-27 16:52:29 UTC (rev 352) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR3</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/trunk/jbas4/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas4/</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/jbas4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/jbas4</developerConnection> </scm> <properties> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-04-27 16:49:14 UTC (rev 351) +++ trunk/jbas5/pom.xml 2009-04-27 16:52:29 UTC (rev 352) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR3</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/trunk/jbas5/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas5/</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/jbas5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3/jbas5</developerConnection> </scm> <properties> Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-27 16:49:14 UTC (rev 351) +++ trunk/jsfunit/pom.xml 2009-04-27 16:52:29 UTC (rev 352) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR3</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-04-27 16:49:14 UTC (rev 351) +++ trunk/pom.xml 2009-04-27 16:52:29 UTC (rev 352) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR3</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/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_CR3</developerConnection> </scm> <issueManagement>

15 years

1
0
0 / 0

EMBJOPR SVN: r351 - trunk.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-27 12:49:14 -0400 (Mon, 27 Apr 2009) New Revision: 351 Modified: trunk/pom.xml Log: Embedded Jopr build 1.2.0.CR3 (in progress) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-04-27 16:17:22 UTC (rev 350) +++ trunk/pom.xml 2009-04-27 16:49:14 UTC (rev 351) @@ -25,7 +25,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR2</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -64,9 +64,9 @@  <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.6</jaxb-impl.version> - <jopr.version>2.2.0-SNAPSHOT</jopr.version> + <jopr.version>2.2.0.EmbJopr_1_2_0-2</jopr.version> <richfaces.version>3.3.0.GA</richfaces.version> - <rhq.version>1.2.0-SNAPSHOT</rhq.version> + <rhq.version>1.2.0.CR2</rhq.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version> <!-- This is a special patched version of not-yet-released Facelets 1.1.15,

15 years

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: charles.crouch(a)jboss.com Date: 2009-04-27 12:17:22 -0400 (Mon, 27 Apr 2009) New Revision: 350 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java Log: EMBJOPR-166 add support for adding resources to types which werent initially in the nav. Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java 2009-04-27 15:25:46 UTC (rev 349) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java 2009-04-27 16:17:22 UTC (rev 350) @@ -72,7 +72,15 @@ + "] - updating nav tree..."); JONTreeNode parentResourceNode = findNode(getResourcePath(parentResource)); JONTreeNode resourceTypeNode = findNodeByResourceTypeAndParent(typeOfNewResource, parentResourceNode); - resourceTypeNode.reInitializeChildrenMap(); + if (resourceTypeNode == null) { + // the resource type node doesn't exist yet, so lets refresh its parent to give it a chance + // to be generated. This would be the case for non-singleton resource types which started off + // with no children and can't have resource added directly to them, e.g. Embedded EJB deployments. + parentResourceNode.reInitializeChildrenMap(); + } else { + resourceTypeNode.reInitializeChildrenMap(); + } + } @Observer(ResourceManager.RESOURCE_DELETED_EVENT)

15 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits April 2009