JBoss Native SVN: r2325 - trunk/mod_cluster/test/native.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-26 11:34:10 -0500 (Thu, 26 Feb 2009)
New Revision: 2325
Modified:
trunk/mod_cluster/test/native/Advertise.c
Log:
Like in mod_advertise...
Modified: trunk/mod_cluster/test/native/Advertise.c
===================================================================
--- trunk/mod_cluster/test/native/Advertise.c 2009-02-26 16:33:36 UTC (rev 2324)
+++ trunk/mod_cluster/test/native/Advertise.c 2009-02-26 16:34:10 UTC (rev 2325)
@@ -33,6 +33,8 @@
apr_pool_t *pool;
apr_status_t rv;
apr_sockaddr_t *ma_mgroup_sa;
+ apr_sockaddr_t *ma_listen_sa;
+ apr_sockaddr_t *ma_niface_sa;
apr_socket_t *ma_mgroup_socket;
char buf[20];
apr_size_t n;
@@ -47,17 +49,45 @@
printf("apr_sockaddr_info_get failed %d\n", rv);
return 1;
}
+ rv = apr_sockaddr_info_get(&ma_listen_sa, NULL, ma_mgroup_sa->family, 0, APR_UNSPEC, pool);
+ if (rv != APR_SUCCESS) {
+ printf("apr_sockaddr_info_get(NULL) failed %d\n", rv);
+ return 1;
+ }
+ rv = apr_sockaddr_info_get(&ma_niface_sa, NULL, ma_mgroup_sa->family, 0, APR_UNSPEC, pool);
+ if (rv != APR_SUCCESS) {
+ printf("apr_sockaddr_info_get(NULL) failed %d\n", rv);
+ return 1;
+ }
rv = apr_socket_create(&ma_mgroup_socket, ma_mgroup_sa->family, SOCK_DGRAM, APR_PROTO_UDP, pool);
if (rv != APR_SUCCESS) {
printf("apr_socket_create failed %d\n", rv);
return 1;
}
- rv = apr_mcast_join(ma_mgroup_socket, ma_mgroup_sa, NULL, NULL);
+ rv = apr_socket_bind(ma_mgroup_socket, ma_listen_sa);
if (rv != APR_SUCCESS) {
+ printf("apr_socket_bind failed %d\n", rv);
+ return 1;
+ }
+
+ rv = apr_mcast_join(ma_mgroup_socket, ma_mgroup_sa, ma_niface_sa, NULL);
+ if (rv != APR_SUCCESS) {
printf("apr_mcast_join failed %d\n", rv);
return 1;
}
+/*
+ rv = apr_mcast_loopback(ma_mgroup_socket, 1);
+ if (rv != APR_SUCCESS) {
+ printf("apr_mcast_loopback failed %d\n", rv);
+ return 1;
+ }
+ */
+ rv = apr_mcast_hops(ma_mgroup_socket, 10);
+ if (rv != APR_SUCCESS) {
+ printf("apr_mcast_hops failed %d\n", rv);
+ return 1;
+ }
n = apr_snprintf(buf, 20, "Advertize !!!\n");
rv = apr_socket_sendto(ma_mgroup_socket,
15 years, 10 months
JBoss Native SVN: r2324 - trunk/mod_cluster.
by jbossnative-commits@lists.jboss.org
Author: pferraro
Date: 2009-02-26 11:33:36 -0500 (Thu, 26 Feb 2009)
New Revision: 2324
Modified:
trunk/mod_cluster/pom.xml
Log:
Refreshed dependencies
Modified: trunk/mod_cluster/pom.xml
===================================================================
--- trunk/mod_cluster/pom.xml 2009-02-26 14:23:56 UTC (rev 2323)
+++ trunk/mod_cluster/pom.xml 2009-02-26 16:33:36 UTC (rev 2324)
@@ -148,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</plugin>
</plugins>
</pluginManagement>
@@ -163,7 +163,7 @@
<dependency>
<groupId>jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>2.1.1.GA</version>
+ <version>2.1.2.GA</version>
</dependency>
<dependency>
<groupId>net.jcip</groupId>
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.3.GA</version>
+ <version>2.0.4.GA</version>
</dependency>
<!-- For installation in standalone JBoss Web or Tomcat -->
@@ -299,18 +299,6 @@
</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>
15 years, 10 months
JBoss Native SVN: r2323 - trunk/mod_cluster/test/native.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-26 09:23:56 -0500 (Thu, 26 Feb 2009)
New Revision: 2323
Modified:
trunk/mod_cluster/test/native/Advertise.c
trunk/mod_cluster/test/native/Makefile
Log:
Investigate on cluster10...
Modified: trunk/mod_cluster/test/native/Advertise.c
===================================================================
--- trunk/mod_cluster/test/native/Advertise.c 2009-02-26 10:06:51 UTC (rev 2322)
+++ trunk/mod_cluster/test/native/Advertise.c 2009-02-26 14:23:56 UTC (rev 2323)
@@ -34,6 +34,8 @@
apr_status_t rv;
apr_sockaddr_t *ma_mgroup_sa;
apr_socket_t *ma_mgroup_socket;
+ char buf[20];
+ apr_size_t n;
apr_initialize();
atexit(apr_terminate);
@@ -57,7 +59,12 @@
return 1;
}
-
-
+ n = apr_snprintf(buf, 20, "Advertize !!!\n");
+ rv = apr_socket_sendto(ma_mgroup_socket,
+ ma_mgroup_sa, 0, buf, &n);
+ if (rv != APR_SUCCESS) {
+ printf("apr_socket_sendto failed %d %s\n", n, apr_strerror(rv, buf, 20));
+ return 1;
+ }
return 0;
}
Modified: trunk/mod_cluster/test/native/Makefile
===================================================================
--- trunk/mod_cluster/test/native/Makefile 2009-02-26 10:06:51 UTC (rev 2322)
+++ trunk/mod_cluster/test/native/Makefile 2009-02-26 14:23:56 UTC (rev 2323)
@@ -1,5 +1,6 @@
-APACHE_BASE = /home/jfclere/APACHE-2.2.9
+APACHE_BASE = /home/jbento/modclusterdemo/opt/jboss/httpd/
+APACHE_INC = /home/jbento/modclusterdemo/opt/jboss/httpd/include/httpd
Advertise: Advertise.c
- cc -c -I$(APACHE_BASE)/include Advertise.c
+ cc -c -I$(APACHE_INC) Advertise.c
cc -o Advertise Advertise.o -L$(APACHE_BASE)/lib -lapr-1
15 years, 10 months
JBoss Native SVN: r2322 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-26 05:06:51 -0500 (Thu, 26 Feb 2009)
New Revision: 2322
Added:
trunk/mod_cluster/test/java/SAdvertize.java
Log:
Add multicast server for testings.
Added: trunk/mod_cluster/test/java/SAdvertize.java
===================================================================
--- trunk/mod_cluster/test/java/SAdvertize.java (rev 0)
+++ trunk/mod_cluster/test/java/SAdvertize.java 2009-02-26 10:06:51 UTC (rev 2322)
@@ -0,0 +1,23 @@
+import java.net.MulticastSocket;
+import java.net.InetAddress;
+import java.net.DatagramPacket;
+
+public class SAdvertize
+{
+ public static void main(String[] args) throws Exception
+ {
+ // InetAddress group = InetAddress.getByName("224.0.1.105");
+ InetAddress group = InetAddress.getByName("232.0.0.2");
+ MulticastSocket s = new MulticastSocket(23364);
+ s.setTimeToLive(16);
+ s.joinGroup(group);
+ boolean ok = true;
+ while (ok) {
+ byte[] buf = new byte[1000];
+ DatagramPacket recv = new DatagramPacket(buf, buf.length, group, 23364);
+ s.send(recv);
+ Thread.currentThread().sleep(10000);
+ }
+ s.leaveGroup(group);
+ }
+}
15 years, 10 months
JBoss Native SVN: r2321 - trunk/mod_cluster/test/java.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-25 05:01:43 -0500 (Wed, 25 Feb 2009)
New Revision: 2321
Modified:
trunk/mod_cluster/test/java/installhttpd.sh
Log:
Don't remove if download failed (no build.xml for example) so that
the script could be used on existing installations.
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-02-25 09:34:23 UTC (rev 2320)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-02-25 10:01:43 UTC (rev 2321)
@@ -139,12 +139,17 @@
#
TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc...
BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
+REMOVE=true
if [ "x${BASELOC}" = "x" ]
then
BASELOC=`pwd`
if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
then
ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"
+ if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ]
+ then
+ REMOVE=false
+ fi
fi
else
if [ "x${BUILDTEST}" = "N" ]
@@ -162,7 +167,10 @@
echo "Base is: $BASELOC !!!"
# Clean previous install
-rm -rf "$BASELOC/$BASEHTTPD"
+if $REMOVE
+then
+ rm -rf "$BASELOC/$BASEHTTPD"
+fi
case ${EXT} in
file)
cp -rp $root/* "$BASELOC"
15 years, 10 months
JBoss Native SVN: r2320 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-25 04:34:23 -0500 (Wed, 25 Feb 2009)
New Revision: 2320
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
Oops missing .jar
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-25 08:07:37 UTC (rev 2319)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-25 09:34:23 UTC (rev 2320)
@@ -53,7 +53,7 @@
mod_cluster_jar=${build_version}
;;
esac
-mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}
+mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar
echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}"
(cd $anttestsdir
ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}
15 years, 10 months
JBoss Native SVN: r2319 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-25 03:07:37 -0500 (Wed, 25 Feb 2009)
New Revision: 2319
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
dd a log message.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-25 07:39:23 UTC (rev 2318)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-25 08:07:37 UTC (rev 2319)
@@ -54,6 +54,7 @@
;;
esac
mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}
+echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}"
(cd $anttestsdir
ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}
) || exit 1
15 years, 10 months
JBoss Native SVN: r2318 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-25 02:39:23 -0500 (Wed, 25 Feb 2009)
New Revision: 2318
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
typo.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-24 10:47:03 UTC (rev 2317)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-25 07:39:23 UTC (rev 2318)
@@ -53,7 +53,7 @@
mod_cluster_jar=${build_version}
;;
esac
-mod_cluster_jar=../../target/mod-cluster${mod_cluster_jar}
+mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}
(cd $anttestsdir
ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}
) || exit 1
15 years, 10 months
JBoss Native SVN: r2317 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-24 05:47:03 -0500 (Tue, 24 Feb 2009)
New Revision: 2317
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
Log:
. in the varaible name is not a good idea...
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-24 08:38:08 UTC (rev 2316)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-24 10:47:03 UTC (rev 2317)
@@ -47,15 +47,15 @@
# 1.0.0.Beta4 = 1.0.0.Beta4
case ${build_version} in
*.dev)
- mod_cluster.jar=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
+ mod_cluster_jar=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
;;
*)
- mod_cluster.jar=${build_version}
+ mod_cluster_jar=${build_version}
;;
esac
-mod_cluster.jar=../../target/mod-cluster${mod_cluster.jar}
+mod_cluster_jar=../../target/mod-cluster${mod_cluster_jar}
(cd $anttestsdir
- ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster.jar}
+ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar}
) || exit 1
echo ""
15 years, 10 months
JBoss Native SVN: r2316 - in trunk: mod_cluster/test/java and 1 other directory.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-02-24 03:38:08 -0500 (Tue, 24 Feb 2009)
New Revision: 2316
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
trunk/mod_cluster/test/java/build.properties.default
Log:
Use mod_cluster.jar directly.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-02-24 07:46:13 UTC (rev 2315)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-02-24 08:38:08 UTC (rev 2316)
@@ -47,14 +47,15 @@
# 1.0.0.Beta4 = 1.0.0.Beta4
case ${build_version} in
*.dev)
- mvn_version=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
+ mod_cluster.jar=`echo ${build_version} | sed 's:.dev:-SNAPSHOT:'`
;;
*)
- mvn_version=${build_version}
+ mod_cluster.jar=${build_version}
;;
esac
+mod_cluster.jar=../../target/mod-cluster${mod_cluster.jar}
(cd $anttestsdir
- ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmvn_version=${Dmvn_version}
+ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster.jar}
) || exit 1
echo ""
Modified: trunk/mod_cluster/test/java/build.properties.default
===================================================================
--- trunk/mod_cluster/test/java/build.properties.default 2009-02-24 07:46:13 UTC (rev 2315)
+++ trunk/mod_cluster/test/java/build.properties.default 2009-02-24 08:38:08 UTC (rev 2316)
@@ -1,7 +1,6 @@
test.failonerror=true
BUILDTEST=N
build_version=1.0.0.dev
-mvn_version=1.0.0-SNAPSHOT
root=.
base-apache.loc=http://archive.apache.org/dist/
@@ -46,4 +45,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-${mvn_version}.jar
+mod_cluster.jar=../../target/mod-cluster-1.0.0-SNAPSHOT.jar
15 years, 10 months