July 2009 - jbossnative-commits - Jboss List Archives

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

by jbossnative-commits＠lists.jboss.org

14 years, 10 months

1
0
0 / 0

JBoss Native SVN: r2479 - in trunk: mod_cluster/test/java and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-09 10:11:49 -0400 (Thu, 09 Jul 2009) New Revision: 2479 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildtest.mod_cluster.sh trunk/mod_cluster/test/java/installhttpd.sh Log: Windoze needs the spaces.... Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-08 13:32:07 UTC (rev 2478) +++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-09 14:11:49 UTC (rev 2479) @@ -233,7 +233,11 @@ # Install httpd using the ant script in mod_cluster (cd ../mod_cluster/test/java - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + if [ "${BUILD_SYS}" = "windows" ]; then + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` + else + 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} ) Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-08 13:32:07 UTC (rev 2478) +++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-09 14:11:49 UTC (rev 2479) @@ -55,7 +55,11 @@ esac mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar (cd $anttestsdir - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + if [ "${BUILD_SYS}" = "windows" ]; then + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` + else + 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} ) || exit 1 Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-07-08 13:32:07 UTC (rev 2478) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-07-09 14:11:49 UTC (rev 2479) @@ -139,7 +139,11 @@ # TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc... -BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` +if [ "x${BUILD_SYS}" = "xwindows" ]; then + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` +else + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` +fi REMOVE=true if [ "x${BASELOC}" = "x" ]

14 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-08 09:32:07 -0400 (Wed, 08 Jul 2009) New Revision: 2478 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildtest.mod_cluster.sh Log: Typos. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-08 12:59:48 UTC (rev 2477) +++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-08 13:32:07 UTC (rev 2478) @@ -240,7 +240,7 @@ # Build the *.so for any httpd-2.2.x using the httpd install done before if [ "${BUILD_SYS}" != "windows" ]; then - BASELOC==`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` + BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` for dir in `echo mod_proxy mod_manager advertise mod_slotmem mod_proxy_cluster` do (cd ../mod_cluster/native/$dir Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-08 12:59:48 UTC (rev 2477) +++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-08 13:32:07 UTC (rev 2478) @@ -55,7 +55,7 @@ esac mod_cluster_jar=../../target/mod-cluster-${mod_cluster_jar}.jar (cd $anttestsdir - BASELOC==`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` 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} ) || exit 1

14 years, 10 months

1
0
0 / 0

