April 2009 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r2417 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2416 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-28 16:13:48 -0400 (Tue, 28 Apr 2009) New Revision: 2416 Modified: trunk/mod_cluster/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-28 20:13:45 UTC (rev 2415) +++ trunk/mod_cluster/pom.xml 2009-04-28 20:13:48 UTC (rev 2416) @@ -8,15 +8,15 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.native</groupId> <artifactId>mod-cluster</artifactId> - <version>1.0.0.CR2</version> + <version>1.0.0-SNAPSHOT</version> <name>mod_cluster</name> <description /> <url>http://jboss.org/mod_cluster</url> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.CR2</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.CR2</developerConnection> + <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</developerConnection> </scm> <dependencies>

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2415 - in tags/mod_cluster: 1.0.0.CR2 and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-28 16:13:45 -0400 (Tue, 28 Apr 2009) New Revision: 2415 Added: tags/mod_cluster/1.0.0.CR2/ tags/mod_cluster/1.0.0.CR2/pom.xml Removed: tags/mod_cluster/1.0.0.CR2/pom.xml Log: [maven-release-plugin] copy for tag 1.0.0.CR2 Copied: tags/mod_cluster/1.0.0.CR2 (from rev 2413, trunk/mod_cluster) Deleted: tags/mod_cluster/1.0.0.CR2/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-27 18:24:43 UTC (rev 2413) +++ tags/mod_cluster/1.0.0.CR2/pom.xml 2009-04-28 20:13:45 UTC (rev 2415) @@ -1,348 +0,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/xsd/maven-4.0.0.xsd"> - <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>4</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.native</groupId> - <artifactId>mod-cluster</artifactId> - <version>1.0.0-SNAPSHOT</version> - - <name>mod_cluster</name> - <description /> - <url>http://jboss.org/mod_cluster</url> - - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</developerConnection> - </scm> - - <dependencies> - <dependency> - <groupId>org.jboss.cluster</groupId> - <artifactId>jboss-ha-server-api</artifactId> - <version>1.1.1.GA</version> - </dependency> - <dependency> - <groupId>jboss.web</groupId> - <artifactId>jbossweb</artifactId> - <version>2.1.3.GA</version> - </dependency> - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>2.0.5.GA</version> - </dependency> - -  - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-jdk</artifactId> - <version>2.0.5.GA</version> - <optional>true</optional> - </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - <version>1.1.4.GA</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>5.0.1.GA</version> - <scope>test</scope> - </dependency> - -  -  - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.9</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jcommon</artifactId> - <version>1.0.12</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <includes> - <include>**/*TestCase.java</include> - </includes> -  - <excludes> - <exclude>**/test/**/*.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>sar</id> - <goals> - <goal>directory-inline</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>${project.artifactId}.sar</finalName> - <appendAssemblyId>false</appendAssemblyId> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <descriptors> - <descriptor>src/assembly/sar.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/jbossnative/tags/mod_cluster</tagBase> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - </plugin> - </plugins> - </pluginManagement> - </build> - - <profiles> - <profile> - <id>integration-test</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> -  - <execution> - <id>unpack-build-scripts</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> -  - <execution> - <id>copy-jboss-test</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - <stripVersion>true</stripVersion> - <excludeTransitive>false</excludeTransitive> - </configuration> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-tests</id> - <goals> - <goal>run</goal> - </goals> - <phase>integration-test</phase> - <configuration> - <tasks> - -  - <ant antfile="build-test.xml" target="main" /> - - <ant antfile="build-test.xml" target="tests-apache-integration" /> - -  -  - - </tasks> - </configuration> - </execution> - </executions> -  - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.7.0</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>dist</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-core-dependencies</id> - <phase>process-resources</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.native</groupId> - <artifactId>mod-cluster</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - <stripVersion>true</stripVersion> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-demo</id> - <goals> - <goal>run</goal> - </goals> - <phase>package</phase> - <configuration> - <tasks> - -  - <ant antfile="build-demo.xml" target="main" /> - -  - <ant antfile="build-jbossweb.xml" target="all"> - <property name="mod-cluster.jar.name" value="${project.build.finalName}" /> - </ant> - -  -  - - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>bin</id> - <goals> - <goal>attached</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file Copied: tags/mod_cluster/1.0.0.CR2/pom.xml (from rev 2414, trunk/mod_cluster/pom.xml) =================================================================== --- tags/mod_cluster/1.0.0.CR2/pom.xml (rev 0) +++ tags/mod_cluster/1.0.0.CR2/pom.xml 2009-04-28 20:13:45 UTC (rev 2415) @@ -0,0 +1,348 @@ +<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/xsd/maven-4.0.0.xsd"> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>4</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.native</groupId> + <artifactId>mod-cluster</artifactId> + <version>1.0.0.CR2</version> + + <name>mod_cluster</name> + <description /> + <url>http://jboss.org/mod_cluster</url> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.CR2</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.CR2</developerConnection> + </scm> + + <dependencies> + <dependency> + <groupId>org.jboss.cluster</groupId> + <artifactId>jboss-ha-server-api</artifactId> + <version>1.1.1.GA</version> + </dependency> + <dependency> + <groupId>jboss.web</groupId> + <artifactId>jbossweb</artifactId> + <version>2.1.3.GA</version> + </dependency> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.5.GA</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-jdk</artifactId> + <version>2.0.5.GA</version> + <optional>true</optional> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + <version>1.1.4.GA</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>5.0.1.GA</version> + <scope>test</scope> + </dependency> + +  +  + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.9</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + <version>1.0.12</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/*TestCase.java</include> + </includes> +  + <excludes> + <exclude>**/test/**/*.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>sar</id> + <goals> + <goal>directory-inline</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>${project.artifactId}.sar</finalName> + <appendAssemblyId>false</appendAssemblyId> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>src/assembly/sar.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/jbossnative/tags/mod_cluster</tagBase> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <id>integration-test</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> +  + <execution> + <id>unpack-build-scripts</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> +  + <execution> + <id>copy-jboss-test</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + <stripVersion>true</stripVersion> + <excludeTransitive>false</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-tests</id> + <goals> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + <configuration> + <tasks> + +  + <ant antfile="build-test.xml" target="main" /> + + <ant antfile="build-test.xml" target="tests-apache-integration" /> + +  +  + + </tasks> + </configuration> + </execution> + </executions> +  + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>dist</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-core-dependencies</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.native</groupId> + <artifactId>mod-cluster</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + <stripVersion>true</stripVersion> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-demo</id> + <goals> + <goal>run</goal> + </goals> + <phase>package</phase> + <configuration> + <tasks> + +  + <ant antfile="build-demo.xml" target="main" /> + +  + <ant antfile="build-jbossweb.xml" target="all"> + <property name="mod-cluster.jar.name" value="${project.build.finalName}" /> + </ant> + +  +  + + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>bin</id> + <goals> + <goal>attached</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2414 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-28 16:13:38 -0400 (Tue, 28 Apr 2009) New Revision: 2414 Modified: trunk/mod_cluster/pom.xml Log: [maven-release-plugin] prepare release 1.0.0.CR2 Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-27 18:24:43 UTC (rev 2413) +++ trunk/mod_cluster/pom.xml 2009-04-28 20:13:38 UTC (rev 2414) @@ -8,15 +8,15 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.native</groupId> <artifactId>mod-cluster</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.CR2</version> <name>mod_cluster</name> <description /> <url>http://jboss.org/mod_cluster</url> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</developerConnection> + <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.CR2</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.CR2</developerConnection> </scm> <dependencies>

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2413 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-27 14:24:43 -0400 (Mon, 27 Apr 2009) New Revision: 2413 Modified: trunk/mod_cluster/build-test.xml Log: reformat - no httpd for now Modified: trunk/mod_cluster/build-test.xml =================================================================== --- trunk/mod_cluster/build-test.xml 2009-04-27 18:23:13 UTC (rev 2412) +++ trunk/mod_cluster/build-test.xml 2009-04-27 18:24:43 UTC (rev 2413) @@ -8,436 +8,427 @@   <project default="main" name="JBoss/mod_cluster Tests" xmlns:server="http://jboss.org/ns/test/ant/server"> - -  -  -  - <tstamp> - <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT" /> - </tstamp> - <echo message="${TIMENOW}" file="run.tstamp" /> + +  +  +  + <tstamp> + <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/> + </tstamp> + <echo message="${TIMENOW}" file="run.tstamp"/> -  -  -  +  +  +  - <property name="results_web" value="http://jboss.sourceforge.net/junit-results/32" /> - <property name="buildlog.level" value="info" /> - <property environment="env" /> + <property name="buildlog.level" value="info"/> + <property environment="env"/> -  - <condition property="hostname" value="${env.COMPUTERNAME}"> - <os family="windows" /> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> - <os family="windows" /> - </not> - </condition> +  + <condition property="hostname" value="${env.COMPUTERNAME}"> + <os family="windows"/> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not><os family="windows"/></not> + </condition> -  - <property file="local.properties" /> +  + <property file="local.properties" /> -  - <property name="node0" value="localhost" /> - <property name="node0.http.url" value="http://${node0}:8080" /> - <property name="node0.jndi.url" value="jnp://${node0}:1099" /> - <property name="node0.jndi.port1.url" value="jnp://${node0}:1199" /> - <property name="node0.http.port1.url" value="http://${node0}:8180" /> - <property name="node0.jgroups.bind_addr" value="${node0}" /> - <property name="node1" value="${hostname}" /> - <property name="node1.http.url" value="http://${node1}:8080" /> - <property name="node1.jndi.url" value="jnp://${node1}:1099" /> - <property name="node1.jgroups.bind_addr" value="${node1}" /> -  +  + <property name="node0" value="localhost" /> + <property name="node0.http.url" value="http://${node0}:8080" /> + <property name="node0.jndi.url" value="jnp://${node0}:1099" /> + <property name="node0.jgroups.bind_addr" value="${node0}" /> + <property name="node1" value="${hostname}" /> + <property name="node1.http.url" value="http://${node1}:8080" /> + <property name="node1.jndi.url" value="jnp://${node1}:1099" /> + <property name="node1.jgroups.bind_addr" value="${node1}" /> +  -  -  -  -  - <property name="udpGroup" value="" /> -  - <property name="jbosstest.udpGroup" value="${udpGroup}" /> +  +  +  +  + <property name="udpGroup" value="" /> +  + <property name="jbosstest.udpGroup" value="${udpGroup}" /> -  - <property name="jboss.dist" value="${env.JBOSS_HOME}" /> +  + <property name="jboss.dist" value="${env.JBOSS_HOME}" /> -  - <property name="jbosstest.dist" value="${jboss.dist}" /> +  + <property name="jbosstest.dist" value="${jboss.dist}" /> -  - <property name="location.resources.main" value="${basedir}/src/main/resources" /> - <property name="location.resources.test" value="${basedir}/src/test/resources" /> - <property name="location.target" value="${basedir}/target" /> - <property name="location.artifact.tests" value="${location.target}/jboss-ejb3-testsuite-tests.jar" /> - <property name="location.dependencies" value="${location.target}/dependencies" /> - <property name="location.dependencies.unpacked" value="${location.dependencies}/unpacked" /> - <property name="location.dependencies.unpacked.jboss-test:jboss.test" value="${location.dependencies.unpacked}/jboss-test" /> - <property name="location.dependencies.lib" value="${location.dependencies}/lib" /> - <property name="location.dependencies.lib.jboss-test:jboss-test" value="${location.dependencies.lib}/jboss-test.jar" /> - <property name="location.dependencies.lib.org.jboss.jbossas:server-manager" value="${location.dependencies.lib}/jboss-server-manager.jar" /> - <property name="location.dependencies.lib.junit:junit" value="${location.dependencies.lib}/junit.jar" /> - <property name="location.dependencies.lib.apache-httpclient:commons-httpclient" value="${location.dependencies.lib}/commons-httpclient.jar" /> - <property name="location.client.lib" value="${jboss.dist}/client"/> - <property name="location.apache.httpd" value="/usr/sbin"/> - <property name="location.apache.serverroot" value="${user.home}/httpd"/> - <property name="location.apache.config" value="conf/mod-cluster-httpd.conf"/> +  + <property name="location.resources.main" value="${basedir}/src/main/resources" /> + <property name="location.resources.test" value="${basedir}/src/test/resources" /> + <property name="location.target" value="${basedir}/target" /> + <property name="location.artifact.tests" value="${location.target}/jboss-ejb3-testsuite-tests.jar" /> + <property name="location.dependencies" value="${location.target}/dependencies" /> + <property name="location.dependencies.unpacked" value="${location.dependencies}/unpacked" /> + <property name="location.dependencies.unpacked.jboss-test:jboss.test" value="${location.dependencies.unpacked}/jboss-test" /> + <property name="location.dependencies.lib" value="${location.dependencies}/lib" /> + <property name="location.dependencies.lib.jboss-test:jboss-test" value="${location.dependencies.lib}/jboss-test.jar" /> + <property name="location.dependencies.lib.org.jboss.jbossas:server-manager" value="${location.dependencies.lib}/jboss-server-manager.jar"/> + <property name="location.dependencies.lib.junit:junit" value="${location.dependencies.lib}/junit.jar" /> + <property name="location.dependencies.lib.apache-httpclient:commons-httpclient" value="${location.dependencies.lib}/commons-httpclient.jar" /> + <property name="location.dependencies.lib.org.jboss.naming:jnp-client" value="${location.dependencies.lib}/jnp-client.jar" /> + <property name="location.dependencies.lib.org.jboss.logging:jboss-logging-spi" value="${location.dependencies.lib}/jboss-logging-spi.jar" /> + <property name="location.apache.httpd" value="/usr/sbin"/> + <property name="location.apache.serverroot" value="${user.home}/httpd"/> + <property name="location.apache.config" value="conf/mod-cluster-httpd.conf"/> + + <path id="server.taskdef.classpath"> + <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}"/> + <pathelement path="${location.dependencies.lib.org.jboss.jbossas:server-manager}"/> + <pathelement path="${location.dependencies.lib.org.jboss.logging:jboss-logging-spi}"/> + <pathelement path="${location.dependencies.lib.org.jboss.naming:jnp-client}"/> + </path> + +  + <import file="${location.dependencies.unpacked.jboss-test:jboss.test}/server-config.xml" /> -  - <import file="${location.dependencies.unpacked.jboss-test:jboss.test}/server-config.xml" /> - -  - <property name="module.name" value="mod-cluster" /> - <property name="module.Name" value="JBoss Testsuite" /> - <property name="module.version" value="DEV" /> - <property name="module.source" value="${basedir}/src" /> - <property name="module.output" value="${basedir}/target" /> +  + <property name="module.name" value="mod-cluster" /> + <property name="module.Name" value="JBoss Testsuite" /> + <property name="module.version" value="DEV" /> + <property name="module.source" value="${basedir}/src" /> + <property name="module.output" value="${basedir}/target" /> -  - <property name="source.resources" value="${module.source}/test/resources"/> +  + <property name="source.resources" value="${module.source}/test/resources"/> -  - <property name="build.classes" value="${module.output}/classes"/> - <property name="build.lib" value="${module.output}/lib"/> - <property name="build.resources" value="${module.output}/resources"/> - <property name="build.reports" value="${module.output}/reports"/> - <property name="build.testlog" value="${module.output}/log"/> +  + <property name="build.classes" value="${module.output}/test-classes"/> + <property name="build.lib" value="${module.output}/test-lib"/> + <property name="build.resources" value="${module.output}/resources"/> + <property name="build.reports" value="${module.output}/reports"/> + <property name="build.testlog" value="${module.output}/log"/> + +  + <property name="mod_cluster.jboss.jvmargs" value="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Djava.net.preferIPv4Stack=true -Dresolve.dns=false" /> -  - <property name="mod_cluster.jboss.jvmargs" - value="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Djava.net.preferIPv4Stack=true -Dresolve.dns=false" /> + <property name="junit.timeout" value="300000"/> + +  + <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" udpGroup="${udpGroup}"> - <property name="junit.timeout" value="300000"/> - -  - <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" - udpGroup="${udpGroup}"> + <server name="mod-cluster-0" host="${node0}"> + <jvmarg value="${mod_cluster.jboss.jvmargs}" /> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> + <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> + <sysproperty key="jboss.messaging.ServerPeerID" value="0" /> + </server> - <server name="mod-cluster-0" host="${node0}"> - <jvmarg value="${mod_cluster.jboss.jvmargs}" /> - <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> - <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> - <sysproperty key="jboss.messaging.ServerPeerID" value="0" /> - </server> + <server name="mod-cluster-1" host="${node1}"> + <jvmarg value="${mod_cluster.jboss.jvmargs}" /> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> + <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> + <sysproperty key="jboss.messaging.ServerPeerID" value="1" /> + </server> - <server name="mod-cluster-1" host="${node1}"> - <jvmarg value="${mod_cluster.jboss.jvmargs}" /> - <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> - <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> - <sysproperty key="jboss.messaging.ServerPeerID" value="1" /> - </server> + <server name="mod-cluster-2" host="${node2}"> + <jvmarg value="${mod_cluster.jboss.jvmargs}" /> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> + <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> + <sysproperty key="jboss.messaging.ServerPeerID" value="2" /> + </server> - <server name="mod-cluster-2" host="${node2}"> - <jvmarg value="${mod_cluster.jboss.jvmargs}" /> - <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> - <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> - <sysproperty key="jboss.messaging.ServerPeerID" value="2" /> - </server> + <server name="mod-cluster-3" host="${node3}"> + <jvmarg value="${mod_cluster.jboss.jvmargs}" /> + <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> + <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> + <sysproperty key="jboss.messaging.ServerPeerID" value="3" /> + </server> - <server name="mod-cluster-3" host="${node3}"> - <jvmarg value="${mod_cluster.jboss.jvmargs}" /> - <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" /> - <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" /> - <sysproperty key="jboss.messaging.ServerPeerID" value="3" /> - </server> + </server:config> - </server:config> +  +  +  -  -  -  +  + <path id="jboss.test.classpath"> + <pathelement path="${jboss.test.path}"/> + <pathelement path="${location.dependencies.lib.junit:junit}"/> + <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}"/> + <pathelement path="${location.dependencies.lib.org.jboss.naming:jnp-client}"/> + <pathelement path="${location.dependencies.lib.org.jboss.logging:jboss-logging-spi}"/> + </path> -  - <path id="jboss.test.classpath"> - <pathelement path="${jboss.test.path}" /> - </path> +  + <path id="client.classpath"> +  + </path> + +  + <patternset id="jboss.server.all.includes"> + <include name="conf/**" /> + <include name="deploy/**" /> + <include name="deployers/**" /> + <include name="deploy-hasingleton/**" /> + <include name="lib/**" /> + </patternset> -  - <path id="client.classpath"> +  + <patternset id="apache.integration.test.includes"> + <include name="org/jboss/modcluster/test/*TestCase.class" /> + </patternset> + +  + <patternset id="badtest.excludes"/> -  +  +  +  + + <macrodef name="httpd"> + <attribute name="location" default="/usr/sbin"/> + <attribute name="action-type" default="start"/> + <attribute name="server-root"/> + <attribute name="config" default="conf/mod-cluster-httpd.conf"/> + <attribute name="failonerror" default="true"/> + + <sequential> + <echo message="Will @{action-type} the apache instance at @{location} using -d @{server-root} -f @{config}"/> + <echo message="If you need apache to run on port 80, then"/> + <echo message="you need to start apache with admin/root rights."/> + <echo message="If so, start/stop apache independent of this testsuite"/> + <exec executable="@{location}/httpd" failonerror="@{failonerror}" failifexecutionfails="@{failonerror}"> + <arg value="-k"/> + <arg value="@{action-type}"/> + <arg value="-d"/> + <arg value="@{server-root}"/> + <arg value="-f"/> + <arg value="@{config}"/> + </exec> + </sequential> + </macrodef> + + <macrodef name="create-httpd"> + <attribute name="server-root" description="the httpd serverroot to which newconf-src should be copied"/> + <attribute name="newconf-src" description="The name of the tests-config to copy"/> + <sequential> + <echo message="Updating httpd config at @{server-root}" /> + <copy todir="@{server-root}" overwrite="true" failonerror="false"> + <fileset dir="${build.resources}/test-configs/@{newconf-src}" /> + </copy> + </sequential> + </macrodef> - </path> - -  - <path id="server.taskdef.classpath"> - <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}" /> - <pathelement - path="${location.dependencies.lib.org.jboss.jbossas:server-manager}" /> - </path> - - <patternset id="jboss.server.all.includes"> - <include name="conf/**" /> - <include name="deploy/**" /> - <include name="deployers/**" /> - <include name="deploy-hasingleton/**" /> - <include name="lib/**" /> - </patternset> - -  - <patternset id="apache.integration.test.includes"> - <include name="org/jboss/modcluster/test/*TestCase.class" /> - </patternset> - -  - <patternset id="badtest.excludes"/> - -  -  -  - - <macrodef name="httpd"> - <attribute name="location" default="/usr/sbin"/> - <attribute name="action-type" default="start"/> - <attribute name="server-root"/> - <attribute name="config" default="conf/mod-cluster-httpd.conf"/> - <attribute name="failonerror" default="true"/> - - <sequential> - <echo message="Will @{action-type} the apache instance at @{location} using -d @{server-root} -f @{config}"/> - <echo message="If you need apache to run on port 80, then"/> - <echo message="you need to start apache with admin/root rights."/> - <echo message="If so, start/stop apache independent of this testsuite"/> - <exec executable="@{location}/httpd" - failonerror="@{failonerror}" failifexecutionfails="@{failonerror}"> - <arg value="-k"/> - <arg value="@{action-type}"/> - <arg value="-d"/> - <arg value="@{server-root}"/> - <arg value="-f"/> - <arg value="@{config}"/> - </exec> - </sequential> - </macrodef> - - <macrodef name="create-httpd"> - <attribute name="server-root" description="the httpd serverroot to which newconf-src should be copied"/> - <attribute name="newconf-src" description="The name of the tests-config to copy"/> - <sequential> - <echo message="Updating httpd config at @{server-root}" /> - <copy todir="@{server-root}" overwrite="true" failonerror="false"> - <fileset dir="${build.resources}/test-configs/@{newconf-src}" /> - </copy> - </sequential> - </macrodef> - -  -  -  - -  - <import file="test-jars.xml"/> +  +  +  + +  + <import file="test-jars.xml"/> -  - <target name="main" - description="Executes the default target (jars)." - depends="jars"/> - - <target name="init"> - <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> - </target> +  + <target name="main" + description="Executes the default target (jars)." + depends="init, compile-resources, jars"/> + + <target name="init"> + <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/> + </target> -  - <target name="compile-resources"> - <mkdir dir="${build.resources}"/> - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${source.resources}"> - <include name="**/*"/> - </fileset> - </copy> - </target> +  + <target name="compile-resources"> + <mkdir dir="${build.resources}"/> + <copy todir="${build.resources}" filtering="no"> + <fileset dir="${source.resources}"> + <include name="**/*"/> + </fileset> + </copy> + <mkdir dir="${build.lib}"/> + </target> <target name="tests-apache-integration" - description="Execute integration tests requiring an apache load balanced two JBoss nodes."> - -  - <condition property="apache.integration.junit.failure.property" - value="apache.integration.junit.failure" - else="apache.integration.junit.failure.ignored"> - <and> - <isset property="ignore.integration.test.failures"/> - <equals arg1="${ignore.integration.test.failures}" arg2="true" casesensitive="false" trim="true"/> - </and> - </condition> - - <echo message="Setting up httpd config in ${location.apache.serverroot}"/> - <create-httpd server-root="${location.apache.serverroot}" newconf-src="mod-cluster-httpd"/> - - <create-config baseconf="all" newconf="mod-cluster-0" newconf-src="mod-cluster-jbossas"> - <patternset id="jboss.server.all.includes"> - <include name="conf/**" /> - <include name="deploy/**" /> - <include name="deployers/**" /> - <include name="deploy-hasingleton/**" /> - <include name="lib/**" /> - </patternset> - </create-config> - - <create-config baseconf="all" newconf="mod-cluster-1" newconf-src="mod-cluster-jbossas"> - <patternset id="jboss.server.all.includes"> - <include name="conf/**" /> - <include name="deploy/**" /> - <include name="deployers/**" /> - <include name="deploy-hasingleton/**" /> - <include name="lib/**" /> - </patternset> - </create-config> - - <httpd location="${location.apache.httpd}" server-root="${location.apache.serverroot}" - config="${location.apache.config}" action-type="start" /> - - - <server:start name="mod-cluster-0" /> - <server:start name="mod-cluster-1" /> - - <echo message="Nodes have started, waiting for cluster to stablize..." /> + description="Execute integration tests requiring an apache load balanced two JBoss nodes."> + +  + <condition property="apache.integration.junit.failure.property" + value="apache.integration.junit.failure" + else="apache.integration.junit.failure.ignored"> + <and> + <isset property="ignore.integration.test.failures"/> + <equals arg1="${ignore.integration.test.failures}" arg2="true" casesensitive="false" trim="true"/> + </and> + </condition> + + <echo message="Setting up httpd config in ${location.apache.serverroot}"/> + <create-httpd server-root="${location.apache.serverroot}" newconf-src="mod-cluster-httpd"/> + + <create-config baseconf="all" newconf="mod-cluster-0" newconf-src="mod-cluster-jbossas"> + <patternset id="jboss.server.all.includes"> + <include name="conf/**" /> + <include name="deploy/**" /> + <include name="deployers/**" /> + <include name="deploy-hasingleton/**" /> + <include name="lib/**" /> + </patternset> + </create-config> + + <copy todir="${jboss.dist}/server/mod-cluster-0/deploy"> + <fileset dir="${location.target}/mod-cluster.sar"></fileset> + </copy> + + <create-config baseconf="all" newconf="mod-cluster-1" newconf-src="mod-cluster-jbossas"> + <patternset id="jboss.server.all.includes"> + <include name="conf/**" /> + <include name="deploy/**" /> + <include name="deployers/**" /> + <include name="deploy-hasingleton/**" /> + <include name="lib/**" /> + </patternset> + </create-config> + + <copy todir="${jboss.dist}/server/mod-cluster-1/deploy"> + <fileset dir="${location.target}/mod-cluster.sar"></fileset> + </copy> + +  + + + <server:start name="mod-cluster-0" /> +  + + <echo message="Nodes have started, waiting for cluster to stablize..." /> - <echo message="Going to call target tests-clustering-unit" /> + <echo message="Going to call target tests-clustering-unit" /> - <antcall target="tests-clustering-unit"> - <param name="cluster.includes.refid" value="apache.integration.test.includes" /> - <param name="jboss-junit-configuration" value="ModCluster" /> - <param name="tests-clustering-unit.failure.property" value="${apache.integration.junit.failure.property}"/> - </antcall> + <antcall target="tests-clustering-unit"> + <param name="cluster.includes.refid" value="apache.integration.test.includes" /> + <param name="jboss-junit-configuration" value="ModCluster" /> + <param name="tests-clustering-unit.failure.property" value="${apache.integration.junit.failure.property}"/> + </antcall> - <server:stop name="mod-cluster-0" /> - <server:stop name="mod-cluster-1" /> + <server:stop name="mod-cluster-0" /> +  - <httpd location="${location.apache.httpd}" server-root="${location.apache.serverroot}" - config="${location.apache.config}" action-type="stop" /> - -  - <fail message="JUnit tests failed; see test reports for details" if="apache.integration.junit.failure"/> +  + +  + <fail message="JUnit tests failed; see test reports for details" if="apache.integration.junit.failure"/> - </target> + </target> -  - <target name="tests-clustering-unit"> - - <mkdir dir="${build.reports}" /> - <mkdir dir="${build.testlog}" /> - <junit dir="${module.output}" printsummary="on" - haltonerror="false" haltonfailure="false" - fork="true" - timeout="${junit.timeout}" - failureProperty="${tests-clustering-unit.failure.property}"> +  + <target name="tests-clustering-unit"> + + <mkdir dir="${build.reports}" /> + <mkdir dir="${build.testlog}" /> + <junit dir="${module.output}" printsummary="on" + haltonerror="false" haltonfailure="false" + fork="true" timeout="${junit.timeout}" + failureProperty="${tests-clustering-unit.failure.property}"> - <sysproperty key="java.net.preferIPv4Stack" value="true" /> + <sysproperty key="java.net.preferIPv4Stack" value="true" /> - <sysproperty key="jboss.internal-server.serverroot" - value="${jboss.dist}/server" /> - <sysproperty key="jbosstest.deploy.dir" file="${build.lib}" /> - <sysproperty key="jbosstest.cluster.node0" value="${node0}" /> - <sysproperty key="jbosstest.cluster.node0.http.url" - value="${node0.http.url}" /> - <sysproperty key="jbosstest.cluster.node0.jndi.url" - value="${node0.jndi.url}" /> - <sysproperty key="jbosstest.cluster.node0.serverroot" - value="${jboss.dist}/server/${jbosstest.cluster.node0.config}" /> - <sysproperty key="jbosstest.cluster.node1" value="${node1}" /> - <sysproperty key="jbosstest.cluster.node1.http.url" - value="${node1.http.url}" /> - <sysproperty key="jbosstest.cluster.node1.jndi.url" - value="${node1.jndi.url}" /> - <sysproperty key="jbosstest.cluster.node1.serverroot" - value="${jboss.dist}/server/${jbosstest.cluster.node1.config}" /> - <sysproperty key="build.testlog" value="${build.testlog}" /> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml" /> -  - <syspropertyset> - <propertyref prefix="jbosstest." /> - </syspropertyset> + <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server" /> + <sysproperty key="jbosstest.deploy.dir" file="${build.lib}" /> + <sysproperty key="jbosstest.cluster.node0" value="${node0}" /> + <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}" /> + <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}" /> + <sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}" /> + <sysproperty key="jbosstest.cluster.node1" value="${node1}" /> + <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}" /> + <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}" /> + <sysproperty key="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}" /> + <sysproperty key="build.testlog" value="${build.testlog}" /> + <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml" /> +  + <syspropertyset> + <propertyref prefix="jbosstest." /> + </syspropertyset> -  - <syspropertyset> - <propertyref prefix="org.apache." /> - </syspropertyset> - <syspropertyset> - <propertyref prefix="apache" /> - </syspropertyset> - <syspropertyset> - <propertyref prefix="node" /> - </syspropertyset> +  + <syspropertyset> + <propertyref prefix="org.apache." /> + </syspropertyset> + <syspropertyset> + <propertyref prefix="apache" /> + </syspropertyset> + <syspropertyset> + <propertyref prefix="node" /> + </syspropertyset> + +  -  + <classpath> + <pathelement location="${build.classes}" /> + <pathelement location="${build.resources}" /> + <path refid="jboss.test.classpath"/> + </classpath> - <classpath> - <pathelement location="${build.classes}" /> - <pathelement location="${build.resources}" /> - <path refid="tests.classpath" /> - </classpath> +  + <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}" /> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" /> -  - <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}" /> - <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" - usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" /> + <batchtest todir="${build.reports}" haltonerror="false" + haltonfailure="false" fork="true"> - <batchtest todir="${build.reports}" haltonerror="false" - haltonfailure="false" fork="true"> + <fileset dir="${build.classes}"> + <patternset refid="${cluster.includes.refid}" /> + <patternset refid="badtest.excludes" /> + </fileset> + </batchtest> + </junit> + </target> - <fileset dir="${build.classes}"> - <patternset refid="${cluster.includes.refid}" /> - <patternset refid="badtest.excludes" /> - </fileset> - </batchtest> - </junit> - </target> +  + <target name="one-cluster-test-nostart" if="test"> -  - <target name="one-cluster-test-nostart" if="test"> + <property name="jboss-junit-configuration" value="ModCluster" /> - <property name="jboss-junit-configuration" value="ModCluster" /> + <echo message="Going to call target tests-clustering-unit for ${test}" /> - <echo message="Going to call target tests-clustering-unit for ${test}" /> + <antcall target="tests-clustering-unit"> + <param name="cluster.includes.refid" value="one.test.includes" /> + <param name="jboss-junit-configuration" value="${jboss-junit-configuration}" /> + <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache" /> + <param name="jbosstest.cluster.node0.config" value="mod-cluster-0" /> + <param name="jbosstest.cluster.node1.config" value="mod-cluster-1" /> + </antcall> - <antcall target="tests-clustering-unit"> - <param name="cluster.includes.refid" value="one.test.includes" /> - <param name="jboss-junit-configuration" value="${jboss-junit-configuration}" /> - <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache" /> - <param name="jbosstest.cluster.node0.config" value="mod-cluster-0" /> - <param name="jbosstest.cluster.node1.config" value="mod-cluster-1" /> - </antcall> + </target> - </target> - </project> \ No newline at end of file

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2412 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-27 14:23:13 -0400 (Mon, 27 Apr 2009) New Revision: 2412 Modified: trunk/mod_cluster/pom.xml Log: Refreshed dependencies. Misc pom cleanup. Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-27 16:18:42 UTC (rev 2411) +++ trunk/mod_cluster/pom.xml 2009-04-27 18:23:13 UTC (rev 2412) @@ -16,155 +16,19 @@ <scm> <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/labs/labs/jbossbuild/jboss-parent/tag...</developerConnection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/trunk/mod_cluster</developerConnection> </scm> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <printSummary>true</printSummary> - <disableXmlReport>false</disableXmlReport> - <includes> - <include>**/*TestCase.java</include> - </includes> -  - <excludes> - <exclude>**/test/**/*.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>sar</id> - <goals> - <goal>directory-inline</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>${project.artifactId}.sar</finalName> - <appendAssemblyId>false</appendAssemblyId> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <descriptors> - <descriptor>src/assembly/sar.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/jbossnative/tags/mod_cluster</tagBase> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> -  - <execution> - <id>unpack-build-scripts</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> -  - <execution> - <id>copy-jboss-test</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test</groupId> - <artifactId>jboss-test</artifactId> - </artifactItem> - <artifactItem> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - </artifactItem> - <artifactItem> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> - <overWriteIfNewer>true</overWriteIfNewer> - <stripVersion>true</stripVersion> - </configuration> - </execution> - </executions> - </plugin> - -  -  -  - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - </plugin> - </plugins> - </pluginManagement> - </build> - <dependencies> <dependency> <groupId>org.jboss.cluster</groupId> <artifactId>jboss-ha-server-api</artifactId> - <version>1.1.0.GA</version> + <version>1.1.1.GA</version> </dependency> <dependency> <groupId>jboss.web</groupId> <artifactId>jbossweb</artifactId> - <version>2.1.2.GA</version> + <version>2.1.3.GA</version> </dependency> <dependency> <groupId>net.jcip</groupId> @@ -174,7 +38,7 @@ <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> - <version>2.0.4.GA</version> + <version>2.0.5.GA</version> </dependency>  @@ -201,35 +65,13 @@ <dependency> <groupId>org.jboss.test</groupId> <artifactId>jboss-test</artifactId> - <version>1.1.3.GA</version> + <version>1.1.4.GA</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - </exclusion> - </exclusions> </dependency> +  <dependency> <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - <version>1.0.1.GA</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> + <artifactId>jboss-as-server</artifactId> <version>5.0.1.GA</version> <scope>test</scope> </dependency> @@ -261,19 +103,126 @@ <scope>provided</scope> </dependency> </dependencies> - + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/*TestCase.java</include> + </includes> +  + <excludes> + <exclude>**/test/**/*.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>sar</id> + <goals> + <goal>directory-inline</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>${project.artifactId}.sar</finalName> + <appendAssemblyId>false</appendAssemblyId> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <descriptors> + <descriptor>src/assembly/sar.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/jbossnative/tags/mod_cluster</tagBase> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> <profile> <id>integration-test</id> <activation> <activeByDefault>false</activeByDefault> - <property> - <name>maven.run.integration.tests</name> - <value>true</value> - </property> </activation> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> +  + <execution> + <id>unpack-build-scripts</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/unpacked/jboss-test</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> +  + <execution> + <id>copy-jboss-test</id> + <phase>process-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test</groupId> + <artifactId>jboss-test</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> + <overWriteIfNewer>true</overWriteIfNewer> + <stripVersion>true</stripVersion> + <excludeTransitive>false</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> +  <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -317,10 +266,6 @@ <id>dist</id> <activation> <activeByDefault>false</activeByDefault> - <property> - <name>maven.demo</name> - <value>true</value> - </property> </activation> <build> <plugins> @@ -344,7 +289,6 @@ <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory> <overWriteIfNewer>true</overWriteIfNewer> <stripVersion>true</stripVersion> -  </configuration> </execution> </executions>

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2411 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-27 12:18:42 -0400 (Mon, 27 Apr 2009) New Revision: 2411 Modified: trunk/mod_cluster/pom.xml Log: Rollback to 2401 - until pom issue fixed. Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-27 16:13:05 UTC (rev 2410) +++ trunk/mod_cluster/pom.xml 2009-04-27 16:18:42 UTC (rev 2411) @@ -201,15 +201,38 @@ <dependency> <groupId>org.jboss.test</groupId> <artifactId>jboss-test</artifactId> - <version>1.1.4.GA</version> + <version>1.1.3.GA</version> <scope>test</scope> <exclusions> <exclusion> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> +  + <exclusion> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-server-manager</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-server-manager</artifactId> + <version>1.0.1.GA</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + <version>5.0.1.GA</version> + <scope>test</scope> + </dependency>

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2410 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-27 12:13:05 -0400 (Mon, 27 Apr 2009) New Revision: 2410 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java Log: Refined thread safety. Eliminate entirely the possibility of null reference to socket in worker thread. Eliminate join() in stop(). Added pause check to resumeWorker(). Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2009-04-27 16:07:57 UTC (rev 2409) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2009-04-27 16:13:05 UTC (rev 2410) @@ -40,6 +40,8 @@ import java.util.Locale; import java.util.Map; +import net.jcip.annotations.GuardedBy; + import org.apache.catalina.util.StringManager; import org.jboss.logging.Logger; import org.jboss.modcluster.Constants; @@ -71,7 +73,7 @@ InetAddress groupAddress = null; private MulticastSocketFactory socketFactory; - volatile MulticastSocket socket; + private MulticastSocket socket; private boolean daemon = true; @@ -248,7 +250,7 @@ if (this.workerThread == null) { - this.workerThread = new AdvertiseListenerWorker(); + this.workerThread = new AdvertiseListenerWorker(this.socket); this.workerThread.setDaemon(this.daemon); this.workerThread.start(); @@ -281,7 +283,7 @@ } } - public void interruptDatagramReader() + public synchronized void interruptDatagramReader() { if (this.socket == null) return; @@ -313,16 +315,6 @@ // In case worker is stuck on socket.receive(...) this.interruptDatagramReader(); - try - { - // Wait for worker to complete - this.workerThread.join(1000); - } - catch (InterruptedException e) - { - Thread.currentThread().interrupt(); - } - this.workerThread = null; this.listening = false; @@ -387,9 +379,17 @@ // ------------------------------------ AdvertiseListenerWorker Inner Class class AdvertiseListenerWorker extends Thread { - private boolean paused; + private final MulticastSocket socket; + @GuardedBy("this") + private boolean paused = false; + @GuardedBy("this") private byte[] secure = this.generateSecure(); + AdvertiseListenerWorker(MulticastSocket socket) + { + this.socket = socket; + } + public synchronized void suspendWorker() { this.paused = true; @@ -397,12 +397,16 @@ public synchronized void resumeWorker() { - this.secure = this.generateSecure(); - this.paused = false; - this.notify(); + if (this.paused) + { + this.paused = false; + this.secure = this.generateSecure(); + // Notify run() thread waiting on pause + this.notify(); + } } - public DatagramPacket createInterruptPacket(InetAddress address, int port) + public synchronized DatagramPacket createInterruptPacket(InetAddress address, int port) { return new DatagramPacket(this.secure, this.secure.length, address, port); } @@ -426,16 +430,16 @@ { if (this.paused) { + // Wait for notify in resumeWorker() this.wait(); } } - if (AdvertiseListenerImpl.this.socket == null) - break; - + DatagramPacket packet = new DatagramPacket(buffer, buffer.length); - AdvertiseListenerImpl.this.socket.receive(packet); + this.socket.receive(packet); + // Skip processing if interrupt packet received if (this.matchesSecure(packet)) continue; String message = new String(packet.getData(), 0, packet.getLength(), DEFAULT_ENCODING); @@ -533,6 +537,7 @@ //eventHandler.onEvent(AdvertiseEventType.ON_STATUS_CHANGE, server); } } + AdvertiseListenerImpl.this.listening = true; } catch (InterruptedException e) @@ -541,8 +546,9 @@ } catch (IOException e) { + AdvertiseListenerImpl.this.listening = false; + // Do not blow the CPU in case of communication error - AdvertiseListenerImpl.this.listening = false; Thread.yield(); } } @@ -560,7 +566,7 @@ return secure; } - boolean matchesSecure(DatagramPacket packet) + synchronized boolean matchesSecure(DatagramPacket packet) { if (packet.getLength() != this.secure.length) return false;

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2409 - trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-27 12:07:57 -0400 (Mon, 27 Apr 2009) New Revision: 2409 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java Log: Minor tweaking Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java 2009-04-27 16:07:10 UTC (rev 2408) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java 2009-04-27 16:07:57 UTC (rev 2409) @@ -44,7 +44,7 @@ private static final int ADVERTISE_PORT = 23365; @Test - public void createMulticastSocketNotLinux() throws IOException + public void testMulticastSocketNotLinux() throws IOException { String os = System.getProperty("os.name"); @@ -57,7 +57,7 @@ System.setProperty("os.name", "OtherOS"); } - this.createMulticastSocketAsLinux(); + this.testMulticastSocketAsLinux(); } finally { @@ -69,12 +69,12 @@ } @Test - public void createMulticastSocketAsLinux() throws IOException + public void testMulticastSocketAsLinux() throws IOException { InetAddress groupAddress = InetAddress.getByName(ADVERTISE_GROUP); - MulticastSocketFactory socketFactory = new MulticastSocketFactoryImpl(); - MulticastSocket factorySocket = socketFactory.createMulticastSocket(groupAddress, ADVERTISE_PORT); + MulticastSocketFactory factory = new MulticastSocketFactoryImpl(); + MulticastSocket factorySocket = factory.createMulticastSocket(groupAddress, ADVERTISE_PORT); try { @@ -111,7 +111,7 @@ } catch (InterruptedException e) { - Thread.interrupted(); + Thread.currentThread().interrupt(); } Arrays.fill(buffer, (byte) 0);

15 years, 8 months

1
0
0 / 0

JBoss Native SVN: r2408 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-04-27 12:07:10 -0400 (Mon, 27 Apr 2009) New Revision: 2408 Modified: trunk/mod_cluster/pom.xml Log: Upgrade jboss-test to 1.1.4 - eliminates need for additional exclusions Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-04-27 13:43:28 UTC (rev 2407) +++ trunk/mod_cluster/pom.xml 2009-04-27 16:07:10 UTC (rev 2408) @@ -201,38 +201,15 @@ <dependency> <groupId>org.jboss.test</groupId> <artifactId>jboss-test</artifactId> - <version>1.1.3.GA</version> + <version>1.1.4.GA</version> <scope>test</scope> <exclusions> <exclusion> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> -  - <exclusion> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-server-manager</artifactId> - <version>1.0.1.GA</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.1.GA</version> - <scope>test</scope> - </dependency>

15 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits April 2009