JBoss Native SVN: r2258 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-31 13:27:39 -0500 (Sat, 31 Jan 2009)
New Revision: 2258
Modified:
trunk/build/unix/package.list
Log:
Back in developement mode :-)
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-01-31 18:25:58 UTC (rev 2257)
+++ trunk/build/unix/package.list 2009-01-31 18:27:39 UTC (rev 2258)
@@ -25,5 +25,5 @@
rhel-httpd|2.2.8-1.el5s2|httpd-2_2_8-1_el5s2|apr:r:apr-1_2_7-11|apu:r:apr-util-1_2_7-7_el5|api:v:1.2.1|ssl:r:openssl-0_9_8b-8_3_el5_0_2|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
# mod_cluster but using lastest ASF httpd.
mod_cluster|1.0.0.Beta2|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
+mod_cluster|1.0.0.Beta3|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.Beta3
mod_cluster|1.0.0.dev|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
-mod_cluster|1.0.0.Beta3|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.Beta3
15 years, 10 months
JBoss Native SVN: r2257 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-31 13:25:58 -0500 (Sat, 31 Jan 2009)
New Revision: 2257
Modified:
trunk/build/unix/util/jlibtool.c
Log:
After core in hp-ux ia64 add an option to allow 8 bits alignement.
Modified: trunk/build/unix/util/jlibtool.c
===================================================================
--- trunk/build/unix/util/jlibtool.c 2009-01-30 15:41:07 UTC (rev 2256)
+++ trunk/build/unix/util/jlibtool.c 2009-01-31 18:25:58 UTC (rev 2257)
@@ -179,6 +179,7 @@
# define LINKER_FLAG_PREFIX "-Wl,"
# define LD_LIBRARY_PATH "SHLIB_PATH"
# define ADD_MINUS_L
+# define ALIGN8 "+u1"
#endif
#ifndef SHELL_CMD
@@ -1728,6 +1729,9 @@
push_count_chars(cmd_data->arglist, PIC_FLAG);
}
#endif
+#ifdef ALIGN8
+ push_count_chars(cmd_data->arglist, ALIGN8);
+#endif
if (cmd_data->output_name) {
push_count_chars(cmd_data->arglist, "-o");
push_count_chars(cmd_data->arglist, cmd_data->output_name);
15 years, 10 months
JBoss Native SVN: r2256 - trunk/mod_cluster/native/advertise.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2009-01-30 10:41:07 -0500 (Fri, 30 Jan 2009)
New Revision: 2256
Modified:
trunk/mod_cluster/native/advertise/mod_advertise.c
Log:
First try to do a group join, then fallback to loopback
Modified: trunk/mod_cluster/native/advertise/mod_advertise.c
===================================================================
--- trunk/mod_cluster/native/advertise/mod_advertise.c 2009-01-30 15:31:15 UTC (rev 2255)
+++ trunk/mod_cluster/native/advertise/mod_advertise.c 2009-01-30 15:41:07 UTC (rev 2256)
@@ -350,22 +350,17 @@
"mod_advertise: ma_group_join apr_socket_create failed");
return rv;
}
-#if 1
- if ((rv = apr_mcast_loopback(ma_mgroup_socket, 1)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
- "mod_advertise: ma_group_join apr_mcast_loopback failed");
- return rv;
- }
-#else
if ((rv = apr_mcast_join(ma_mgroup_socket, ma_mgroup_sa,
NULL, NULL)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
- "mod_advertise: ma_group_join apr_mcast_join failed %d %d",
- ma_mgroup_sa->family, APR_ENOTIMPL);
- apr_socket_close(ma_mgroup_socket);
- return rv;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s,
+ "mod_advertise: ma_group_join apr_mcast_join failed");
+ if ((rv = apr_mcast_loopback(ma_mgroup_socket, 1)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
+ "mod_advertise: ma_group_join apr_mcast_loopback failed");
+ apr_socket_close(ma_mgroup_socket);
+ return rv;
+ }
}
-#endif
if ((rv = apr_mcast_hops(ma_mgroup_socket,
MA_ADVERTISE_HOPS)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
15 years, 10 months
JBoss Native SVN: r2255 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-30 10:31:15 -0500 (Fri, 30 Jan 2009)
New Revision: 2255
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Oops obvious typo.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-01-30 13:50:31 UTC (rev 2254)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-01-30 15:31:15 UTC (rev 2255)
@@ -378,7 +378,7 @@
return !OK;
}
- sessionidstatsmem = create_mem_sessionid(sessionid, &mconf->maxhost, mconf->persistent, p, storage);
+ sessionidstatsmem = create_mem_sessionid(sessionid, &mconf->maxsessionid, mconf->persistent, p, storage);
if (sessionidstatsmem == NULL) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "create_mem_sessionid failed");
return !OK;
15 years, 10 months
JBoss Native SVN: r2254 - trunk/mod_cluster/native/advertise.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2009-01-30 08:50:31 -0500 (Fri, 30 Jan 2009)
New Revision: 2254
Modified:
trunk/mod_cluster/native/advertise/mod_advertise.c
Log:
Use loopback instead join for multicast. This seems to work on Windoze
Modified: trunk/mod_cluster/native/advertise/mod_advertise.c
===================================================================
--- trunk/mod_cluster/native/advertise/mod_advertise.c 2009-01-29 22:00:26 UTC (rev 2253)
+++ trunk/mod_cluster/native/advertise/mod_advertise.c 2009-01-30 13:50:31 UTC (rev 2254)
@@ -350,13 +350,22 @@
"mod_advertise: ma_group_join apr_socket_create failed");
return rv;
}
+#if 1
+ if ((rv = apr_mcast_loopback(ma_mgroup_socket, 1)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
+ "mod_advertise: ma_group_join apr_mcast_loopback failed");
+ return rv;
+ }
+#else
if ((rv = apr_mcast_join(ma_mgroup_socket, ma_mgroup_sa,
NULL, NULL)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
- "mod_advertise: ma_group_join apr_mcast_join failed");
+ "mod_advertise: ma_group_join apr_mcast_join failed %d %d",
+ ma_mgroup_sa->family, APR_ENOTIMPL);
apr_socket_close(ma_mgroup_socket);
return rv;
}
+#endif
if ((rv = apr_mcast_hops(ma_mgroup_socket,
MA_ADVERTISE_HOPS)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
15 years, 10 months
JBoss Native SVN: r2253 - tags/mod_cluster/1.0.0.Beta3/test/java.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-29 17:00:26 -0500 (Thu, 29 Jan 2009)
New Revision: 2253
Modified:
tags/mod_cluster/1.0.0.Beta3/test/java/installhttpd.sh
Log:
Ajust to beta3.
Modified: tags/mod_cluster/1.0.0.Beta3/test/java/installhttpd.sh
===================================================================
--- tags/mod_cluster/1.0.0.Beta3/test/java/installhttpd.sh 2009-01-29 21:58:23 UTC (rev 2252)
+++ tags/mod_cluster/1.0.0.Beta3/test/java/installhttpd.sh 2009-01-29 22:00:26 UTC (rev 2253)
@@ -110,7 +110,7 @@
;;
esac
#PACKAGE=rhel-httpd-2.2.8-1.el5s2
-PACKAGE=mod_cluster-1.0.0.dev
+PACKAGE=mod_cluster-1.0.0.Beta3
# Something like (note don't use ssl for the moment.
# http://hudson.qa.jboss.com/hudson/view/Native/job/mod_cluster-linux-x86_6...
15 years, 10 months
JBoss Native SVN: r2252 - tags/mod_cluster/1.0.0.Beta3/test/java.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-29 16:58:23 -0500 (Thu, 29 Jan 2009)
New Revision: 2252
Modified:
tags/mod_cluster/1.0.0.Beta3/test/java/build.properties.default
Log:
Adjust to beta3.
Modified: tags/mod_cluster/1.0.0.Beta3/test/java/build.properties.default
===================================================================
--- tags/mod_cluster/1.0.0.Beta3/test/java/build.properties.default 2009-01-29 16:53:20 UTC (rev 2251)
+++ tags/mod_cluster/1.0.0.Beta3/test/java/build.properties.default 2009-01-29 21:58:23 UTC (rev 2252)
@@ -41,4 +41,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.Beta3.jar
15 years, 10 months
JBoss Native SVN: r2251 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-29 11:53:20 -0500 (Thu, 29 Jan 2009)
New Revision: 2251
Modified:
trunk/build/unix/package.list
Log:
mod_cluster is now beta3
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-01-29 16:21:16 UTC (rev 2250)
+++ trunk/build/unix/package.list 2009-01-29 16:53:20 UTC (rev 2251)
@@ -26,3 +26,4 @@
# mod_cluster but using lastest ASF httpd.
mod_cluster|1.0.0.Beta2|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
mod_cluster|1.0.0.dev|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
+mod_cluster|1.0.0.Beta3|2.2.10|ssl:v:0.9.8i|zlib:v:1.2.3|jk:v:1.2.26|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.Beta3
15 years, 11 months
JBoss Native SVN: r2249 - in tags/mod_cluster: 1.0.0.Beta3 and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: pferraro
Date: 2009-01-29 11:21:13 -0500 (Thu, 29 Jan 2009)
New Revision: 2249
Added:
tags/mod_cluster/1.0.0.Beta3/
tags/mod_cluster/1.0.0.Beta3/pom.xml
Removed:
tags/mod_cluster/1.0.0.Beta3/pom.xml
Log:
[maven-release-plugin] copy for tag 1.0.0.Beta3
Copied: tags/mod_cluster/1.0.0.Beta3 (from rev 2247, trunk/mod_cluster)
Deleted: tags/mod_cluster/1.0.0.Beta3/pom.xml
===================================================================
--- trunk/mod_cluster/pom.xml 2009-01-29 16:02:18 UTC (rev 2247)
+++ tags/mod_cluster/1.0.0.Beta3/pom.xml 2009-01-29 16:21:13 UTC (rev 2249)
@@ -1,407 +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>
- <!-- Integration tests are in the "test" package; don't
- run those during the normal surefire run -->
- <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>
-
- <!-- Dependency Plugin Configuration -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <!-- Unpack requisite build scripts -->
- <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>
- <!-- Copy jboss-test JAR -->
- <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>
-
- <!-- JAR the Tests -->
- <!-- TODO: Instead of passing of the build directory, this jar is passed to junit. Why? -->
- <!-- BES: I copied this from ejb3/testsuite/pom.xml but am commenting it
- out until I see a requirement for it
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </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>
-
- <!-- For installation in standalone JBoss Web or Tomcat -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- <version>2.0.5.GA</version>
- <optional>true</optional>
- </dependency>
-
- <!-- Test dependencies -->
- <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>
- <!-- Latest release still uses jboss-server-manager 1.0.0.GA, which still uses AS 5.0.0.CR2 -->
- <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>
-
- <!-- Demo dependencies -->
- <!-- Use provided scope, until demo is moved to separate module -->
- <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>
- <!-- The individual integration tests are built and run using Ant -->
- <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>
-
- <!-- Execute the Test Build -->
- <ant antfile="build-test.xml" target="main" />
-
- <ant antfile="build-test.xml" target=""/>
- <!-- Execute the integration tests that require httpd -->
- <!--ant antfile="build-test.xml" target="tests-clustering-unit" /-->
-
- </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>
- <!-- <excludeTransitive>true</excludeTransitive> -->
- </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>
-
- <!-- Execute the Test Build -->
- <ant antfile="build-demo.xml" target="main" />
-
- <!-- Create the JBossWeb-Tomcat install structure -->
- <ant antfile="build-jbossweb.xml" target="all">
- <property name="mod-cluster.jar.name" value="${project.build.finalName}" />
- </ant>
-
- <!-- Execute the demo that require httpd -->
- <!--ant antfile="build-demo.xml" target="run-demo" /-->
-
- </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.Beta3/pom.xml (from rev 2248, trunk/mod_cluster/pom.xml)
===================================================================
--- tags/mod_cluster/1.0.0.Beta3/pom.xml (rev 0)
+++ tags/mod_cluster/1.0.0.Beta3/pom.xml 2009-01-29 16:21:13 UTC (rev 2249)
@@ -0,0 +1,406 @@
+<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.Beta3</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.Beta3</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossnative/tags/mod_cluster/1.0.0.Beta3</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>
+ <!-- Integration tests are in the "test" package; don't
+ run those during the normal surefire run -->
+ <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>
+
+ <!-- Dependency Plugin Configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <!-- Unpack requisite build scripts -->
+ <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>
+ <!-- Copy jboss-test JAR -->
+ <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>
+
+ <!-- JAR the Tests -->
+ <!-- TODO: Instead of passing of the build directory, this jar is passed to junit. Why? -->
+ <!-- BES: I copied this from ejb3/testsuite/pom.xml but am commenting it
+ out until I see a requirement for it
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </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>
+
+ <!-- For installation in standalone JBoss Web or Tomcat -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-jdk</artifactId>
+ <version>2.0.5.GA</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <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>
+ <!-- Latest release still uses jboss-server-manager 1.0.0.GA, which still uses AS 5.0.0.CR2 -->
+ <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>
+
+ <!-- Demo dependencies -->
+ <!-- Use provided scope, until demo is moved to separate module -->
+ <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>
+ <!-- The individual integration tests are built and run using Ant -->
+ <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>
+
+ <!-- Execute the Test Build -->
+ <ant antfile="build-test.xml" target="main" />
+
+ <ant antfile="build-test.xml" target="" />
+ <!-- Execute the integration tests that require httpd -->
+ <!--ant antfile="build-test.xml" target="tests-clustering-unit" /-->
+
+ </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>
+ <!-- <excludeTransitive>true</excludeTransitive> -->
+ </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>
+
+ <!-- Execute the Test Build -->
+ <ant antfile="build-demo.xml" target="main" />
+
+ <!-- Create the JBossWeb-Tomcat install structure -->
+ <ant antfile="build-jbossweb.xml" target="all">
+ <property name="mod-cluster.jar.name" value="${project.build.finalName}" />
+ </ant>
+
+ <!-- Execute the demo that require httpd -->
+ <!--ant antfile="build-demo.xml" target="run-demo" /-->
+
+ </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, 11 months