JBoss Native SVN: r2477 - trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-08 08:59:48 -0400 (Wed, 08 Jul 2009) New Revision: 2477 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java Log: macosx behave 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-08 12:57:50 UTC (rev 2476) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/MulticastSocketFactoryImpl.java 2009-07-08 12:59:48 UTC (rev 2477) @@ -43,13 +43,13 @@ { final Logger log = Logger.getLogger(this.getClass()); - private final boolean linux; + private final boolean linuxlike; public MulticastSocketFactoryImpl() { String value = this.getSystemProperty("os.name"); - this.linux = (value != null) && value.toLowerCase().startsWith("linux"); + this.linuxlike = (value != null) && (value.toLowerCase().startsWith("linux") || value.toLowerCase().startsWith("mac")); } private String getSystemProperty(final String key) @@ -85,7 +85,7 @@ */ public MulticastSocket createMulticastSocket(InetAddress address, int port) throws IOException { - if ((address == null) || !this.linux) return new MulticastSocket(port); + if ((address == null) || !this.linuxlike) return new MulticastSocket(port); if (!address.isMulticastAddress()) {

14 years, 10 months

1
0
0 / 0

JBoss Native SVN: r2476 - 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-08 08:57:50 -0400 (Wed, 08 Jul 2009) New Revision: 2476 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java Log: Add macosx in the tests. 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-08 08:14:56 UTC (rev 2475) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/advertise/MulticastSocketFactoryImplTestCase.java 2009-07-08 12:57:50 UTC (rev 2476) @@ -57,7 +57,7 @@ String os = System.getProperty("os.name"); // Validate cross-talking behavior on linux only - if ((os != null) && os.trim().toLowerCase().startsWith("linux")) + if ((os != null) && (os.trim().toLowerCase().startsWith("linux") || os.trim().toLowerCase().startsWith("mac"))) { System.setProperty("os.name", "OtherOS");

14 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-08 04:14:56 -0400 (Wed, 08 Jul 2009) New Revision: 2475 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Typo. Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-07-08 06:59:53 UTC (rev 2474) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-07-08 08:14:56 UTC (rev 2475) @@ -139,7 +139,7 @@ # TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc... -BASELOC==`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` +BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` REMOVE=true if [ "x${BASELOC}" = "x" ]

14 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

14 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-08 02:57:14 -0400 (Wed, 08 Jul 2009) New Revision: 2473 Modified: trunk/build/unix/buildbin.mod_cluster.sh trunk/build/unix/buildtest.mod_cluster.sh Log: Oops the NOSPACE stuff was a nonsense... Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2009-07-07 17:01:08 UTC (rev 2472) +++ trunk/build/unix/buildbin.mod_cluster.sh 2009-07-08 06:57:14 UTC (rev 2473) @@ -233,24 +233,14 @@ # Install httpd using the ant script in mod_cluster (cd ../mod_cluster/test/java - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` - BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` - if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] - then - BASELOC=${BASELOCNOSPACES} - fi + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` 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} ) # Build the *.so for any httpd-2.2.x using the httpd install done before if [ "${BUILD_SYS}" != "windows" ]; then - BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::')` - BASELOCNOSPACES=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` - if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] - then - BASELOC=${BASELOCNOSPACES} - fi + BASELOC==`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` for dir in `echo mod_proxy mod_manager advertise mod_slotmem mod_proxy_cluster` do (cd ../mod_cluster/native/$dir Modified: trunk/build/unix/buildtest.mod_cluster.sh =================================================================== --- trunk/build/unix/buildtest.mod_cluster.sh 2009-07-07 17:01:08 UTC (rev 2472) +++ trunk/build/unix/buildtest.mod_cluster.sh 2009-07-08 06:57:14 UTC (rev 2473) @@ -54,14 +54,9 @@ ;; esac 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 - BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` - BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` - if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] - then - BASELOC=${BASELOCNOSPACES} - fi + BASELOC==`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` + 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} ) || exit 1

14 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-07 13:01:08 -0400 (Tue, 07 Jul 2009) New Revision: 2472 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: No need of BASELOCNOSPACES... Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-07-07 15:55:21 UTC (rev 2471) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-07-07 17:01:08 UTC (rev 2472) @@ -139,17 +139,13 @@ # TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc... -BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` -BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` -if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] -then - BASELOC=${BASELOCNOSPACES} -fi +BASELOC==`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` REMOVE=true if [ "x${BASELOC}" = "x" ] then BASELOC=`pwd` + echo "Using current dir for Base: $BASELOC !!!" if [ ! -f ${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} ] then ant downloadfile -Dsourcefile=${TARBALL} -Ddestfile=${PACKVER}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir="$BASELOC"

14 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-07-07 11:55:21 -0400 (Tue, 07 Jul 2009) New Revision: 2471 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Prevent spaces in base.apache (for example Mac OS X-10.5.7-i386!). Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-07-07 15:00:54 UTC (rev 2470) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-07-07 15:55:21 UTC (rev 2471) @@ -138,7 +138,14 @@ # /qa/services/hudson/hudson_workspace/workspace/mod_cluster-linux-i686/jbossnative/build/unix/output/mod_cluster-1.0.0.dev-linux2-x86.tar.gz # TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc... + BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'` +BASELOCNOSPACES=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g'` +if [ "x${BASELOC}" != "x${BASELOCNOSPACES}" ] +then + BASELOC=${BASELOCNOSPACES} +fi + REMOVE=true if [ "x${BASELOC}" = "x" ] then

14 years, 10 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