May 2009 - embjopr-commits - Jboss List Archives

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:25:32 -0400 (Wed, 20 May 2009) New Revision: 464 Modified: trunk/pom.xml Log: uncomment the jbas4 and jsfunit modules... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-20 21:23:57 UTC (rev 463) +++ trunk/pom.xml 2009-05-20 21:25:32 UTC (rev 464) @@ -123,9 +123,9 @@ <modules> <module>core</module> -  + <module>jbas4</module> <module>jbas5</module> -  + <module>jsfunit</module> </modules> <repositories>

15 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r463 - tags.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:23:57 -0400 (Wed, 20 May 2009) New Revision: 463 Removed: tags/EmbJopr_1_2_0_GA/ Log: oops, need to do this again

15 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r462 - in trunk: core and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:22:48 -0400 (Wed, 20 May 2009) New Revision: 462 Modified: trunk/core/pom.xml trunk/jbas5/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-05-20 21:22:30 UTC (rev 461) +++ trunk/core/pom.xml 2009-05-20 21:22:48 UTC (rev 462) @@ -23,12 +23,12 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.GA</version> + <version>1.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> - <version>1.2.0.GA</version> + <version>1.3.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 @@ -36,8 +36,8 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA/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/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-05-20 21:22:30 UTC (rev 461) +++ trunk/jbas5/pom.xml 2009-05-20 21:22:48 UTC (rev 462) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.GA</version> + <version>1.3.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_GA/jbas5</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA/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/pom.xml =================================================================== --- trunk/pom.xml 2009-05-20 21:22:30 UTC (rev 461) +++ trunk/pom.xml 2009-05-20 21:22:48 UTC (rev 462) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0.GA</version> + <version>1.3.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_GA</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA</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, 7 months

1
0
0 / 0

EMBJOPR SVN: r461 - tags.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:22:30 -0400 (Wed, 20 May 2009) New Revision: 461 Added: tags/EmbJopr_1_2_0_GA/ Log: [maven-scm] copy for tag EmbJopr_1_2_0_GA Copied: tags/EmbJopr_1_2_0_GA (from rev 460, trunk)

