February 2010 - embjopr-commits - Jboss List Archives

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2010-02-22 13:49:48 -0500 (Mon, 22 Feb 2010) New Revision: 880 Modified: trunk/pom.xml Log: EMBJOPR-285 - upgrade to use RF 3.3.3.CR1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-11 19:00:14 UTC (rev 879) +++ trunk/pom.xml 2010-02-22 18:49:48 UTC (rev 880) @@ -64,9 +64,9 @@  <jaxb.version>2.1.9</jaxb.version> - <jboss.web.version>3.0.0-beta-1</jboss.web.version> + <jboss.web.version>3.0.0-beta-2</jboss.web.version> <jopr.version>1.4.0.B01</jopr.version> - <richfaces.version>3.3.3.BETA1</richfaces.version> + <richfaces.version>3.3.3.CR1</richfaces.version> <rhq.version>1.4.0.B01</rhq.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version>

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r879 - in trunk: core and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: jayshaughnessy Date: 2010-02-11 14:00:14 -0500 (Thu, 11 Feb 2010) New Revision: 879 Modified: trunk/core/pom.xml trunk/jbas4/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 2010-02-11 18:59:55 UTC (rev 878) +++ trunk/core/pom.xml 2010-02-11 19:00:14 UTC (rev 879) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0.B01</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -35,9 +35,9 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/core</developerConnection> - <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1/jopr-embedded-co...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/core/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/core/</developerConnection> + <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=tree/jopr-embedded-paren...</url> </scm> <properties> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2010-02-11 18:59:55 UTC (rev 878) +++ trunk/jbas4/pom.xml 2010-02-11 19:00:14 UTC (rev 879) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0.B01</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,9 +14,9 @@ <name>JBossAS 4.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/j...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/jbas4</developerConnection> - <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1/jopr-embedded-jb...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas4/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas4/</developerConnection> + <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=tree/jopr-embedded-paren...</url> </scm> <properties> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2010-02-11 18:59:55 UTC (rev 878) +++ trunk/jbas5/pom.xml 2010-02-11 19:00:14 UTC (rev 879) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0.B01</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,9 +14,9 @@ <name>JBossAS 5.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/j...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/jbas5</developerConnection> - <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1/jopr-embedded-jb...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas5/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas5/</developerConnection> + <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=tree/jopr-embedded-paren...</url> </scm> <properties> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-11 18:59:55 UTC (rev 878) +++ trunk/pom.xml 2010-02-11 19:00:14 UTC (rev 879) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0.B01</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> @@ -42,9 +42,9 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1</developerConnection> - <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1?p=rhq/rhq.git;a=...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/</developerConnection> + <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=tree/jopr-embedded-parent</url> </scm> <issueManagement>

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r878 - tags.

by embjopr-commits＠lists.jboss.org

