February 2009 - jbossnative-commits

JBoss Native SVN: r2295 - tags/mod_cluster/1.0.0.Beta4/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-02-14 03:49:52 -0500 (Sat, 14 Feb 2009) New Revision: 2295 Modified: tags/mod_cluster/1.0.0.Beta4/test/java/build.properties.default Log: Adjust to Beta4. Modified: tags/mod_cluster/1.0.0.Beta4/test/java/build.properties.default =================================================================== --- tags/mod_cluster/1.0.0.Beta4/test/java/build.properties.default 2009-02-13 15:49:44 UTC (rev 2294) +++ tags/mod_cluster/1.0.0.Beta4/test/java/build.properties.default 2009-02-14 08:49:52 UTC (rev 2295) @@ -42,4 +42,4 @@ jboss-ejb-api.jar.loc=${base-jboss.loc}/jboss-ejb-api/${jboss-ejb-api.version}/jboss-ejb-api-${jboss-ejb-api.version}.jar jboss-ejb-api.jar=${base.path}/${jboss-ejb-api.version}/jboss-ejb-api-spi-${jboss-ejb-api.version}.jar -mod_cluster.jar=../../target/mod-cluster-1.0.0-SNAPSHOT.jar +mod_cluster.jar=../../target/mod-cluster-1.0.0-Beta4.jar

15 years, 2 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

15 years, 2 months

1
0
0 / 0

JBoss Native SVN: r2293 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-13 10:29:16 -0500 (Fri, 13 Feb 2009) New Revision: 2293 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-02-13 15:29:12 UTC (rev 2292) +++ trunk/mod_cluster/pom.xml 2009-02-13 15:29:16 UTC (rev 2293) @@ -8,15 +8,15 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.native</groupId> <artifactId>mod-cluster</artifactId> - <version>1.0.0.Beta4</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.Beta4</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.Beta4</developerConnection> + <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> </scm> <build>

15 years, 2 months

1
0
0 / 0

JBoss Native SVN: r2292 - in tags/mod_cluster: 1.0.0.Beta4 and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-13 10:29:12 -0500 (Fri, 13 Feb 2009) New Revision: 2292 Added: tags/mod_cluster/1.0.0.Beta4/ tags/mod_cluster/1.0.0.Beta4/pom.xml Removed: tags/mod_cluster/1.0.0.Beta4/pom.xml Log: [maven-release-plugin] copy for tag 1.0.0.Beta4 Copied: tags/mod_cluster/1.0.0.Beta4 (from rev 2290, trunk/mod_cluster) Deleted: tags/mod_cluster/1.0.0.Beta4/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-02-13 15:16:22 UTC (rev 2290) +++ tags/mod_cluster/1.0.0.Beta4/pom.xml 2009-02-13 15:29:12 UTC (rev 2292) @@ -1,408 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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></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/labs/labs/jbossbuild/jboss-parent/tag...</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> - <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.2</version> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.cluster</groupId> - <artifactId>jboss-ha-server-api</artifactId> - <version>1.1.0.GA</version> - </dependency> - <dependency> - <groupId>jboss.web</groupId> - <artifactId>jbossweb</artifactId> - <version>2.1.1.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.3.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.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> - -  -  - <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> - - <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-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>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>dist</id> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>maven.demo</name> - <value>true</value> - </property> - </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.Beta4/pom.xml (from rev 2291, trunk/mod_cluster/pom.xml) =================================================================== --- tags/mod_cluster/1.0.0.Beta4/pom.xml (rev 0) +++ tags/mod_cluster/1.0.0.Beta4/pom.xml 2009-02-13 15:29:12 UTC (rev 2292) @@ -0,0 +1,407 @@ +<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.Beta4</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.Beta4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.Beta4</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> + <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.2</version> + </plugin> + </plugins> + </pluginManagement> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.cluster</groupId> + <artifactId>jboss-ha-server-api</artifactId> + <version>1.1.0.GA</version> + </dependency> + <dependency> + <groupId>jboss.web</groupId> + <artifactId>jbossweb</artifactId> + <version>2.1.1.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.3.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.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> + +  +  + <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> + + <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-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>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>dist</id> + <activation> + <activeByDefault>false</activeByDefault> + <property> + <name>maven.demo</name> + <value>true</value> + </property> + </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, 2 months

1
0
0 / 0

