July 2009 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r2491 - in trunk/mod_cluster/src: test/java/org/jboss/modcluster/advertise and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-13 10:49:37 -0400 (Mon, 13 Jul 2009) New Revision: 2491 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java Log: HP-UX also behaves like Linux. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java 2009-07-13 11:41:54 UTC (rev 2490) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java 2009-07-13 14:49:37 UTC (rev 2491) @@ -49,7 +49,7 @@ { String value = this.getSystemProperty("os.name"); - this.linuxlike = (value != null) && (value.toLowerCase().startsWith("linux") || value.toLowerCase().startsWith("mac")); + this.linuxlike = (value != null) && (value.toLowerCase().startsWith("linux") || value.toLowerCase().startsWith("mac") || value.toLowerCase().startsWith("hp")); } private String getSystemProperty(final String key) 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-07-13 11:41:54 UTC (rev 2490) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java 2009-07-13 14:49:37 UTC (rev 2491) @@ -57,7 +57,9 @@ String os = System.getProperty("os.name"); // Validate cross-talking behavior on linux only - if ((os != null) && (os.trim().toLowerCase().startsWith("linux") || os.trim().toLowerCase().startsWith("mac"))) + if ((os != null) && (os.trim().toLowerCase().startsWith("linux") || + os.trim().toLowerCase().startsWith("mac") || + os.trim().toLowerCase().startsWith("hp") )) { System.setProperty("os.name", "OtherOS");