15 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r460 - in trunk: core and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:22:26 -0400 (Wed, 20 May 2009) New Revision: 460 Modified: trunk/core/pom.xml trunk/jbas5/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release EmbJopr_1_2_0_GA Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-05-20 21:19:36 UTC (rev 459) +++ trunk/core/pom.xml 2009-05-20 21:22:26 UTC (rev 460) @@ -17,19 +17,18 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<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"> +<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> <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.GA</version> </parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.GA</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 @@ -37,8 +36,8 @@ </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_GA/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA/core</developerConnection> </scm> <properties> @@ -345,7 +344,7 @@ <tasks> <echo>*** Copying updated files from target${file.separator}classes to <jbas4.warDir>${file.separator}WEB-INF${file.separator}classes...</echo> <copy todir="${jbas4.warDir}/WEB-INF/classes"> - <fileset dir="target/classes"/> + <fileset dir="target/classes" /> </copy> <echo>*** Copying updated files from @@ -354,14 +353,14 @@ <jbas4.warDir>... </echo> <copy todir="${jbas4.warDir}"> - <fileset dir="${basedir}/src/main/webapp"/> - <fileset dir="${basedir}/src/main/webappBinary"/> + <fileset dir="${basedir}/src/main/webapp" /> + <fileset dir="${basedir}/src/main/webappBinary" /> </copy>  <echo>*** Touching <jbas4.warDir>/WEB-INF/web.xml to force redeploy... </echo> - <touch file="${jbas4.warDir}/WEB-INF/web.xml"/> + <touch file="${jbas4.warDir}/WEB-INF/web.xml" /> </tasks> </configuration> <goals> @@ -376,7 +375,7 @@ <tasks> <echo>*** Copying updated files from target${file.separator}classes to <jbas5.warDir>${file.separator}WEB-INF${file.separator}classes...</echo> <copy todir="${jbas5.warDir}/WEB-INF/classes"> - <fileset dir="target/classes"/> + <fileset dir="target/classes" /> </copy> <echo>*** Copying updated files from @@ -385,8 +384,8 @@ <jbas5.warDir>... </echo> <copy todir="${jbas5.warDir}"> - <fileset dir="${basedir}/src/main/webapp"/> - <fileset dir="${basedir}/src/main/webappBinary"/> + <fileset dir="${basedir}/src/main/webapp" /> + <fileset dir="${basedir}/src/main/webappBinary" /> </copy>  Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-05-20 21:19:36 UTC (rev 459) +++ trunk/jbas5/pom.xml 2009-05-20 21:22:26 UTC (rev 460) @@ -1,12 +1,11 @@ -<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"> +<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> <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.GA</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -15,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_GA/jbas5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA/jbas5</developerConnection> </scm> <properties> @@ -95,17 +94,9 @@ <configuration> <tasks> <echo>*** Overlaying messages...</echo> - <replaceregexp file="${warDir}/WEB-INF/classes/messages.properties" - match="product.name=(.*)" - replace="product.name=JBoss AS Administration Console" - byline="true"/> - <replaceregexp file="${warDir}/WEB-INF/classes/messages.properties" - match="default.windowTitle=(.*)" - replace="default.windowTitle=JBoss AS Administration Console" - byline="true"/> - <zip destfile="${warFile}" basedir="${warDir}" - includes="WEB-INF/classes/messages.properties" - update="true"/> + <replaceregexp file="${warDir}/WEB-INF/classes/messages.properties" match="product.name=(.*)" replace="product.name=JBoss AS Administration Console" byline="true" /> + <replaceregexp file="${warDir}/WEB-INF/classes/messages.properties" match="default.windowTitle=(.*)" replace="default.windowTitle=JBoss AS Administration Console" byline="true" /> + <zip destfile="${warFile}" basedir="${warDir}" includes="WEB-INF/classes/messages.properties" update="true" /> </tasks> </configuration> <goals> @@ -156,18 +147,17 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.dir" location="${warDeployDir}"/> + <property name="deployment.dir" location="${warDeployDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName} to <warDir>... </echo> - <touch file="${basedir}/target/${project.build.finalName}/WEB-INF/classes/messages.properties"/> + <touch file="${basedir}/target/${project.build.finalName}/WEB-INF/classes/messages.properties" /> <copy todir="${deployment.dir}" verbose="${embedded.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}"/> + <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - <unjar src="${project.build.directory}/${project.build.finalName}.war" - dest="${deployment.dir}"> + <unjar src="${project.build.directory}/${project.build.finalName}.war" dest="${deployment.dir}"> <patternset> - <include name="META-INF/**"/> + <include name="META-INF/**" /> </patternset> </unjar> @@ -187,9 +177,9 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.dir" location="${warDeployDir}"/> + <property name="deployment.dir" location="${warDeployDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}"/> + <delete dir="${deployment.dir}" /> </tasks> </configuration> <goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-20 21:19:36 UTC (rev 459) +++ trunk/pom.xml 2009-05-20 21:22:26 UTC (rev 460) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.GA</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_GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_2_0_GA</developerConnection> </scm> <issueManagement>

15 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r459 - trunk.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:19:36 -0400 (Wed, 20 May 2009) New Revision: 459 Modified: trunk/pom.xml Log: update RHQ and Jopr versions for 1.2.0.GA release Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-20 21:10:36 UTC (rev 458) +++ trunk/pom.xml 2009-05-20 21:19:36 UTC (rev 459) @@ -25,7 +25,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.0.EmbJopr.1_2_0-1</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.3.0-SNAPSHOT</jopr.version> + <jopr.version>2.3.0.EmbJopr.1.2.0-1</jopr.version> <richfaces.version>3.3.0.GA</richfaces.version> - <rhq.version>1.3.0-SNAPSHOT</rhq.version> + <rhq.version>1.3.0.EmbJopr.1_2_0-1</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, 7 months

1
0
0 / 0