JBoss Native SVN: r2291 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-13 10:29:07 -0500 (Fri, 13 Feb 2009) New Revision: 2291 Modified: trunk/mod_cluster/pom.xml Log: [maven-release-plugin] prepare release 1.0.0.Beta4 Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-02-13 15:16:22 UTC (rev 2290) +++ trunk/mod_cluster/pom.xml 2009-02-13 15:29:07 UTC (rev 2291) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <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> @@ -9,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.Beta4</version> <name>mod_cluster</name> - <description></description> + <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/labs/labs/jbossbuild/jboss-parent/tag...</developerConnection> + <connection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.Beta4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.Beta4</developerConnection> </scm> <build> @@ -291,7 +290,7 @@  <ant antfile="build-test.xml" target="main" /> - <ant antfile="build-test.xml" target="tests-apache-integration"/> + <ant antfile="build-test.xml" target="tests-apache-integration" />

15 years, 2 months

1
0
0 / 0

JBoss Native SVN: r2290 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-13 10:16:22 -0500 (Fri, 13 Feb 2009) New Revision: 2290 Modified: trunk/mod_cluster/pom.xml Log: Add xml directive Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-02-13 08:11:37 UTC (rev 2289) +++ trunk/mod_cluster/pom.xml 2009-02-13 15:16:22 UTC (rev 2290) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <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> @@ -11,7 +12,7 @@ <version>1.0.0-SNAPSHOT</version> <name>mod_cluster</name> - <description /> + <description></description> <url>http://jboss.org/mod_cluster</url> <scm> @@ -290,7 +291,8 @@  <ant antfile="build-test.xml" target="main" /> - <ant antfile="build-test.xml" target="" /> + <ant antfile="build-test.xml" target="tests-apache-integration"/> +

15 years, 2 months

1
0
0 / 0

JBoss Native SVN: r2289 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-02-13 03:11:37 -0500 (Fri, 13 Feb 2009) New Revision: 2289 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Now the build doesn't build proxy-balancer, no need to comment it out. Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-02-12 21:19:17 UTC (rev 2288) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-02-13 08:11:37 UTC (rev 2289) @@ -209,7 +209,6 @@ file="$BASELOC/${BASEHTTPDCONF}/httpd.conf" cp -p "$file" "$file.new" echo "s/Listen 80.*/Listen @IP@:8000/" > sed.cmd -echo "s/LoadModule proxy_balancer/#LoadModule proxy_balancer/" >> sed.cmd sed -f sed.cmd "$file" > "$file.new" if $ADDMODULES

15 years, 2 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-12 16:19:17 -0500 (Thu, 12 Feb 2009) New Revision: 2288 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/AdvertiseListenerImplTestCase.java Log: Move AdvertiseListenerImpl construction into @Before method Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/AdvertiseListenerImplTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/AdvertiseListenerImplTestCase.java 2009-02-12 21:18:30 UTC (rev 2287) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/AdvertiseListenerImplTestCase.java 2009-02-12 21:19:17 UTC (rev 2288) @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ - package org.jboss.modcluster.advertise; import java.io.IOException; @@ -39,10 +38,11 @@ import org.jboss.modcluster.config.MCMPHandlerConfiguration; import org.jboss.modcluster.mcmp.MCMPHandler; import org.junit.After; +import org.junit.Before; import org.junit.Test; /** - * Tests of {@link AdvertiseListenerImpl}. + * Tests of {@link AdvertiseListener}. * * @author Brian Stansberry */ @@ -61,7 +61,22 @@ private MulticastSocketFactory socketFactory = EasyMock.createMock(MulticastSocketFactory.class); private MulticastSocket mcastSocket; - private AdvertiseListenerImpl testee; + private AdvertiseListener listener; + + @Before + public void setup() + { + EasyMock.expect(this.mcmpConfig.getAdvertiseGroupAddress()).andReturn(ADVERTISE_GROUP); + EasyMock.expect(this.mcmpConfig.getAdvertisePort()).andReturn(ADVERTISE_PORT); + EasyMock.expect(this.mcmpConfig.getAdvertiseSecurityKey()).andReturn(null); + + EasyMock.replay(this.mcmpConfig); + + this.listener = new AdvertiseListenerImpl(this.mcmpHandler, this.mcmpConfig, this.socketFactory); + + EasyMock.verify(this.mcmpConfig); + EasyMock.reset(this.mcmpConfig); + } @After public void tearDown() @@ -71,33 +86,22 @@ this.mcastSocket.close(); } - if (this.testee != null) + if (this.listener != null) { - this.testee.stop(); + this.listener.stop(); } } @Test public void testBasicOperation() throws IOException { - EasyMock.expect(this.mcmpConfig.getAdvertiseGroupAddress()).andReturn(ADVERTISE_GROUP); - EasyMock.expect(this.mcmpConfig.getAdvertisePort()).andReturn(ADVERTISE_PORT); - EasyMock.expect(this.mcmpConfig.getAdvertiseSecurityKey()).andReturn(null); - - EasyMock.replay(this.mcmpConfig); - - this.testee = new AdvertiseListenerImpl(this.mcmpHandler, this.mcmpConfig, this.socketFactory); - - EasyMock.verify(this.mcmpConfig); - EasyMock.reset(this.mcmpConfig); - Capture<InetAddress> capturedAddress = new Capture<InetAddress>(); EasyMock.expect(this.socketFactory.createMulticastSocket(EasyMock.capture(capturedAddress), EasyMock.eq(ADVERTISE_PORT))).andReturn(new MulticastSocket(ADVERTISE_PORT)); EasyMock.replay(this.socketFactory); - this.testee.start(); + this.listener.start(); EasyMock.verify(this.socketFactory);

15 years, 2 months

1
0
0 / 0

JBoss Native SVN: r2287 - in trunk/mod_cluster/src/main/java/org/jboss/modcluster: advertise and 1 other directories.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-12 16:18:30 -0500 (Thu, 12 Feb 2009) New Revision: 2287 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java Log: Handler IOException within AdvertiseListener.destroy() Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java 2009-02-12 21:01:48 UTC (rev 2286) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java 2009-02-12 21:18:30 UTC (rev 2287) @@ -147,14 +147,7 @@ if (this.advertiseListener != null) { - try - { - this.advertiseListener.destroy(); - } - catch (IOException e) - { - log.error(this.sm.getString("modcluster.error.stopListener"), e); - } + this.advertiseListener.destroy(); this.advertiseListener = null; } Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java 2009-02-12 21:01:48 UTC (rev 2286) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java 2009-02-12 21:18:30 UTC (rev 2287) @@ -54,5 +54,5 @@ /** * Deallocate listener and close sockets. */ - void destroy() throws IOException; + void destroy(); } \ No newline at end of file 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-02-12 21:01:48 UTC (rev 2286) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2009-02-12 21:18:30 UTC (rev 2287) @@ -334,13 +334,21 @@ * @{inheritDoc} * @see org.jboss.modcluster.advertise.AdvertiseListener#destroy() */ - public void destroy() throws IOException + public void destroy() { this.stop(); if (this.initialized) { - this.socket.leaveGroup(this.groupAddress); + try + { + this.socket.leaveGroup(this.groupAddress); + } + catch (IOException e) + { + log.warn(e.getMessage(), e); + } + this.socket.close(); this.initialized = false; this.socket = null;

