[embjopr-commits] EMBJOPR SVN: r345 - in trunk: core and 3 other directories.

Author: ips Date: 2009-04-27 10:23:37 -0400 (Mon, 27 Apr 2009) New Revision: 345 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_CR2 Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-04-27 14:18:38 UTC (rev 344) +++ trunk/core/pom.xml 2009-04-27 14:23:37 UTC (rev 345) @@ -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.CR2</version> </parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-core</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR2</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/&... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... </scm> <properties> Modified: trunk/jbas4/pom.xml =================================================================== --- trunk/jbas4/pom.xml 2009-04-27 14:18:38 UTC (rev 344) +++ trunk/jbas4/pom.xml 2009-04-27 14:23:37 UTC (rev 345) @@ -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.CR2</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/... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... </scm> <properties> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-04-27 14:18:38 UTC (rev 344) +++ trunk/jbas5/pom.xml 2009-04-27 14:23:37 UTC (rev 345) @@ -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.CR2</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/... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... </scm> <properties> Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-27 14:18:38 UTC (rev 344) +++ trunk/jsfunit/pom.xml 2009-04-27 14:23:37 UTC (rev 345) @@ -1,511 +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> - - <!-- Dropping back to HtmlUnit 2.3 with Rhino until bug can be addressed --> - <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> - - <!-- JBoss AS 4.2 --> - <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> - - <!-- Cargo plugin (for AS 4) --> - <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> <!-- 5 minutes --> - <systemProperties> - <jboss.server.log.threshold>ALL</jboss.server.log.threshold> - <!-- snoops request and response from client side result is in server.log - <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> --> - <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> - - <!-- Container configuration --> - <configuration> - <!-- Set where the configuration dir will be. --> - <type>standalone</type> - <home>target/jboss4.2</home> - <properties> - <cargo.java.home>${JAVA_HOME}</cargo.java.home> - <!-- JBoss configuration - default, all, minimal, ... --> - <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> - </properties> - <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') --> - <configfiles> - </configfiles> - </configuration> - <!-- /Container 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> - - <!-- Surefire plugin (for AS 4) --> - <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> - - <!-- JBoss AS 5.x --> - <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> - - <!-- Enable message counters in messaging-service.xml --> - <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> - - - <!-- Cargo plugin (for AS 5) --> - <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> <!-- Binaries used by Cargo. --> - <log>${basedir}/target/jboss5.x.logs/cargo.log</log> - <timeout>300000</timeout> <!-- 5 minutes --> - <systemProperties> - <!-- Used in jboss-log4j.xml. See /testdata/... --> - <jboss.server.log.threshold>ALL</jboss.server.log.threshold> - <!-- Snoops request and response from client side. Result is in server.log - <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> --> - <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> - <!-- Home dir for Cargo's JBoss instance. --> - <jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir> - </systemProperties> - </container> - - <!-- Container configuration --> - <configuration> - <!-- Set where the configuration dir will be. --> - <!-- TODO: Prepend ${basedir}/ and test; Copy to AS 4 and test.--> - <type>standalone</type> - <home>target/jboss5x</home> - <properties> - <cargo.java.home>${JAVA_HOME}</cargo.java.home> - <!-- Raise permgen size, allow classes unloading and permgen sweep --> - <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs> - <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled --> - <!-- JBoss configuration - default, all, minimal, ... --> - <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> - </properties> - <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') --> - <configfiles> - <!-- Limit logging --> - <configfile> - <file>${basedir}/testdata/jboss-configuration/conf/jboss-log4j.xml</file> - <tofile>conf/jboss-log4j.xml</tofile> - </configfile> - <!-- Open Tomcat's HTTP logging valve --> - <configfile> - <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file> - <tofile>deploy/jbossweb.sar/server.xml</tofile> - </configfile> - <!-- JMX Console Users --> - <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> - <!-- Replaced with maven-replacer-plugin - see above. - <configfile> - <file>${basedir}/testdata/jboss-configuration/deploy/messaging-service.xml</file> - <tofile>deploy/messaging/messaging-service.xml</tofile> - </configfile> - --> - </configfiles> - - <!-- Deploy the test files --> - <files> - <copy> - <file>${basedir}/testdata/destinations</file> - <toDir>deploy</toDir> - </copy> - <copy> - <file>${basedir}/testdata/datasources/testFiles</file> - <toDir>deploy</toDir> - </copy> - </files> - </configuration> - <!-- /Container 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> - - <!-- Surefire plugin (for AS 5) --> - <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> - - <!-- Hudson profile (commented - hesitating to hard-code version dir to pom.xml) - <profile> - <id>running-in-hudson</id> - <activation> - <property><name>user.name</name><value>hudson</value></property> - </activation> - <properties> - <JBOSS_HOME>${basedir}/jbossas-5.x/build/output/jboss-5.1.0.Beta1</JBOSS_HOME> - </properties> - </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> - <!-- Only run the tests if you set one of the profiles above --> - <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.CR2</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> + + <!-- Dropping back to HtmlUnit 2.3 with Rhino until bug can be addressed --> + <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> + + <!-- JBoss AS 4.2 --> + <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> + + <!-- Cargo plugin (for AS 4) --> + <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> <!-- 5 minutes --> + <systemProperties> + <jboss.server.log.threshold>ALL</jboss.server.log.threshold> + <!-- snoops request and response from client side result is in server.log + <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> --> + <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> + + <!-- Container configuration --> + <configuration> + <!-- Set where the configuration dir will be. --> + <type>standalone</type> + <home>target/jboss4.2</home> + <properties> + <cargo.java.home>${JAVA_HOME}</cargo.java.home> + <!-- JBoss configuration - default, all, minimal, ... --> + <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> + </properties> + <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') --> + <configfiles> + </configfiles> + </configuration> + <!-- /Container 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> + + <!-- Surefire plugin (for AS 4) --> + <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> + + <!-- JBoss AS 5.x --> + <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> + + <!-- Enable message counters in messaging-service.xml --> + <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"&gt;false</token> + <value>attribute name="EnableMessageCounters"&gt;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"&gt;false</token> + <value>attribute name="EnableMessageCounters"&gt;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"&gt;false</token> + <value>attribute name="EnableMessageCounters"&gt;true</value> + </configuration> + </execution> + </executions> + </plugin> + + + <!-- Cargo plugin (for AS 5) --> + <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> <!-- Binaries used by Cargo. --> + <log>${basedir}/target/jboss5.x.logs/cargo.log</log> + <timeout>300000</timeout> <!-- 5 minutes --> + <systemProperties> + <!-- Used in jboss-log4j.xml. See /testdata/... --> + <jboss.server.log.threshold>ALL</jboss.server.log.threshold> + <!-- Snoops request and response from client side. Result is in server.log + <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> --> + <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> + <!-- Home dir for Cargo's JBoss instance. --> + <jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir> + </systemProperties> + </container> + + <!-- Container configuration --> + <configuration> + <!-- Set where the configuration dir will be. --> + <!-- TODO: Prepend ${basedir}/ and test; Copy to AS 4 and test.--> + <type>standalone</type> + <home>target/jboss5x</home> + <properties> + <cargo.java.home>${JAVA_HOME}</cargo.java.home> + <!-- Raise permgen size, allow classes unloading and permgen sweep --> + <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs> + <!-- -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled --> + <!-- JBoss configuration - default, all, minimal, ... --> + <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration> + </properties> + <!-- Override Cargo's default files (some taken from cargo's .jar, some from 'default') --> + <configfiles> + <!-- Limit logging --> + <configfile> + <file>${basedir}/testdata/jboss-configuration/conf/jboss-log4j.xml</file> + <tofile>conf/jboss-log4j.xml</tofile> + </configfile> + <!-- Open Tomcat's HTTP logging valve --> + <configfile> + <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file> + <tofile>deploy/jbossweb.sar/server.xml</tofile> + </configfile> + <!-- JMX Console Users --> + <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> + <!-- Replaced with maven-replacer-plugin - see above. + <configfile> + <file>${basedir}/testdata/jboss-configuration/deploy/messaging-service.xml</file> + <tofile>deploy/messaging/messaging-service.xml</tofile> + </configfile> + --> + </configfiles> + + <!-- Deploy the test files --> + <files> + <copy> + <file>${basedir}/testdata/destinations</file> + <toDir>deploy</toDir> + </copy> + <copy> + <file>${basedir}/testdata/datasources/testFiles</file> + <toDir>deploy</toDir> + </copy> + </files> + </configuration> + <!-- /Container 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> + + <!-- Surefire plugin (for AS 5) --> + <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> + + <!-- Hudson profile (commented - hesitating to hard-code version dir to pom.xml) + <profile> + <id>running-in-hudson</id> + <activation> + <property><name>user.name</name><value>hudson</value></property> + </activation> + <properties> + <JBOSS_HOME>${basedir}/jbossas-5.x/build/output/jboss-5.1.0.Beta1</JBOSS_HOME> + </properties> + </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> + <!-- Only run the tests if you set one of the profiles above --> + <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> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-04-27 14:18:38 UTC (rev 344) +++ trunk/pom.xml 2009-04-27 14:23:37 UTC (rev 345) @@ -30,7 +30,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0.CR2</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/</c... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/tags/EmbJopr... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/tags/E... </scm> <issueManagement>