Author: jayshaughnessy Date: 2010-02-11 13:59:55 -0500 (Thu, 11 Feb 2010) New Revision: 878 Added: tags/EmbJopr_1_4_0_Beta1/ Log: [maven-scm] copy for tag EmbJopr_1_4_0_Beta1 Copied: tags/EmbJopr_1_4_0_Beta1 (from rev 877, trunk)

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r877 - in trunk: core and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: jayshaughnessy Date: 2010-02-11 13:59:39 -0500 (Thu, 11 Feb 2010) New Revision: 877 Modified: trunk/core/pom.xml trunk/jbas4/pom.xml trunk/jbas5/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release EmbJopr_1_4_0_Beta1 Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2010-02-09 20:31:16 UTC (rev 876) +++ trunk/core/pom.xml 2010-02-11 18:59:39 UTC (rev 877) @@ -1,432 +1,433 @@ - -<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.4.0-SNAPSHOT</version> - </parent> - - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-core</artifactId> - <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> - </scm> - - <properties> - <war.dir>${basedir}/target/${project.build.finalName}</war.dir> - <product.name>Embedded Jopr</product.name> - <product.version>${project.version}</product.version> - </properties> - - <dependencies> -  - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-client-api</artifactId> - <version>${rhq.version}</version> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${rhq.version}</version> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-gui</artifactId> - <version>${rhq.version}</version> - <exclusions> - <exclusion> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-plugin-container</artifactId> - <version>${rhq.version}</version> - <exclusions> - <exclusion> - <groupId>org.hyperic</groupId> - <artifactId>sigar</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-util</artifactId> - <version>${rhq.version}</version> - </dependency> - -  - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>${seam.version}</version> -  - <exclusions> - <exclusion> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam-jul</artifactId> - </exclusion> - </exclusions> - </dependency> -  - <dependency> - <groupId>${seam.embedded.groupId}</groupId> - <artifactId>jboss-embedded-all</artifactId> - <version>${seam.embedded.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${seam.embedded.groupId}</groupId> - <artifactId>thirdparty-all</artifactId> - <version>${seam.embedded.version}</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.11.0.GA</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>org.hibernate.java-persistence</groupId> - <artifactId>jpa-api</artifactId> - <version>2.0-cr-1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.5.0-Beta-2</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator-legacy</artifactId> - <version>4.0.2.GA</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - <scope>provided</scope> -  - </dependency> -  - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam-debug</artifactId> - <version>${seam.version}</version> -  - <exclusions> - <exclusion> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </exclusion> - </exclusions> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.2-FCS</version> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>jboss.web</groupId> - <artifactId>el-api</artifactId> - <version>${jboss.web.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>${facelets.version}</version> - <scope>runtime</scope> - </dependency> - -  - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${richfaces.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl-jsf2</artifactId> - <version>${richfaces.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${richfaces.version}</version> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>jboss.web</groupId> - <artifactId>servlet-api</artifactId> - <version>3.0.0-beta-1</version> - <scope>provided</scope> -  - </dependency> - <dependency> - <groupId>jboss.web</groupId> - <artifactId>jsp-api</artifactId> - <version>3.0.0-beta-1</version> - <scope>provided</scope> -  - </dependency> -  - <dependency> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb.version}</version> - <scope>provided</scope> - </dependency> -  - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - <executions> - <execution> - <id>copy-dist-plugins</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${war.dir}/plugins</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-platform-plugin</artifactId> - <version>${rhq.version}</version> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <useCache>false</useCache> - <webResources> - <resource> - <filtering>true</filtering> - <directory>${basedir}/src/main/webapp</directory> - </resource> - <resource> - <directory>${basedir}/src/main/webappBinary</directory> - </resource> - </webResources> - <archiveClasses>true</archiveClasses> - <attachClasses>true</attachClasses> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> -  - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.library.path=target/itest/lib</argLine> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - - </plugins> - </build> - - <repositories> -  -  - </repositories> - - <profiles> - <profile> - <id>dev</id> - - <properties> - <jbas4.warDir>${jbas4.configDir}/deploy/${jbas4.finalName}.war</jbas4.warDir> - <jbas5.warDir>${jbas5.configDir}/deploy/${jbas5.finalName}.war</jbas5.warDir> - </properties> - - <build> - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - <executions> - - <execution> - <id>deploy-to-jbas4</id> - <phase>compile</phase> - <configuration> - <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" /> - </copy> - - <echo>*** Copying updated files from - src${file.separator}main${file.separator}webapp${file.separator} and - src${file.separator}main${file.separator}webappBinary${file.separator} to - <jbas4.warDir>... - </echo> - <copy todir="${jbas4.warDir}"> - <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" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>deploy-to-jbas5</id> - <phase>compile</phase> - <configuration> - <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" /> - </copy> - - <echo>*** Copying updated files from - src${file.separator}main${file.separator}webapp${file.separator} and - src${file.separator}main${file.separator}webappBinary${file.separator} to - <jbas5.warDir>... - </echo> - <copy todir="${jbas5.warDir}"> - <fileset dir="${basedir}/src/main/webapp" /> - <fileset dir="${basedir}/src/main/webappBinary" /> - </copy> -  - -  - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> - -</project> + +<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.4.0.B01</version> + </parent> + + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-core</artifactId> + <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_4_0_Beta1/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/core</developerConnection> + <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1/jopr-embedded-co...</url> + </scm> + + <properties> + <war.dir>${basedir}/target/${project.build.finalName}</war.dir> + <product.name>Embedded Jopr</product.name> + <product.version>${project.version}</product.version> + </properties> + + <dependencies> +  + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-client-api</artifactId> + <version>${rhq.version}</version> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${rhq.version}</version> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-gui</artifactId> + <version>${rhq.version}</version> + <exclusions> + <exclusion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-plugin-container</artifactId> + <version>${rhq.version}</version> + <exclusions> + <exclusion> + <groupId>org.hyperic</groupId> + <artifactId>sigar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${rhq.version}</version> + </dependency> + +  + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam</artifactId> + <version>${seam.version}</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${seam.version}</version> +  + <exclusions> + <exclusion> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam-jul</artifactId> + </exclusion> + </exclusions> + </dependency> +  + <dependency> + <groupId>${seam.embedded.groupId}</groupId> + <artifactId>jboss-embedded-all</artifactId> + <version>${seam.embedded.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${seam.embedded.groupId}</groupId> + <artifactId>thirdparty-all</artifactId> + <version>${seam.embedded.version}</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.11.0.GA</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.hibernate.java-persistence</groupId> + <artifactId>jpa-api</artifactId> + <version>2.0-cr-1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.5.0-Beta-2</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator-legacy</artifactId> + <version>4.0.2.GA</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.2.GA</version> + <scope>provided</scope> +  + </dependency> +  + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${seam.version}</version> +  + <exclusions> + <exclusion> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + </exclusion> + </exclusions> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2-FCS</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>jboss.web</groupId> + <artifactId>el-api</artifactId> + <version>${jboss.web.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>${facelets.version}</version> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richfaces.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl-jsf2</artifactId> + <version>${richfaces.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${richfaces.version}</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>jboss.web</groupId> + <artifactId>servlet-api</artifactId> + <version>3.0.0-beta-1</version> + <scope>provided</scope> +  + </dependency> + <dependency> + <groupId>jboss.web</groupId> + <artifactId>jsp-api</artifactId> + <version>3.0.0-beta-1</version> + <scope>provided</scope> +  + </dependency> +  + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.version}</version> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.0</version> + <executions> + <execution> + <id>copy-dist-plugins</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${war.dir}/plugins</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-platform-plugin</artifactId> + <version>${rhq.version}</version> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <useCache>false</useCache> + <webResources> + <resource> + <filtering>true</filtering> + <directory>${basedir}/src/main/webapp</directory> + </resource> + <resource> + <directory>${basedir}/src/main/webappBinary</directory> + </resource> + </webResources> + <archiveClasses>true</archiveClasses> + <attachClasses>true</attachClasses> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> +  + <Build-Number>${buildNumber}</Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.library.path=target/itest/lib</argLine> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + + </plugins> + </build> + + <repositories> +  +  + </repositories> + + <profiles> + <profile> + <id>dev</id> + + <properties> + <jbas4.warDir>${jbas4.configDir}/deploy/${jbas4.finalName}.war</jbas4.warDir> + <jbas5.warDir>${jbas5.configDir}/deploy/${jbas5.finalName}.war</jbas5.warDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy-to-jbas4</id> + <phase>compile</phase> + <configuration> + <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" /> + </copy> + + <echo>*** Copying updated files from + src${file.separator}main${file.separator}webapp${file.separator} and + src${file.separator}main${file.separator}webappBinary${file.separator} to + <jbas4.warDir>... + </echo> + <copy todir="${jbas4.warDir}"> + <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" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>deploy-to-jbas5</id> + <phase>compile</phase> + <configuration> + <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" /> + </copy> + + <echo>*** Copying updated files from + src${file.separator}main${file.separator}webapp${file.separator} and + src${file.separator}main${file.separator}webappBinary${file.separator} to + <jbas5.warDir>... + </echo> + <copy todir="${jbas5.warDir}"> + <fileset dir="${basedir}/src/main/webapp" /> + <fileset dir="${basedir}/src/main/webappBinary" /> + </copy> +  + +  + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> + +</project> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2010-02-09 20:31:16 UTC (rev 876) +++ trunk/jbas4/pom.xml 2010-02-11 18:59:39 UTC (rev 877) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0.B01</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,9 +14,10 @@ <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> - </scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/j...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/jbas4</developerConnection> + <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1/jopr-embedded-jb...</url> + </scm> <properties> <warDir>${basedir}/target/${project.build.finalName}</warDir> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2010-02-09 20:31:16 UTC (rev 876) +++ trunk/jbas5/pom.xml 2010-02-11 18:59:39 UTC (rev 877) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0.B01</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -14,9 +14,10 @@ <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> - </scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/j...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1/jbas5</developerConnection> + <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1/jopr-embedded-jb...</url> + </scm> <properties> <warDir>${basedir}/target/${project.build.finalName}</warDir> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-09 20:31:16 UTC (rev 876) +++ trunk/pom.xml 2010-02-11 18:59:39 UTC (rev 877) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0.B01</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,9 +42,10 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/</developerConnection> - </scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/EmbJopr_1_4_0_Beta1</developerConnection> + <url>http://git.fedorahosted.org/git/tags/EmbJopr_1_4_0_Beta1?p=rhq/rhq.git;a=...</url> + </scm> <issueManagement> <system>jira</system>

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r876 - trunk/core/src/main/webapp/WEB-INF.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-02-09 15:31:16 -0500 (Tue, 09 Feb 2010) New Revision: 876 Modified: trunk/core/src/main/webapp/WEB-INF/pages.xml Log: fix for https://jira.jboss.org/jira/browse/EMBJOPR-281 Modified: trunk/core/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/pages.xml 2010-02-09 20:25:36 UTC (rev 875) +++ trunk/core/src/main/webapp/WEB-INF/pages.xml 2010-02-09 20:31:16 UTC (rev 876) @@ -180,12 +180,32 @@ <page view-id="/secure/resourceInstanceContent.xhtml">  <action execute="#{updateBackingContentAction.init()}"/> + + <navigation from-action="#{updateBackingContentAction.init()}"> + <rule if-outcome="success"> + <render view-id="/secure/resourceInstanceContent.xhtml"/> + </rule> + <rule if-outcome="failure"> + <redirect view-id="/secure/summary.xhtml"/> + </rule> + </navigation> </page> <page view-id="*"> <action execute="#{debugAction.init()}"/> <action execute="#{discoveryAction.checkAutodiscovery()}"/> +  + <navigation> + <rule if-outcome="success"> + <render view-id=""/> + </rule> + <rule if-outcome="failure"> + <render view-id=""/> + </rule> + </navigation> +  <navigation from-action="#{identity.logout}"> <redirect view-id="/index.xhtml"/>

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r875 - in trunk/core/src/main/webapp: WEB-INF/facelets and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-02-09 15:25:36 -0500 (Tue, 09 Feb 2010) New Revision: 875 Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml trunk/core/src/main/webapp/login.xhtml trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml Log: fix for https://jira.jboss.org/jira/browse/EMBJOPR-286; use #{credentials.username} and #{credentials.password}, rather than the deprecated #{identity.username} and #{identity.password} Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formDropDownComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -57,7 +57,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{requiredLabel}"/> - <h:outputText rendered="#{defaultRendered}">#{default} </h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default} </h:panelGroup> <h:selectOneMenu id="#{identifier}" value="#{beanValue}" required="#{required}"> <f:selectItems value="#{itemValues}"></f:selectItems> </h:selectOneMenu> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formRadioComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/> - <h:outputText rendered="#{defaultRendered}">#{default} </h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default} </h:panelGroup>   <h:selectOneRadio id="#{identifier}" value="#{beanValue}" layout="pageDirection" styleClass="radiolabels"> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formSecretComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/> - <h:outputText rendered="#{defaultRendered}">#{default} </h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default} </h:panelGroup> <h:inputSecret id="#{identifier}" value="#{beanValue}"/> #{label}:#{desc} Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/> - <h:outputText rendered="#{defaultRendered}">#{default} </h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default} </h:panelGroup>  <h:inputTextarea id="#{identifier}" value="#{beanValue}" rows="5" cols="50"/> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextAreaConverterComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/> - <h:outputText rendered="#{defaultRendered}">#{default} </h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default} </h:panelGroup>  <h:inputTextarea id="#{identifier}" value="#{beanValue}" rows="5" cols="50"> <f:converter converterId="#{converter}"/> Modified: trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/formTextComponent.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,7 +56,7 @@ <ui:composition> <h:panelGroup rendered="#{rendered}"> <h:outputLabel value="#{label} #{required}"/> - <h:outputText rendered="#{defaultRendered}">#{default} </h:outputText> + <h:panelGroup rendered="#{defaultRendered}">#{default} </h:panelGroup> <h:inputText id="#{identifier}" value="#{beanValue}"/> #{label}:#{desc} Modified: trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -1,7 +1,7 @@ <?xml version="1.0"?>  | [<a href="#">#{messages['help.link']}</a>] </ui:remove> - <h:outputText rendered="#{debug}"> + <h:panelGroup rendered="#{debug}"> | [<s:link action="#{debugAction.dumpInventory()}">#{messages['debugAction.dumpInventory']}</s:link>] | @@ -66,7 +66,7 @@ [<s:link action="#{debugAction.runServiceScan()}">#{messages['debugAction.runServiceScan']}</s:link>] | [<s:link action="#{debugAction.testErrorPage()}">#{messages['debugAction.testErrorPage']}</s:link>] - </h:outputText> + </h:panelGroup> </div> </div> </ui:composition> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/login.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!-- ~ Embedded Jopr Project - ~ Copyright (C) 2006-2009 Red Hat, Inc. + ~ Copyright (C) 2006-2010 Red Hat, Inc. ~ All rights reserved. ~ ~ This program is free software; you can redistribute it and/or modify @@ -65,12 +65,12 @@ #{messages['login.loginToProceed']} <h:outputLabel for="name" value="#{messages['security.username']}"/> - <h:inputText id="name" value="#{identity.username}" size="20"/> + <h:inputText id="name" value="#{credentials.username}" size="20"/> </div> <div style="padding-top: 10px;"> <h:outputLabel for="password" value="#{messages['security.password']}"/> - <h:inputSecret id="password" value="#{identity.password}" size="20"/> + <h:inputSecret id="password" value="#{credentials.password}" size="20"/> </div> <div style="padding-top: 10px;"> <h:commandButton value="#{messages['security.login']}" id="submit" Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -68,8 +68,6 @@ <rich:columnGroup styleClass="#{operationAction.getOperationRowStyleClass(operation)}"> <rich:column styleClass="buttonColumn"> - - <f:facet name="footer"><h:outputText>footer1</h:outputText></f:facet> <s:button value="#{operation.displayName}" action="#{operationAction.invokeOperation()}" styleClass="buttonmed" style="margin-right:40px;"> @@ -77,8 +75,6 @@ </s:button> </rich:column> <rich:column styleClass="descripColumn"> - <f:facet name="header"><h:outputText>header2</h:outputText></f:facet> - <f:facet name="footer"><h:outputText>footer2</h:outputText></f:facet> <h:outputText value="#{operation.description}"/> </rich:column> </rich:columnGroup> Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2010-02-08 20:13:20 UTC (rev 874) +++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2010-02-09 20:25:36 UTC (rev 875) @@ -56,15 +56,13 @@ #{messages['summary.resourceInstance.configuration.version']} - <h:outputText rendered="#{not empty currentResource.version}">#{currentResource.version}</h:outputText> - <h:outputText rendered="#{empty currentResource.version}">--</h:outputText> + <h:outputText value="#{empty currentResource.version ? '--' : currentResource.version}"/> </h:panelGroup> <h:panelGroup layout="block"> #{messages['summary.resourceInstance.configuration.description']} - <h:outputText rendered="#{not empty currentResource.description}">#{currentResource.description}</h:outputText> - <h:outputText rendered="#{empty currentResource.description}">--</h:outputText> + <h:outputText value="#{empty currentResource.description ? '--' : currentResource.description}"/> </h:panelGroup> </h:panelGrid>

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r874 - in trunk/jsfunit: testdata and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2010-02-08 15:13:20 -0500 (Mon, 08 Feb 2010) New Revision: 874 Added: trunk/jsfunit/testdata/jboss6-configuration/ trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml Removed: trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-log4j.xml Modified: trunk/jsfunit/pom.xml trunk/jsfunit/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml Log: EMBJOPR-283 - first pass at tests against 6.0.0.M2 Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2010-02-05 20:22:05 UTC (rev 873) +++ trunk/jsfunit/pom.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -9,6 +9,7 @@ <mavenConflictResolvers>newest,nearest</mavenConflictResolvers> <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version> + <cargo.plugin.version.as6>1.0.1-alpha-2</cargo.plugin.version.as6> <jvm.args.debug></jvm.args.debug>  <jvm.args.profiler></jvm.args.profiler>  <jvm.args.exposejmx></jvm.args.exposejmx>  @@ -138,19 +139,19 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.1-FCS</version>  + <version>2.0.2-FCS</version>  <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-j2se</artifactId> - <version>5.1.0.GA</version>  + <version>6.0.0.M1</version>  <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version>  + <version>3.0.0-beta-2</version>  <scope>provided</scope> </dependency> <dependency> @@ -178,25 +179,30 @@ <dependency> <groupId>org.jboss.integration</groupId> <artifactId>jboss-profileservice-spi</artifactId> - <version>5.1.0.GA</version>  + <version>6.0.0-Alpha8</version>  <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-metatype</artifactId> - <version>2.1.1.GA</version>  + <version>2.1.1.SP1</version>  <scope>provided</scope> </dependency> <dependency> <groupId>jboss.messaging</groupId> <artifactId>jboss-messaging-client</artifactId> - <version>1.4.3.GA</version> + <version>1.4.6.GA</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss.messaging</groupId> <artifactId>jboss-messaging</artifactId> - <version>1.4.3.GA</version> + <version>1.4.6.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -703,6 +709,367 @@ </build> </profile> +  + <profile> + <id>jboss6x</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.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>extract_war_for_cargo</id> + <phase>package</phase> <goals><goal>run</goal></goals> + <configuration><tasks> + <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}" + 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> +  + <execution> + <id>rename-the-artifact-back</id> + <phase>post-integration-test</phase> <goals><goal>run</goal></goals> + <configuration><tasks> + <echo>Renaming exploded war and renaming the zip back to the artifact name.</echo> + <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}" toFile="${project.build.directory}/${project.build.finalName}_exploded.${project.packaging}"/> + <move file="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}" + toFile="${project.build.directory}/${project.build.finalName}.${project.packaging}"/> + </tasks></configuration> + </execution> + </executions> + </plugin> + +  + + +  + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargo.plugin.version.as6}</version> + <configuration> + <wait>false</wait> + <container> + <containerId>jboss6x</containerId> + <home>${JBOSS_HOME}</home>  + <log>${basedir}/target/jboss6.x.logs/cargo.log</log> + <timeout>420000</timeout>  + <systemProperties> +  + <jboss.server.log.threshold>ALL</jboss.server.log.threshold> +  + <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> + <jsfunit.tempdir>${basedir}/target/jboss6x/tmp</jsfunit.tempdir> + <jsfunit.deploy.dir>${basedir}/target/jboss6x/deploy</jsfunit.deploy.dir> + <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> +  +  + <jsfunit.jboss.home.dir>${basedir}/target/jboss6x</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>  + <jopr.version>${jopr.version}</jopr.version> + </systemProperties> + </container> + +  + <configuration> +  +  + <type>standalone</type> + <home>target/jboss6x</home> + <properties> + <cargo.java.home>${JAVA_HOME}</cargo.java.home> +  +  +  + <cargo.jvmargs>${jvm.args.debug} ${jvm.args.profiler} ${jvm.args.exposejmx} ${jvm.args.memory} ${jvm.args.common} ${jvm.args.vendor-specific} -Dxb.builder.useUnorderedSequence=true</cargo.jvmargs> +  +  + <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> +  + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> +  + <configfiles> +  + <configfile> + <file>${basedir}/testdata/jboss6-configuration/conf/jboss-service.xml</file> + <tofile>conf/jboss-service.xml</tofile> + </configfile> +  +  + <configfile> + <file>${basedir}/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml</file> + <tofile>deploy/jbossweb.sar/server.xml</tofile> + </configfile> +  + <configfile> + <file>${basedir}/testdata/jboss6-configuration/conf/props/jmx-console-roles.properties</file> + <tofile>conf/props/jmx-console-roles.properties</tofile> + </configfile> + <configfile> + <file>${basedir}/testdata/jboss6-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> + <copy> + <file>${basedir}/testdata/connfactories</file> + <toDir>deploy</toDir> + </copy> + <copy> + <file>${basedir}/testdata/rar/embjoprtestadapter.rar</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> + <failIfNoTests>true</failIfNoTests> + <testFailureIgnore>true</testFailureIgnore> + <includes> + <include>**/as5/*Test.java</include> + <include>**/jsfunit/*Test.java</include> + + <include>**/as5/connfactories/*Test.java</include> + <include>**/as5/datasources/*Test.java</include> + <include>**/as5/jmsDestinations/*Test.java</include> + + <include>**/as5/app/war/*Test.java</include> + <include>**/as5/app/embwar/*Test.java</include> + <include>**/as5/app/ear/*Test.java</include> + <include>**/as5/app/rar/*Test.java</include> + <include>**/as5/app/ejb/*Test.java</include> + + <include>**/as5/connectors/*Test.java</include> + <include>**/as5/sbm/*Test.java</include> + <include>**/as5/scripts/*Test.java</include> +  + <include>**/as5/jbcache/*Test.java</include> + +  + </includes> + <excludes> + <exclude>**/as4/**</exclude> + <exclude>**/*EarStressTest.java</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> + <property> + <name>htmlunit.browser</name> + <value>${htmlunit.browser}</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + +  +  + </plugins> + </build> + </profile> +  <profile> Copied: trunk/jsfunit/testdata/jboss6-configuration (from rev 873, trunk/jsfunit/testdata/jboss-configuration) Deleted: trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-log4j.xml =================================================================== --- trunk/jsfunit/testdata/jboss-configuration/conf/jboss-log4j.xml 2010-02-05 20:22:05 UTC (rev 873) +++ trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-log4j.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -1,409 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="EmbJopr" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/embjopr.log"/> - <param name="Append" value="false"/> - <param name="Threshold" value="ALL"/> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> - </layout> - </appender> - - - -  -  -  - -  - <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/server.log"/> - <param name="Append" value="false"/> -  - <param name="Threshold" value="${jboss.server.log.threshold}"/> - -  - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - -  - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> - -  - </layout> - </appender> - -  - -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="Target" value="System.out"/> - <param name="Threshold" value="INFO"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  -  -  - -  - -  - -  - -  - -  - -  - -  - -  -  -  - - - -  - -  - <category name="com.gargoylesoftware.htmlunit.DefaultCssErrorHandler"> - <priority value="ERROR"/> - </category> - - <category name="org.jboss.seam"> - <priority value="WARN"/> - </category> - <category name="org.ajax4jsf"> - <priority value="WARN"/> - </category> - <category name="httpclient.wire"> - <priority value="INFO"/> - </category> - <category name="facelets"> - <priority value="INFO"/> - </category> - <category name="com.gargoylesoftware.htmlunit.javascript.host"> - <priority value="INFO"/> - </category> - <category name="com.gargoylesoftware.htmlunit.html.HtmlScript"> - <priority value="INFO"/> - </category> - - <category name="org.jboss.managed.plugins.factory.AbstractManagedObjectFactory"> - <priority value="INFO"/> - </category> - <category name="org.jboss.deployers.plugins.managed.BeanMetaDataICF"> - <priority value="INFO"/> - </category> - <category name="org.jboss.profileservice.management.ManagementViewImpl"> - <priority value="INFO"/> - </category> - - - -  - <category name="org.jboss.jopr.jsfunit"> - <priority value="DEBUG"/> - <appender-ref ref="EmbJopr"/> - </category> - - <category name="org.jboss.on.embedded"> - <priority value="DEBUG"/> - </category> - -  - <category name="org.jboss.jopr.jsfunit.util.EjtsEnvironmentInfo"> - <priority value="INFO"/> - </category> - - - - - -  - <category name="org.apache"> - <priority value="INFO"/> - </category> - -  - <category name="javax.enterprise.resource.webcontainer.jsf"> - <priority value="INFO" /> - </category> - -  - <category name="jacorb"> - <priority value="WARN"/> - </category> - -  - <category name="javax.enterprise.resource.webcontainer.jsf"> - <priority value="INFO" /> - </category> - -  - <category name="org.jgroups"> - <priority value="WARN"/> - </category> - -  - <category name="org.quartz"> - <priority value="INFO"/> - </category> - -  - -  - <category name="org.jboss.management"> - <priority value="INFO"/> - </category> - -  - -  - -  - <category name="org.jboss.serial"> - <priority value="INFO"/> - </category> - -  - -  - -  - -  - -  -  - -  -  -  - - <root> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> Added: trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml =================================================================== --- trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml (rev 0) +++ trunk/jsfunit/testdata/jboss6-configuration/conf/jboss-service.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + +<server> + +  + <classpath codebase="${jboss.server.lib.url}" archives="*"/> + <classpath codebase="${jboss.common.lib.url}" archives="*"/> + +</server> Modified: trunk/jsfunit/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml =================================================================== --- trunk/jsfunit/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml 2010-02-05 20:22:05 UTC (rev 873) +++ trunk/jsfunit/testdata/jboss6-configuration/deploy/jbossweb.sar/server.xml 2010-02-08 20:13:20 UTC (rev 874) @@ -5,6 +5,9 @@ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />  <Listener className="org.apache.catalina.core.JasperListener" /> +  + <Listener className="org.jboss.web.tomcat.service.deployers.MicrocontainerIntegrationLifecycleListener" + delegateBeanName="ModClusterListener" failIfBeanMissing="false" warnIfBeanMissing="false"/> <Service name="jboss.web">

14 years, 10 months

1
0
0 / 0

EMBJOPR SVN: r873 - in trunk/core/src: test/resources/WEB-INF and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2010-02-05 15:22:05 -0500 (Fri, 05 Feb 2010) New Revision: 873 Modified: trunk/core/src/main/webapp/WEB-INF/web.xml trunk/core/src/test/resources/WEB-INF/web.xml Log: EMBJOPR-277 Modified: trunk/core/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/web.xml 2010-01-25 19:20:50 UTC (rev 872) +++ trunk/core/src/main/webapp/WEB-INF/web.xml 2010-02-05 20:22:05 UTC (rev 873) @@ -22,7 +22,8 @@ <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + metadata-complete="true">  Modified: trunk/core/src/test/resources/WEB-INF/web.xml =================================================================== --- trunk/core/src/test/resources/WEB-INF/web.xml 2010-01-25 19:20:50 UTC (rev 872) +++ trunk/core/src/test/resources/WEB-INF/web.xml 2010-02-05 20:22:05 UTC (rev 873) @@ -22,7 +22,8 @@ <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + metadata-complete="true">

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits February 2010