EMBJOPR SVN: r458 - in trunk: core and 5 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-05-20 17:10:36 -0400 (Wed, 20 May 2009) New Revision: 458 Added: trunk/core/src/main/webappBinary/images/header.png Removed: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif Modified: trunk/core/pom.xml trunk/core/src/main/webapp/css/console-style.css trunk/core/src/main/webapp/include/footer.xhtml trunk/core/src/main/webapp/include/header.xhtml trunk/core/src/main/webapp/login.xhtml trunk/jbas5/pom.xml trunk/pom.xml Log: rebrand header and footer for AS5 admin-console Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/core/pom.xml 2009-05-20 21:10:36 UTC (rev 458) @@ -43,7 +43,7 @@ <properties> <war.dir>${basedir}/target/${project.build.finalName}</war.dir> - <product.name>${project.name}</product.name> + <product.name>Embedded Jopr</product.name> <product.version>${project.version}</product.version> </properties> Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/core/src/main/webapp/css/console-style.css 2009-05-20 21:10:36 UTC (rev 458) @@ -157,6 +157,11 @@ /* -------------------- this is the content container ----------------------------- */ +.headerText { + font-size: 24px; + font-weight: normal; +} + .tabmenubox { font: 0.9em / 1.3em "Lucida Grand", Verdana, sans-serif; text-align: left; Modified: trunk/core/src/main/webapp/include/footer.xhtml =================================================================== --- trunk/core/src/main/webapp/include/footer.xhtml 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/core/src/main/webapp/include/footer.xhtml 2009-05-20 21:10:36 UTC (rev 458) @@ -35,7 +35,8 @@ <div id="footer"> <h:outputText escape="false" value="#{messages['product.name']} #{messages['product.version']}"/> <h:outputText escape="false" value=" (r#{messages['product.buildNumber']})" - rendered="#{not empty messages['product.buildNumber']}"/> + rendered="#{not empty messages['product.buildNumber']}"/> + - Powered by <a href="http://jboss.org/embjopr/" title="Embedded Jopr">Embedded Jopr</a> <br/> <h:outputText escape="false" value="#{messages['product.copyright']}"/> </div> Modified: trunk/core/src/main/webapp/include/header.xhtml =================================================================== --- trunk/core/src/main/webapp/include/header.xhtml 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/core/src/main/webapp/include/header.xhtml 2009-05-20 21:10:36 UTC (rev 458) @@ -34,9 +34,14 @@ <ui:composition> <div id="pageheader"> <div class="floatleft"> - <h:outputLink value="http://jboss.org/embjopr/"> - <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/> - </h:outputLink> + <h:panelGrid columns="2"> + <h:outputLink value="http://jboss.org/embjopr/"> + <h:graphicImage value="images/header.png" alt="Embedded Jopr"/> + </h:outputLink> + <h:panelGroup styleClass="headerText"> + #{messages['product.name']} + </h:panelGroup> + </h:panelGrid> </div> <div class="login"> <h:outputText rendered="#{not empty identity.username}"> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/core/src/main/webapp/login.xhtml 2009-05-20 21:10:36 UTC (rev 458) @@ -46,9 +46,14 @@ <div align="center" class="container"> <div id="pageheader"> <div class="floatleft"> - <h:outputLink value="http://jboss.org/embjopr/"> - <h:graphicImage value="images/hdr_embeddedjopr_hori.gif" alt="Embedded Jopr"/> - </h:outputLink> + <h:panelGrid columns="2"> + <h:outputLink value="http://jboss.org/embjopr/"> + <h:graphicImage value="images/header.png" alt="Embedded Jopr"/> + </h:outputLink> + <h:panelGroup styleClass="headerText"> + #{messages['product.name']} + </h:panelGroup> + </h:panelGrid> </div> <div class="login"><a href="#">#{messages['help.link']}</a><br/></div> </div> @@ -56,7 +61,7 @@ <h:messages layout="table" styleClass="loginerror-msg"/> <h:form id="login_form"> <div> - <h2>Welcome to the JBoss Administration Console.</h2> + <h2>Welcome to the #{messages['product.name']}.</h2> <h2>Please login to proceed.</h2> Deleted: trunk/core/src/main/webappBinary/images/hdr_embeddedjopr_hori.gif =================================================================== (Binary files differ) Added: trunk/core/src/main/webappBinary/images/header.png =================================================================== (Binary files differ) Property changes on: trunk/core/src/main/webappBinary/images/header.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/jbas5/pom.xml 2009-05-20 21:10:36 UTC (rev 458) @@ -87,27 +87,51 @@ </configuration> </plugin> -  + </plugins> </build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-20 19:06:04 UTC (rev 457) +++ trunk/pom.xml 2009-05-20 21:10:36 UTC (rev 458) @@ -96,15 +96,36 @@ </archive> </configuration> </plugin> - + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-apache-regexp</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <artifactId>jakarta-regexp</artifactId> + <groupId>jakarta-regexp</groupId> + <version>1.4</version> + </dependency> + </dependencies> + </plugin> + </plugins> </build> <modules> <module>core</module> - <module>jbas4</module> +  <module>jbas5</module> - <module>jsfunit</module> +  </modules> <repositories>

15 years, 7 months

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-05-20 15:06:04 -0400 (Wed, 20 May 2009) New Revision: 457 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java Log: testEarDeployFineThenRedeployMalformedDescriptor() updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-20 16:28:17 UTC (rev 456) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-20 19:06:04 UTC (rev 457) @@ -244,8 +244,13 @@ ejtt.deployment.deployViaEmbJopr(APP_TYPE, tmpFilePath); // We should get an error message. - checkClientAndServerMessages("Failed to create Resource", "Failed to create Resource", true); + checkClientAndServerMessages("Failed to update", "Failed to update", true); + // The error message should say that the original EAR was rolled back. + String rolledBackMsg = "ROLLED BACK TO ORIGINAL APPLICATION FILE."; + checkClientAndServerMessages(rolledBackMsg, rolledBackMsg, true); + + // The original EAR should remain deployed. if( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME)){ ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME); @@ -254,6 +259,9 @@ throw new EmbJoprTestException("The original EAR should remain deployed " + "after unsuccessful deployment of bad version of the same EAR."); } + + // Undeploy the original app. + ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME); } finally {

15 years, 7 months

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-05-20 12:28:17 -0400 (Wed, 20 May 2009) New Revision: 456 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java Log: AppConstants updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-05-20 15:19:08 UTC (rev 455) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-05-20 16:28:17 UTC (rev 456) @@ -116,6 +116,8 @@ public static final String NAV_EMB_RAR = "Embedded Resource Adapter (RAR)s"; public static final String EAR_MALFORMED_APP_FILENAME = "malformed-application-xml.ear"; + public static final String EAR_MALFORMED_APP_FILENAME_2 = "malformed-application-xml-2.ear"; + public static final String EAR_NOT_MALFORMED_APP_FILENAME = "not-malformed-application-xml.ear"; public static final String WAR_FILENAME_MALFORMED_APP = "malformed-web-xml.war"; // Test Archives @@ -165,7 +167,9 @@ public static final String WAR_UNPACKED = "unpacked-web1.war"; public static final String WAR_UNPACKED_ZIP = "unpacked-web1.war.zip"; + public static final String WAR_VIRTUAL_HOSTS = "vhosts-test.war"; + // RAR public static final String BASIC_RAR = "jbosstestadapter.rar";

15 years, 7 months

1
0
0 / 0

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

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-05-20 11:19:08 -0400 (Wed, 20 May 2009) New Revision: 455 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java Log: EarTest updated - added testEarDeployFineThenRedeployMalformedDescriptor(). Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-20 14:00:24 UTC (rev 454) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-20 15:19:08 UTC (rev 455) @@ -107,7 +107,6 @@ deployEar( earFilePath ); String expectedMessage = DEPLOYABLE_NAME + " created successfully"; - checkClientAndServerMessages(expectedMessage, expectedMessage, false); // Use JMX to assert that the EAR components really did deploy successfully. @@ -202,7 +201,7 @@ if( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME)){ ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME); - throw new EmbJoprTestException("An EAR witt malformed descriptor " + + throw new EmbJoprTestException("An EAR with malformed descriptor " + "stays deployed after the deployment failed."); } } @@ -213,7 +212,61 @@ + /** + * TODO: + * 1) Deploy a valid EAR with a war in it (to check it's functionality). + * 2) In the Control tab, update it with an EAR with malformed descriptor. + * 3) Check that the error message contains "***** ROLLED BACK TO ORIGINAL APPLICATION FILE. *****" + * 4) Check that the embedded WAR works to verify the rollback. + * + */ + public void testEarDeployFineThenRedeployMalformedDescriptor() throws IOException, EmbJoprTestException { + final String DEPLOYABLE_NAME = EAR_NOT_MALFORMED_APP_FILENAME; + final String DEPLOYABLE_2_NAME = EAR_MALFORMED_APP_FILENAME_2; + + try { + // Deploy first deployable - the correct one. + + String earFilePath = ejtt.getTestDataDir() + "/ear/"+DEPLOYABLE_NAME; + //deployEar(earFilePath); + ejtt.deployment.deployViaEmbJopr(APP_TYPE, earFilePath); + + String expectedMessage = DEPLOYABLE_NAME + " created successfully"; + checkClientAndServerMessages(expectedMessage, expectedMessage, false); + + + // Redeploy new version with malformed application.xml in the Content tab. + + earFilePath = ejtt.getTestDataDir() + "/ear/"+DEPLOYABLE_2_NAME; + String tmpFilePath = ejtt.getTempDir()+'/'+DEPLOYABLE_NAME; + FileUtils.copyFile( new File(earFilePath), new File(tmpFilePath) ); + ejtt.deployment.deployViaEmbJopr(APP_TYPE, tmpFilePath); + + // We should get an error message. + checkClientAndServerMessages("Failed to create Resource", "Failed to create Resource", true); + + // The original EAR should remain deployed. + if( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME)){ + ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME); + } + else{ + throw new EmbJoprTestException("The original EAR should remain deployed " + + "after unsuccessful deployment of bad version of the same EAR."); + } + } + finally { + + } + } + + + + + + + + /** * assertion: @@ -357,14 +410,18 @@ */ public void testEarSummaryTab() throws EmbJoprTestException, IOException, Exception { + final String DEPLOYABLE_NAME = BASIC_EAR; + final int DEPLOY_TIMEOUT_SEC = 20; // Deploy the EAR - String earFilePath = System.getProperty(SYSPROP_TESTDATA_DIR) + "/ear/"+BASIC_EAR; - deployEar( earFilePath ); + String earFilePath = ejtt.getTestDataDir() + "/ear/"+DEPLOYABLE_NAME; + //deployEar( earFilePath ); + ejtt.deployment.deployViaEmbJopr(APP_TYPE, earFilePath); try { + /* // Wait until the EAR appears... new ActiveConditionChecker(new DescribedCondition("EAR appears in Summary tab list") { public boolean isTrue() throws Exception { @@ -373,7 +430,7 @@ ContentTableRow earRow = ejtt.getDefaultContentTable().findFirstRowContainingLink(BASIC_EAR); return null != earRow; } - }).dumpPageOnTimeout(this).throwOnTimeout().waitWithTimeout(2000, 5); + }).dumpPageOnTimeout(this).throwOnTimeout().waitWithTimeout(2000, 10); ContentTableRow earRow = ejtt.getDefaultContentTable().getFirstRowContainingLink(BASIC_EAR); @@ -396,9 +453,12 @@ throw new EmbJoprTestException("EAR "+BASIC_EAR+" not UP after "+DEPLOY_TIMEOUT_SEC+" seconds."); } } while( true ); + /**/ + ejtt.deployment.waitActivelyForDeployment(APP_TYPE, DEPLOYABLE_NAME, 2000, 10); // FAILS because of EMBJOPR-80. - earRow.getLinkByLabel(BASIC_EAR).click(); + ContentTableRow earRow = ejtt.getDefaultContentTable().getFirstRowContainingLink(DEPLOYABLE_NAME); + earRow.getLinkByLabel(DEPLOYABLE_NAME).click(); // Check the values in info table(s) @@ -408,7 +468,7 @@ ContentInfoTable infoTable = ejtt.getContentInfoTable( genpropTable ); Properties props = infoTable.getProperties(); - assertEquals(BASIC_EAR, props.getProperty("Name").trim()); + assertEquals(DEPLOYABLE_NAME, props.getProperty("Name").trim()); //assertEquals("?", props.getProperty("Version")); // TODO: Where does RHQ get the version from? // TODO: Fill JIRA? Description of EAR should be taken from application.xml <display-name> //assertEquals("JBossTest Ear Deployment Testsuite", props.getProperty("Description")); @@ -420,7 +480,7 @@ props = infoTable.getProperties(); - String path = ejtt.getDeployDir()+"/"+BASIC_EAR; + String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME; assertEquals(path, props.getProperty("Path").trim()); assertEquals("no", props.getProperty("Exploded?").trim()); @@ -434,7 +494,7 @@ } finally { try { - undeployEar(BASIC_EAR); + undeployEar(DEPLOYABLE_NAME); }catch( Exception ex ){ log.error("Caught exception when undeploying: "+ex, ex); }

15 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits May 2009