January 2014 - jbossnative-commits

JBoss Native SVN: r3189 - trunk/httpd/httpd-2.2/modules/mod_slotmem.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-25 10:04:25 -0500 (Sat, 25 Jan 2014) New Revision: 3189 Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 Log: infact we can still use mod_slotmem.so Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-25 14:16:22 UTC (rev 3188) +++ trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-25 15:04:25 UTC (rev 3189) @@ -12,6 +12,6 @@ slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" -APACHE_MODULE(mod_slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) +APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) APACHE_MODPATH_FINISH

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-25 09:16:22 -0500 (Sat, 25 Jan 2014) New Revision: 3188 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: adjust to mod_slotmem. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-01-25 11:40:02 UTC (rev 3187) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-01-25 14:16:22 UTC (rev 3188) @@ -135,7 +135,7 @@ fi if $has_cluster; then - add_conf="$add_conf --enable-proxy-cluster --enable-advertise --enable-slotmem --enable-manager --disable-proxy-balancer" + add_conf="$add_conf --enable-proxy-cluster --enable-advertise --enable-mod-slotmem --enable-manager --disable-proxy-balancer" fi # Ajust some more platform dependent stuff.

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3187 - trunk/httpd/httpd-2.2/modules/mod_slotmem.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-25 06:40:02 -0500 (Sat, 25 Jan 2014) New Revision: 3187 Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 Log: Adjust the name so it doesn't conflic with modules/slotmem from httpd-2.4.x Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-25 09:57:50 UTC (rev 3186) +++ trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-25 11:40:02 UTC (rev 3187) @@ -12,6 +12,6 @@ slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" -APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) +APACHE_MODULE(mod_slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) APACHE_MODPATH_FINISH

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3186 - in trunk/httpd/httpd-2.2/modules: mod_slotmem and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-25 04:57:50 -0500 (Sat, 25 Jan 2014) New Revision: 3186 Modified: trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 Log: Make sure the LoadModule doesn't get commented out. Modified: trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2014-01-24 22:29:30 UTC (rev 3185) +++ trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2014-01-25 09:57:50 UTC (rev 3186) @@ -2,9 +2,17 @@ APACHE_MODPATH_INIT(mod_manager) +if test "$enable_mod_manager" = "shared"; then + mod_manager_mods_enable=shared +elif test "$enable_mod_manager" = "yes"; then + mod_manager_mods_enable=yes +else + mod_manager_mods_enable=no +fi + manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo domain.lo jgroupsid.lo" -APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , no) +APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , $advertise_mods_enable) if test "$manager_enable" != "no"; then APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/../proxy/]) Modified: trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-24 22:29:30 UTC (rev 3185) +++ trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-25 09:57:50 UTC (rev 3186) @@ -2,8 +2,16 @@ APACHE_MODPATH_INIT(mod_slotmem) +if test "$enable_mod_slotmem" = "shared"; then + mod_slotmem_mods_enable=shared +elif test "$enable_mod_slotmem" = "yes"; then + mod_slotmem_mods_enable=yes +else + mod_slotmem_mods_enable=no +fi + slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" -APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , no) +APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) APACHE_MODPATH_FINISH

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 17:29:30 -0500 (Fri, 24 Jan 2014) New Revision: 3185 Modified: trunk/build/unix/buildtest.mod_cluster.sh Log: run tests with 1.3.x too. (like 1.2.x). Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2014-01-24 17:00:29 UTC (rev 3184) +++ trunk/build/unix/buildtest.mod_cluster.sh 2014-01-24 22:29:30 UTC (rev 3185) @@ -83,7 +83,7 @@ ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root -Dmod_cluster.jar=../../target/mod_cluster-${mod_cluster_version}.jar -Dbase.apache="${BASELOC}" ) || exit 1 ;; - 1.2.*) + 1.2.*|1.3.*) (cd $anttestsdir echo "Running ant -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=$root" echo " -Dbase.apache=${BASELOC}"

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 12:00:29 -0500 (Fri, 24 Jan 2014) New Revision: 3184 Modified: trunk/build/unix/build.sh Log: export httpd_version. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-01-24 15:50:13 UTC (rev 3183) +++ trunk/build/unix/build.sh 2014-01-24 17:00:29 UTC (rev 3184) @@ -476,6 +476,13 @@ if $has_cluster; then echo "using mod_cluster: ${cluster_version}" fi +case ${PACKAGE} in + mod_cluster) + httpd_version=${svn_tagname} + export httpd_version + echo "using httpd: ${httpd_version}" + ;; +esac if $force_64; then echo "Building 64 bits version" else

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 10:50:13 -0500 (Fri, 24 Jan 2014) New Revision: 3183 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Try to fail early. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-01-24 15:26:11 UTC (rev 3182) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-01-24 15:50:13 UTC (rev 3183) @@ -377,11 +377,11 @@ else cp *.so ../../target fi - ) + ) || exit 1 done (cd ../mod_cluster/target tar -cf - *.so | gzip -c > ${build_top}/output/${PACKAGE}-${build_version}-${BUILD_SYS}-${BUILD_CPU}-so.tar.gz - ) + ) || exit 1 fi echo "Done"

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 10:26:11 -0500 (Fri, 24 Jan 2014) New Revision: 3182 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: apxs location has changed to bin instead sbin. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2014-01-24 13:57:01 UTC (rev 3181) +++ trunk/build/unix/buildbin.mod_cluster.sh 2014-01-24 15:26:11 UTC (rev 3182) @@ -346,15 +346,24 @@ ant installhttpd -DBUILDTEST=Y -Dbuild_version=${build_version} -Droot=${output_loc} -Dbase.apache="${BASELOC}" ) +case ${httpd_version} in + 2.2*) + apxs=sbin/apxs + ;; + 2.4*) + apxs=bin/apxs + ;; +esac + # Build the *.so for any httpd-2.2.x using the httpd install done before if [ "${BUILD_SYS}" != "windows" ]; then - echo "Building mod_cluster modules with apxs" + echo "Building mod_cluster modules with ${apxs}" BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` for dir in `echo mod_manager advertise mod_slotmem mod_proxy_cluster` do (cd ../mod_cluster/native/$dir sh buildconf - ./configure --with-apxs=${BASELOC}/opt/jboss/httpd/sbin/apxs + ./configure --with-apxs=${BASELOC}/opt/jboss/httpd/${apxs} make clean make if [ "$BUILD_SYS" = "hpux" ]; then

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-24 08:57:01 -0500 (Fri, 24 Jan 2014) New Revision: 3181 Modified: trunk/build/unix/buildsrc.asf-jk.sh Log: mod_jk location changed... Modified: trunk/build/unix/buildsrc.asf-jk.sh =================================================================== --- trunk/build/unix/buildsrc.asf-jk.sh 2014-01-24 13:43:35 UTC (rev 3180) +++ trunk/build/unix/buildsrc.asf-jk.sh 2014-01-24 13:57:01 UTC (rev 3181) @@ -40,7 +40,8 @@ # we need something like: # http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.... -URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src +#URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src +URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-$1-src URLBASEBACK=http://ftp.heanet.ie/mirrors/www.apache.org/dist/tomcat/tomca... case $BUILD_SYS in windows)

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 11 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 January 2014