15 years, 2 months

1
0
0 / 0

JBoss Native SVN: r2286 - in trunk/mod_cluster/src/main/java/org/jboss/modcluster: mcmp/impl and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-02-12 16:01:48 -0500 (Thu, 12 Feb 2009) New Revision: 2286 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPRequestFactory.java Log: Consolidate isAJP() logic into Utils method Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java 2009-02-11 14:39:35 UTC (rev 2285) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/Utils.java 2009-02-12 21:01:48 UTC (rev 2286) @@ -78,14 +78,10 @@ * protocol="org.apache.coyote.ajp.AjpProtocol" * protocol="AJP/1.3" */ - if (connector.getProtocol().startsWith("AJP")) // Return the first AJP connector found + if (isAJP(connector)) { return connector; } - if (connector.getProtocol().startsWith("org.apache.coyote.ajp")) // Return the first AJP connector found - { - return connector; - } ProtocolHandler handler = connector.getProtocolHandler(); @@ -107,6 +103,13 @@ return bestConnector; } + public static boolean isAJP(Connector connector) + { + String protocol = connector.getProtocol(); + + return protocol.startsWith("AJP") || protocol.startsWith("org.apache.coyote.ajp"); + } + /** * Return the address on which the connector is bound. * Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPRequestFactory.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPRequestFactory.java 2009-02-11 14:39:35 UTC (rev 2285) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPRequestFactory.java 2009-02-12 21:01:48 UTC (rev 2286) @@ -62,12 +62,7 @@ boolean reverseConnection = Boolean.TRUE.equals(IntrospectionUtils.getProperty(handler, "reverseConnection")); boolean ssl = Boolean.TRUE.equals(IntrospectionUtils.getProperty(handler, "SSLEnabled")); - // The name is not enough when using org.apache.jk.common.ChannelSocket (it is container). - boolean ajp = ((String) IntrospectionUtils.getProperty(handler, "name")).startsWith("ajp-"); - if (!ajp) - ajp = ((String) IntrospectionUtils.getProperty(connector, "protocol")).startsWith("AJP"); - if (!ajp) - ajp = ((String) IntrospectionUtils.getProperty(connector, "protocol")).startsWith("org.apache.coyote.ajp"); + boolean ajp = Utils.isAJP(connector); if (reverseConnection) {

15 years, 2 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 February 2009