15 years, 5 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-13 07:41:54 -0400 (Mon, 13 Jul 2009) New Revision: 2490 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/AdvertiseListenerImplTestCase.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java Log: Use default port for the tests. 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-07-13 10:12:13 UTC (rev 2489) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/AdvertiseListenerImplTestCase.java 2009-07-13 11:41:54 UTC (rev 2490) @@ -51,7 +51,7 @@ public class AdvertiseListenerImplTestCase { private static final String ADVERTISE_GROUP = "224.0.1.106"; - private static final int ADVERTISE_PORT = 23365; + private static final int ADVERTISE_PORT = 23364; private static final String RFC_822_FMT = "EEE, d MMM yyyy HH:mm:ss Z"; private static final DateFormat df = new SimpleDateFormat(RFC_822_FMT, Locale.US); private static final String SERVER1 = "foo.bar.com"; 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-07-13 10:12:13 UTC (rev 2489) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java 2009-07-13 11:41:54 UTC (rev 2490) @@ -43,7 +43,7 @@ { private static final String GROUP1 = "224.0.1.106"; private static final String GROUP2 = "224.0.1.107"; - private static final int PORT = 23365; + private static final int PORT = 23364; @Test public void testMulticastSocketNoCrossTalk() throws IOException

15 years, 5 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-13 06:09:23 -0400 (Mon, 13 Jul 2009) New Revision: 2488 Modified: trunk/mod_cluster/test/java/README.txt Log: Add a node about extra. Modified: trunk/mod_cluster/test/java/README.txt =================================================================== --- trunk/mod_cluster/test/java/README.txt 2009-07-10 14:59:15 UTC (rev 2487) +++ trunk/mod_cluster/test/java/README.txt 2009-07-13 10:09:23 UTC (rev 2488) @@ -10,6 +10,8 @@ 3 - JBW listener: to test the JBW cluster listener use -Dcluster=false for example: ant one -Dtest=Test_Chunk_JBWEB_117 -Dcluster=false +4 - To run the test with an httpd already installed and running: + ant extra NOTE the httpd should have something like the following in httpd.conf <IfModule manager_module>

15 years, 5 months

1
0
0 / 0

JBoss Native SVN: r2487 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 10:59:15 -0400 (Fri, 10 Jul 2009) New Revision: 2487 Modified: trunk/build/patch/httpd-2.2.11.patch Log: apr-util needs quite a lot... Modified: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch 2009-07-10 13:27:54 UTC (rev 2486) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 14:59:15 UTC (rev 2487) @@ -30,15 +30,69 @@ dnl Hard-coded inclusion at the tail end of apr_private.h: AH_BOTTOM([ - ---- srclib/apr-util/xml/expat/configure.in (revision 792909) +--- srclib/apr-util/configure.in (revision 792943) ++++ srclib/apr-util/configure.in (working copy) +@@ -8,6 +8,10 @@ + AC_CONFIG_HEADER(include/private/apu_config.h) + AC_CONFIG_AUX_DIR(build) + ++sinclude(build/ltsugar.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obselete.m4) ++sinclude(build/ltoptions) + sinclude(build/apu-conf.m4) + sinclude(build/apu-iconv.m4) + sinclude(build/apu-hints.m4) +@@ -17,6 +21,8 @@ + sinclude(build/dbd.m4) + sinclude(build/dso.m4) + ++ ++ + dnl Generate ./config.nice for reproducing runs of configure + dnl + APR_CONFIG_NICE(config.nice) +--- srclib/apr-util/xml/expat/configure.in (revision 792943) +++ srclib/apr-util/xml/expat/configure.in (working copy) -@@ -53,8 +53,7 @@ - LIBTOOL="$srcdir/../../../apr/build/aplibtool" +@@ -46,6 +46,15 @@ + AC_CONFIG_HEADER(config.h) + + AC_CANONICAL_SYSTEM ++ ++sinclude(ltoptions) ++sinclude(libtool.m4) ++sinclude(ltsugar.m4) ++sinclude(argz.m4) ++sinclude(ltoptions.m4) ++sinclude(ltversion.m4) ++sinclude(lt~obsolete.m4) ++ + case "$host_os" in + *os2*) + # Use a custom made libtool replacement +@@ -54,7 +63,7 @@ ;; *) -- AC_LIBTOOL_WIN32_DLL + AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL + AC_PROG_LIBTOOL ;; esac + +--- srclib/apr-util/xml/expat/buildconf.sh (revision 792943) ++++ srclib/apr-util/xml/expat/buildconf.sh (working copy) +@@ -32,6 +32,14 @@ + # + if [ -f libtool.m4 ]; then + ltfile=libtool.m4 ++elif grep all_pkgmacro_files $libtoolize > /dev/null; then ++ # libtool 2.x ++ aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` ++ ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` ++ for f in $ltfiles; do ++ test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" . ++ done ++ ltfile=$aclocal_dir/libtool.m4 + else + ltpath=`dirname $libtoolize` + ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}

15 years, 5 months

1
0
0 / 0

JBoss Native SVN: r2486 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 09:27:54 -0400 (Fri, 10 Jul 2009) New Revision: 2486 Modified: trunk/build/patch/httpd-2.2.11.patch Log: We DO need AC_PROG_LIBTOOL Modified: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch 2009-07-10 13:12:18 UTC (rev 2485) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 13:27:54 UTC (rev 2486) @@ -33,14 +33,12 @@ --- srclib/apr-util/xml/expat/configure.in (revision 792909) +++ srclib/apr-util/xml/expat/configure.in (working copy) -@@ -52,10 +52,6 @@ - echo Using aplibtool +@@ -53,8 +53,7 @@ LIBTOOL="$srcdir/../../../apr/build/aplibtool" ;; --*) + *) - AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL -- ;; ++ AC_PROG_LIBTOOL + ;; esac - - blddir=`pwd`

15 years, 5 months

1
0
0 / 0

JBoss Native SVN: r2485 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 09:12:18 -0400 (Fri, 10 Jul 2009) New Revision: 2485 Modified: trunk/build/patch/httpd-2.2.11.patch Log: Patch for AC_LIBTOOL_WIN32_DLL (Well that is a hack). Modified: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:36:16 UTC (rev 2484) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 13:12:18 UTC (rev 2485) @@ -31,3 +31,16 @@ AH_BOTTOM([ +--- srclib/apr-util/xml/expat/configure.in (revision 792909) ++++ srclib/apr-util/xml/expat/configure.in (working copy) +@@ -52,10 +52,6 @@ + echo Using aplibtool + LIBTOOL="$srcdir/../../../apr/build/aplibtool" + ;; +-*) +- AC_LIBTOOL_WIN32_DLL +-AC_PROG_LIBTOOL +- ;; + esac + + blddir=`pwd`

15 years, 5 months

1
0
0 / 0

JBoss Native SVN: r2484 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 05:36:16 -0400 (Fri, 10 Jul 2009) New Revision: 2484 Modified: trunk/build/patch/httpd-2.2.11.patch Log: Rollback previous. Modified: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:26:14 UTC (rev 2483) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:36:16 UTC (rev 2484) @@ -31,16 +31,3 @@ AH_BOTTOM([ ---- srclib/apr-util/xml/expat/buildconf.sh (original) -+++ srclib/apr-util/xml/expat/buildconf.sh Mon Feb 9 21:48:00 2009 -@@ -3,7 +3,7 @@ - # - # Find libtoolize - # --libtoolize=`conftools/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14` -+libtoolize=`conftools/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 - -

15 years, 5 months

1
0
0 / 0

JBoss Native SVN: r2483 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 05:26:14 -0400 (Fri, 10 Jul 2009) New Revision: 2483 Modified: trunk/build/patch/httpd-2.2.11.patch Log: Add expat patch. Modified: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:20:11 UTC (rev 2482) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:26:14 UTC (rev 2483) @@ -31,4 +31,16 @@ AH_BOTTOM([ +--- srclib/apr-util/xml/expat/buildconf.sh (original) ++++ srclib/apr-util/xml/expat/buildconf.sh Mon Feb 9 21:48:00 2009 +@@ -3,7 +3,7 @@ + # + # Find libtoolize + # +-libtoolize=`conftools/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14` ++libtoolize=`conftools/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` + if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +

15 years, 5 months

1
0
0 / 0

JBoss Native SVN: r2482 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-10 05:20:11 -0400 (Fri, 10 Jul 2009) New Revision: 2482 Added: trunk/build/patch/httpd-2.2.11.patch Log: Add support for libtool 2.2.x Added: trunk/build/patch/httpd-2.2.11.patch =================================================================== --- trunk/build/patch/httpd-2.2.11.patch (rev 0) +++ trunk/build/patch/httpd-2.2.11.patch 2009-07-10 09:20:11 UTC (rev 2482) @@ -0,0 +1,34 @@ +--- srclib/apr/buildconf (original) ++++ srclib/apr/buildconf Tue Feb 24 03:24:54 2009 +@@ -45,6 +45,14 @@ + + if [ -f libtool.m4 ]; then + ltfile=`pwd`/libtool.m4 ++elif grep all_pkgmacro_files $libtoolize > /dev/null; then ++ # libtool 2.x ++ aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` ++ ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` ++ for f in $ltfiles; do ++ test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build ++ done ++ ltfile=$aclocal_dir/libtool.m4 + else + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + +--- srclib/apr/configure.in (original) ++++ srclib/apr/configure.in Tue Feb 24 03:24:54 2009 +@@ -20,6 +20,10 @@ + sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) + sinclude(build/ltsugar.m4) ++sinclude(build/argz.m4) ++sinclude(build/ltoptions.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obsolete.m4) + + dnl Hard-coded inclusion at the tail end of apr_private.h: + AH_BOTTOM([ + + +

15 years, 5 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-09 12:37:49 -0400 (Thu, 09 Jul 2009) New Revision: 2481 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildtest.mod_cluster.sh Log: windoze will fail... Because of spaces. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-09 16:02:13 UTC (rev 2480) +++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-09 16:37:49 UTC (rev 2481) @@ -239,7 +239,7 @@ BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` fi echo "Running: ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache=${BASELOC}" - ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache=${BASELOC} + ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache="${BASELOC}" ) # Build the *.so for any httpd-2.2.x using the httpd install done before Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-09 16:02:13 UTC (rev 2480) +++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-09 16:37:49 UTC (rev 2481) @@ -61,7 +61,7 @@ BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` fi echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC}" - ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache=${BASELOC} + ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=${mod_cluster_jar} -Dbase.apache="${BASELOC}" ) || exit 1 echo ""

15 years, 5 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 July 2009