March 2008 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r1470 - sandbox/httpd/src/native/common.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-03-27 04:24:09 -0400 (Thu, 27 Mar 2008) New Revision: 1470 Modified: sandbox/httpd/src/native/common/context.h Log: Add REMOVE. Modified: sandbox/httpd/src/native/common/context.h =================================================================== --- sandbox/httpd/src/native/common/context.h 2008-03-27 05:42:08 UTC (rev 1469) +++ sandbox/httpd/src/native/common/context.h 2008-03-27 08:24:09 UTC (rev 1470) @@ -44,6 +44,12 @@ #define MEM_T #endif +/* Status of the application */ +#define ENABLED 1 +#define DISABLED 2 +#define STOPPED 3 +#define REMOVE 4 /* That status not stored but used by the logic to remove the entry */ + /* status of the context as read/store in httpd. */ struct contextinfo { char context[40]; /* Context where the application is mapped. */

16 years, 9 months

1
0
0 / 0

JBoss Native SVN: r1469 - trunk/build/daemon.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-03-27 01:42:08 -0400 (Thu, 27 Mar 2008) New Revision: 1469 Modified: trunk/build/daemon/buildall.bat trunk/build/daemon/buildall.sh Log: Comment out the sight builds Modified: trunk/build/daemon/buildall.bat =================================================================== --- trunk/build/daemon/buildall.bat 2008-03-27 05:39:12 UTC (rev 1468) +++ trunk/build/daemon/buildall.bat 2008-03-27 05:42:08 UTC (rev 1469) @@ -49,9 +49,9 @@ call build.bat sdk x86 jboss-native -ssl -cache call build.bat sdk x64 jboss-native -ssl -cache call build.bat sdk i64 jboss-native -ssl -cache +REM Uncomment for building sight +REM call build.bat sdk x86 jboss-sight -cache +REM call build.bat sdk x64 jboss-sight -cache +REM call build.bat sdk i64 jboss-sight -cache -call build.bat sdk x86 jboss-sight -cache -call build.bat sdk x64 jboss-sight -cache -call build.bat sdk i64 jboss-sight -cache - popd Modified: trunk/build/daemon/buildall.sh =================================================================== --- trunk/build/daemon/buildall.sh 2008-03-27 05:39:12 UTC (rev 1468) +++ trunk/build/daemon/buildall.sh 2008-03-27 05:42:08 UTC (rev 1469) @@ -31,5 +31,6 @@ (cd ../unix ./build.sh jboss-native -ssl -cache ./build.sh jboss-native -cache - ./build.sh jboss-sight -cache + # Uncomment for building sight + # ./build.sh jboss-sight -cache )

16 years, 9 months

1
0
0 / 0

JBoss Native SVN: r1468 - trunk/build/daemon.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-03-27 01:39:12 -0400 (Thu, 27 Mar 2008) New Revision: 1468 Modified: trunk/build/daemon/buildall.bat Log: Use new CPU identifiers Modified: trunk/build/daemon/buildall.bat =================================================================== --- trunk/build/daemon/buildall.bat 2008-03-26 17:57:18 UTC (rev 1467) +++ trunk/build/daemon/buildall.bat 2008-03-27 05:39:12 UTC (rev 1468) @@ -46,12 +46,12 @@ pushd %BUILD_HOME%\windows -call build.bat sdk i686 jboss-native -ssl -cache -call build.bat sdk amd64 jboss-native -ssl -cache -call build.bat sdk ia64 jboss-native -ssl -cache +call build.bat sdk x86 jboss-native -ssl -cache +call build.bat sdk x64 jboss-native -ssl -cache +call build.bat sdk i64 jboss-native -ssl -cache -call build.bat sdk i686 jboss-sight -cache -call build.bat sdk amd64 jboss-sight -cache -call build.bat sdk ia64 jboss-sight -cache +call build.bat sdk x86 jboss-sight -cache +call build.bat sdk x64 jboss-sight -cache +call build.bat sdk i64 jboss-sight -cache popd

16 years, 9 months

1
0
0 / 0

JBoss Native SVN: r1466 - sandbox/httpd/src/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-03-26 13:38:43 -0400 (Wed, 26 Mar 2008) New Revision: 1466 Modified: sandbox/httpd/src/native/mod_manager/mod_manager.c Log: Add handling of application commands (except STOP). Modified: sandbox/httpd/src/native/mod_manager/mod_manager.c =================================================================== --- sandbox/httpd/src/native/mod_manager/mod_manager.c 2008-03-26 16:13:29 UTC (rev 1465) +++ sandbox/httpd/src/native/mod_manager/mod_manager.c 2008-03-26 17:38:43 UTC (rev 1466) @@ -328,7 +328,7 @@ /* Map nothing by default */ vhost->host = NULL; - vhost->host = NULL; + vhost->context = NULL; vhost->next = NULL; phost = vhost; @@ -428,7 +428,7 @@ for (i=0; i<size; i++) { hostinfo_t *ou; get_host(hoststatsmem, &ou, id[i]); - ap_rprintf(r, "host: %d %s %d %d\n", id[i], ou->host, ou->vhost, + ap_rprintf(r, "host: %d [%s] %d %d\n", id[i], ou->host, ou->vhost, ou->node); } @@ -444,18 +444,94 @@ return OK; } -/* Process an enable application message */ -static int process_enable(request_rec *r, char *buff) +/* Process an enable/disable/stop application message */ +static int process_appl_cmd(request_rec *r, char *buff, int status) { + char *JVMRoute; + nodeinfo_t nodeinfo; + nodeinfo_t *node; + struct cluster_host *vhost; + struct cluster_host *phost; + + char **ptr = process_buff(r, buff); + if (ptr == NULL) + return 500; + + /* Map nothing by default */ + vhost->host = NULL; + vhost->context = NULL; + vhost->next = NULL; + vhost = apr_palloc(r->pool, sizeof(struct cluster_host)); + phost = vhost; + + int i = 0; + while (ptr[i]) { + if (strcasecmp(ptr[i], "JVMRoute") == 0) { + if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute)) + return 500; + strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]); + nodeinfo.mess.id = 0; + } + if (strcasecmp(ptr[i], "Alias") == 0) { + if (phost->host && !phost->context) { + return 500; + } + if (phost->host) { + phost->next = apr_palloc(r->pool, sizeof(struct cluster_host)); + phost = phost->next; + phost->next = NULL; + phost->host = ptr[i+1]; + phost->context = NULL; + } else { + phost->host = ptr[i+1]; + } + } + if (strcasecmp(ptr[i], "Context") == 0) { + if (phost->context) { + return 500; + } + phost->context = ptr[i+1]; + } + i++; + i++; + } + + /* Read the node */ + node = read_node(nodestatsmem, &nodeinfo); + if (node == NULL) + return 500; + + /* Read the ID of the virtual corresponding to the first Alias */ + hostinfo_t hostinfo; + hostinfo_t *host; + + hostinfo.node = node->mess.id; + if (vhost->host != NULL) + strcpy(hostinfo.host, vhost->host); + else + hostinfo.host[0] = '\0'; + + hostinfo.id = 0; + host = read_host(hoststatsmem, &hostinfo); + if (host == NULL) { + return 500; + } + + /* Now update each context from Context: part */ + insert_update_contexts(contextstatsmem, phost->context, node->mess.id, host->vhost, status); return OK; } +static int process_enable(request_rec *r, char *buff) +{ + return process_appl_cmd(r, buff, ENABLED); +} static int process_disable(request_rec *r, char *buff) { - return OK; + return process_appl_cmd(r, buff, DISABLED); } static int process_stop(request_rec *r, char *buff) { - return OK; + return process_appl_cmd(r, buff, STOPPED); } static int process_remove(request_rec *r, char *buff) {

16 years, 9 months

2
1
0 / 0

JBoss Native SVN: r1467 - sandbox/httpd/src/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-03-26 13:57:18 -0400 (Wed, 26 Mar 2008) New Revision: 1467 Modified: sandbox/httpd/src/native/mod_manager/mod_manager.c Log: Add REMOVE application. Modified: sandbox/httpd/src/native/mod_manager/mod_manager.c =================================================================== --- sandbox/httpd/src/native/mod_manager/mod_manager.c 2008-03-26 17:38:43 UTC (rev 1466) +++ sandbox/httpd/src/native/mod_manager/mod_manager.c 2008-03-26 17:57:18 UTC (rev 1467) @@ -290,7 +290,10 @@ ptr ++; } strncpy(info.context, previous, sizeof(info.context)); - insert_update_context(mem, &info); + if (status != REMOVE) + insert_update_context(mem, &info); + else + remove_context(mem, &info); return ret; } @@ -535,7 +538,7 @@ } static int process_remove(request_rec *r, char *buff) { - return OK; + return process_appl_cmd(r, buff, REMOVE); } static int process_status(request_rec *r, char *buff) {

16 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-03-26 12:13:29 -0400 (Wed, 26 Mar 2008) New Revision: 1465 Modified: trunk/build/unix/build.sh Log: Add rule for i*86 -> x86 Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-03-26 15:40:55 UTC (rev 1464) +++ trunk/build/unix/build.sh 2008-03-26 16:13:29 UTC (rev 1465) @@ -257,6 +257,9 @@ i86pc*) BUILD_CPU=x86 ;; + i[3-6]86*) + BUILD_CPU=x86 + ;; x86_64*) BUILD_CPU=x64 ;;

16 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-03-26 11:40:55 -0400 (Wed, 26 Mar 2008) New Revision: 1464 Modified: trunk/build/unix/build.sh trunk/build/unix/buildbin.jboss-native.sh trunk/build/unix/buildbin.jboss-native.windows.sh Log: Make new distribution target for jboss-native so we can simply drop them to the jbossweb installation Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-03-26 15:07:28 UTC (rev 1463) +++ trunk/build/unix/build.sh 2008-03-26 15:40:55 UTC (rev 1464) @@ -1001,16 +1001,16 @@ # set the urls if $BUILD_WIN ; then - APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... - APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... - APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a... + APRURL=http://www.apache.org/dist/apr/apr-${apr_version}-win32-src.zip + APUURL=http://www.apache.org/dist/apr/apr-util-${apu_version}-win32-src.zip + APIURL=http://www.apache.org/dist/apr/apr-iconv-${api_version}-win32-src.zip APRURLBACK=http://archive.apache.org/dist/apr/apr-${apu_version}-win32-sr... APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}-win... APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}-wi... else - APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... - APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... - APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a... + APRURL=http://www.apache.org/dist/apr/apr-${apr_version}.tar.gz + APUURL=http://www.apache.org/dist/apr/apr-util-${apu_version}.tar.gz + APIURL=http://www.apache.org/dist/apr/apr-iconv-${api_version}.tar.gz APRURLBACK=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta... Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2008-03-26 15:07:28 UTC (rev 1463) +++ trunk/build/unix/buildbin.jboss-native.sh 2008-03-26 15:40:55 UTC (rev 1464) @@ -44,6 +44,9 @@ output_loc=$3 has_openssl=$4 +output_lib="META-INF/lib/${BUILD_SYS}/${BUILD_CPU}" +output_bin="META-INF/bin/${BUILD_SYS}/${BUILD_CPU}" + echo "Configuring tomcat-native in `pwd`" add_conf="" if [ "x$JAVA_HOME" = "x" ]; then @@ -57,7 +60,8 @@ add_conf="${add_conf} --with-ssl=no" fi -mkdir -p ${output_loc}/bin/native +mkdir -p ${output_loc}/bin/${output_lib} +mkdir -p ${output_loc}/bin/${output_bin} native_sources=srclib/`ls srclib | grep tomcat-native` # Build native part. @@ -89,7 +93,7 @@ (cd ${prefix_loc}/lib tar -cf ${current_loc}/x.tar *.${so_extension}* ) -(cd ${output_loc}/bin/native +(cd ${output_loc}/bin/${output_lib} tar -xf ${current_loc}/x.tar ) rm -f ${current_loc}/x.tar @@ -97,7 +101,7 @@ (cd ${common_loc}/lib tar -cf ${current_loc}/x.tar *.${so_extension}* ) -(cd ${output_loc}/bin/native +(cd ${output_loc}/bin/${output_lib} tar -xf ${current_loc}/x.tar ) rm -f ${current_loc}/x.tar @@ -107,10 +111,10 @@ (cd ${common_loc}/lib tar -cf ${current_loc}/x.tar engines ) - (cd ${output_loc}/bin/native + (cd ${output_loc}/bin/${output_lib} tar -xf ${current_loc}/x.tar ) rm -f ${current_loc}/x.tar - cp ${common_loc}/bin/openssl ${output_loc}/bin + cp ${common_loc}/bin/openssl ${output_loc}/bin/${output_bin} fi Modified: trunk/build/unix/buildbin.jboss-native.windows.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.windows.sh 2008-03-26 15:07:28 UTC (rev 1463) +++ trunk/build/unix/buildbin.jboss-native.windows.sh 2008-03-26 15:40:55 UTC (rev 1464) @@ -46,6 +46,9 @@ has_openssl=$4 has_static=$5 +output_lib="META-INF/lib/${BUILD_SYS}/${BUILD_CPU}" +output_bin="META-INF/bin/${BUILD_SYS}/${BUILD_CPU}" + if $has_static; then common_loc=${common_loc}-static fi @@ -63,7 +66,8 @@ add_conf="${add_conf} APR_DECLARE_STATIC=true" fi -mkdir -p ${output_loc}/bin/native +mkdir -p ${output_loc}/bin/${output_lib} +mkdir -p ${output_loc}/bin/${output_bin} native_sources=srclib/`ls srclib | grep tomcat-native` src_dir=`cygpath -w -a ${native_sources}` (cd $native_sources @@ -83,15 +87,15 @@ cp README-service.txt ${output_loc}/bin ) -cp ${common_loc}/lib/libapr*.dll ${output_loc}/bin/native 2>/dev/null +cp ${common_loc}/lib/libapr*.dll ${output_loc}/bin/${output_lib} 2>/dev/null if $has_openssl ; then - cp ${common_loc}/bin/*eay32.dll ${output_loc}/bin/native 2>/dev/null - cp ${common_loc}/bin/openssl.exe ${output_loc}/bin + cp ${common_loc}/bin/*eay32.dll ${output_loc}/bin/${output_lib} 2>/dev/null + cp ${common_loc}/bin/openssl.exe ${output_loc}/bin/${output_bin} fi -cp ${prefix_loc}/lib/*.dll ${output_loc}/bin/native 2>/dev/null -cp ${prefix_loc}/bin/jboss*.* ${output_loc}/bin 2>/dev/null +cp ${prefix_loc}/lib/*.dll ${output_loc}/bin/${output_lib} 2>/dev/null +cp ${prefix_loc}/bin/jboss*.* ${output_loc}/${output_bin} 2>/dev/null if [ -n "${CRT_REDIST}" ] ; then crt_redist_loc=`cygpath -u "${CRT_REDIST}"` - cp "${crt_redist_loc}"/*.dll ${output_loc}/bin/native + cp "${crt_redist_loc}"/*.dll ${output_loc}/bin/${output_lib} fi

16 years, 9 months

1
0
0 / 0

JBoss Native SVN: r1463 - in trunk: build/unix and 5 other directories.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2008-03-26 11:07:28 -0400 (Wed, 26 Mar 2008) New Revision: 1463 Modified: trunk/build/NMAKEcommon.inc trunk/build/unix/build.sh trunk/build/windows/build.bat trunk/httpd/httpd-2.2/NMAKEcommon.inc trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor trunk/utils/windows/native/service/procrun/NMAKEcommon.inc Log: Use consistent platform names Modified: trunk/build/NMAKEcommon.inc =================================================================== --- trunk/build/NMAKEcommon.inc 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/build/NMAKEcommon.inc 2008-03-26 15:07:28 UTC (rev 1463) @@ -79,8 +79,8 @@ !IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64" CPU=X64 !ENDIF -!IF "$(BUILD_CPU)" == "ia64" -CPU=IA64 +!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64" +CPU=I64 !ENDIF !IF !DEFINED(CPU) || "$(CPU)" == "" @@ -91,10 +91,20 @@ !ENDIF !ENDIF +!IF "$(CPU)" == "I386" +CPU=X86 +!ENDIF +!IF "$(CPU)" == "AMD64" +CPU=X64 +!ENDIF +!IF "$(CPU)" == "IA64" +CPU=I64 +!ENDIF + !IF "$(CPU)" != "X86" !IF "$(CPU)" != "X64" -!IF "$(CPU)" != "IA64" -!ERROR Must specify CPU environment variable (X86, X64, IA64) $(CPU) +!IF "$(CPU)" != "I64" +!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU) !ENDIF !ENDIF !ENDIF @@ -188,7 +198,7 @@ CPU_CFLAGS = -D_X86_=1 !ELSEIF "$(CPU)" == "X64" CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -!ELSEIF "$(CPU)" == "IA64" +!ELSEIF "$(CPU)" == "I64" CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 !ENDIF @@ -309,7 +319,7 @@ !ELSEIF "$(CPU)" == "X64" ML = ml64.exe AFLAGS = /Zi /c -!ELSEIF "$(CPU)" == "IA64" +!ELSEIF "$(CPU)" == "I64" ML = ml64.exe AFLAGS = /coff /Zi /c !ENDIF Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/build/unix/build.sh 2008-03-26 15:07:28 UTC (rev 1463) @@ -260,6 +260,9 @@ x86_64*) BUILD_CPU=x64 ;; + ia64*) + BUILD_CPU=i64 + ;; 9000/800*) BUILD_CPU=parisc2 so_extension=sl @@ -307,7 +310,7 @@ CC=cc export CC # http://hpux.cs.utah.edu/ only has a 32 bits one. - if [ $BUILD_CPU = "ia64" ]; then + if [ $BUILD_CPU = "i64" ]; then if [ $has_zlib ]; then build_zlib=true fi @@ -583,7 +586,7 @@ hpux-parisc2) ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} hpux-parisc2-cc || exit 1 ;; - hpux-ia64) + hpux-i64) ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} hpux-ia64-cc || exit 1 ;; linux2-ppc64) @@ -597,7 +600,7 @@ ./Configure ${ssl_target} VC-WIN64A ms/do_win64a.bat ;; - windows-ia64) + windows-i64) ./Configure ${ssl_target} VC-WIN64I ms/do_win64i.bat ;; @@ -617,7 +620,7 @@ make || exit 1 # To hack broken openssl Makefiles. case ${BUILD_TAG} in - hpux-ia64) + hpux-i64) gmake install_sw CFLAGS=DSO_DLHACK || exit 1 ;; hpux-parisc2) Modified: trunk/build/windows/build.bat =================================================================== --- trunk/build/windows/build.bat 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/build/windows/build.bat 2008-03-26 15:07:28 UTC (rev 1463) @@ -106,12 +106,14 @@ @if /i "%BUILD_CPU%" == "x86" goto cpuX86 @if /i "%BUILD_CPU%" == "amd64" goto cpuX64 @if /i "%BUILD_CPU%" == "x64" goto cpuX86 -@if /i "%BUILD_CPU%" == "ia64" goto cpuIA64 +@if /i "%BUILD_CPU%" == "ia64" goto cpuI64 +@if /i "%BUILD_CPU%" == "i64" goto cpuI64 echo Usage: %PROGNAME% CPU where CPU is x86 x64 or ia64 echo or : %PROGNAME% sdk CPU if you are cross compiling goto cmdEnd :cpuX86 +set BUILD_CPU=x86 @if "%USE_PLATFORM_SDK%" == "1" ( call "%MSVS6VC%\vs6vars" ) else ( @@ -121,6 +123,7 @@ goto cmdBuild :cpuX64 +set BUILD_CPU=x64 @if "%USE_PLATFORM_SDK%" == "1" ( call "%MSWPSDK%\SetEnv" /X64 /RETAIL ) else ( @@ -129,7 +132,8 @@ ) goto cmdBuild -:cpuIA64 +:cpuI64 +set BUILD_CPU=i64 @if "%USE_PLATFORM_SDK%" == "1" ( call "%MSWPSDK%\SetEnv" /SRV64 /RETAIL ) else ( Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-26 15:07:28 UTC (rev 1463) @@ -79,8 +79,8 @@ !IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64" CPU=X64 !ENDIF -!IF "$(BUILD_CPU)" == "ia64" -CPU=IA64 +!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64" +CPU=I64 !ENDIF !IF !DEFINED(CPU) || "$(CPU)" == "" @@ -91,10 +91,20 @@ !ENDIF !ENDIF +!IF "$(CPU)" == "I386" +CPU=X86 +!ENDIF +!IF "$(CPU)" == "AMD64" +CPU=X64 +!ENDIF +!IF "$(CPU)" == "IA64" +CPU=I64 +!ENDIF + !IF "$(CPU)" != "X86" !IF "$(CPU)" != "X64" -!IF "$(CPU)" != "IA64" -!ERROR Must specify CPU environment variable (X86, X64, IA64) $(CPU) +!IF "$(CPU)" != "I64" +!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU) !ENDIF !ENDIF !ENDIF @@ -188,7 +198,7 @@ CPU_CFLAGS = -D_X86_=1 !ELSEIF "$(CPU)" == "X64" CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -!ELSEIF "$(CPU)" == "IA64" +!ELSEIF "$(CPU)" == "I64" CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 !ENDIF @@ -309,7 +319,7 @@ !ELSEIF "$(CPU)" == "X64" ML = ml64.exe AFLAGS = /Zi /c -!ELSEIF "$(CPU)" == "IA64" +!ELSEIF "$(CPU)" == "I64" ML = ml64.exe AFLAGS = /coff /Zi /c !ENDIF Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2008-03-26 15:07:28 UTC (rev 1463) @@ -52,7 +52,7 @@ BUILDBIN = $(WORKDIR)\$(PROJECT).lib !ENDIF -!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "X86" CFLAGS = -GS- $(CFLAGS) !ENDIF @@ -76,7 +76,7 @@ !IFDEF ZLIB_ASM CFLAGS = -DASMV -DASMINF $(CFLAGS) -!IF "$(CPU)" == "AMD64" +!IF "$(CPU)" == "X64" ASM_OBJECTS = \ $(WORKDIR)\inffas8664.obj \ $(WORKDIR)\gvmat64.obj \ @@ -101,7 +101,7 @@ {$(SRCDIR)}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< -!IF "$(CPU)" == "AMD64" +!IF "$(CPU)" == "X64" {$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< Modified: trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest =================================================================== --- trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest 2008-03-26 15:07:28 UTC (rev 1463) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity version="2.0.1.0" processorArchitecture="X86" name="Apache.Httpd.ApacheMonitor" type="win32" /> +<assemblyIdentity version="3.1.0.0" processorArchitecture="*" name="Apache.Httpd.ApacheMonitor" type="win32" /> <description>Apache Service Manager.</description> <dependency> <dependentAssembly> -<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /> +<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /> </dependentAssembly> </dependency> </assembly> Modified: trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch =================================================================== --- trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch 2008-03-26 15:07:28 UTC (rev 1463) @@ -20,7 +20,7 @@ #include "../../build/win32/httpd.rc" -+#ifdef USE_MANIFEST ++#if 1 +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "ApacheMonitor.manifest" +#endif Modified: trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor =================================================================== --- trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2008-03-26 15:07:28 UTC (rev 1463) @@ -46,10 +46,6 @@ RCFLAGS = $(RCFLAGS) /d "APP_FILE" -!IF "$(CPU)" == "I386" -RCFLAGS = $(RCFLAGS) /d "USE_MANIFEST" -!ENDIF - OBJECTS = \ $(WORKDIR)\ApacheMonitor.obj \ Modified: trunk/utils/windows/native/service/procrun/NMAKEcommon.inc =================================================================== --- trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-03-26 11:53:33 UTC (rev 1462) +++ trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-03-26 15:07:28 UTC (rev 1463) @@ -67,34 +67,48 @@ RC = rc.exe !ENDIF +!IF !DEFINED(MT) || "$(MT)" == "" +MT = mt.exe +!ENDIF + # Read the PROCESSOR_ARCHITECTURE environment value for a CPU type -!IF "$(BUILDCPU)" == "i386" || "$(BUILDCPU)" == "x86" || "$(BUILDCPU)" == "i686" -CPU=I386 +!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" == "i686" +CPU=X86 !ENDIF -!IF "$(BUILDCPU)" == "amd64" || "$(BUILDCPU)" == "x86_64" -CPU=AMD64 +!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64" +CPU=X64 !ENDIF -!IF "$(BUILDCPU)" == "ia64" -CPU=IA64 +!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64" +CPU=I64 !ENDIF !IF !DEFINED(CPU) || "$(CPU)" == "" !IF "$(PROCESSOR_ARCHITECTURE)" == "" -CPU=I386 +CPU=X86 !ELSE CPU=$(PROCESSOR_ARCHITECTURE) !ENDIF !ENDIF -!IF "$(CPU)" != "I386" -!IF "$(CPU)" != "AMD64" -!IF "$(CPU)" != "IA64" -!ERROR Must specify CPU environment variable (I386, AMD64, IA64) $(CPU) +!IF "$(CPU)" == "I386" +CPU=X86 !ENDIF +!IF "$(CPU)" == "AMD64" +CPU=X64 !ENDIF +!IF "$(CPU)" == "IA64" +CPU=I64 !ENDIF +!IF "$(CPU)" != "X86" +!IF "$(CPU)" != "X64" +!IF "$(CPU)" != "I64" +!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU) +!ENDIF +!ENDIF +!ENDIF + !IF !DEFINED(TARGET) || "$(TARGET)" == "" TARGET=EXE !ENDIF @@ -180,22 +194,22 @@ # Common flags for all platforms CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3 -!IF "$(CPU)" == "I386" +!IF "$(CPU)" == "X86" CPU_CFLAGS = -D_X86_=1 -!ELSEIF "$(CPU)" == "AMD64" +!ELSEIF "$(CPU)" == "X64" CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -!ELSEIF "$(CPU)" == "IA64" +!ELSEIF "$(CPU)" == "I64" CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 !ENDIF !IF "$(INCLUDE_PRE64PRA)" == "1" -!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "X86" CPU_CFLAGS = $(CPU_CFLAGS) /FIPRE64PRA.H !ENDIF !ENDIF !IF "$(BUILD)" == "RELEASE" -!IF "$(CPU)" == "I386" +!IF "$(CPU)" == "X86" OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG !ELSE OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG @@ -224,7 +238,7 @@ # Linker section LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS) !IF "$(INCLUDE_BUFFEROVERFLOWU)" == "1" -!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "X86" LIBS = $(LIBS) bufferoverflowu.lib !ENDIF !ENDIF @@ -273,6 +287,9 @@ !IF !DEFINED(WORKDIR) || "$(WORKDIR)" == "" !IF !DEFINED(WORKDIR_EXT) || "$(WORKDIR_EXT)" == "" WORKDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD) +WORKDIR_DLL = $(WINVER)_$(CPU)_DLL_$(BUILD) +WORKDIR_LIB = $(WINVER)_$(CPU)_LIB_$(BUILD) +WORKDIR_EXE = $(WINVER)_$(CPU)_EXE_$(BUILD) !ELSE WORKDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD) !ENDIF @@ -289,20 +306,20 @@ !IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != "" JAVA_INCLUDES=-I "$(JAVA_HOME)\include" -!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "X86" JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win64" !ENDIF JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win32" !ENDIF !IF !DEFINED(ML) || "$(ML)" == "" -!IF "$(CPU)" == "I386" +!IF "$(CPU)" == "X86" ML = ml.exe AFLAGS = /coff /Zi /c -!ELSEIF "$(CPU)" == "AMD64" +!ELSEIF "$(CPU)" == "X64" ML = ml64.exe AFLAGS = /Zi /c -!ELSEIF "$(CPU)" == "IA64" +!ELSEIF "$(CPU)" == "I64" ML = ml64.exe AFLAGS = /coff /Zi /c !ENDIF

16 years, 9 months

1
0
0 / 0

JBoss Native SVN: r1462 - sandbox/httpd/src/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-03-26 07:53:33 -0400 (Wed, 26 Mar 2008) New Revision: 1462 Modified: sandbox/httpd/src/native/mod_manager/mod_manager.c Log: Create the context stopped. Modified: sandbox/httpd/src/native/mod_manager/mod_manager.c =================================================================== --- sandbox/httpd/src/native/mod_manager/mod_manager.c 2008-03-26 11:44:29 UTC (rev 1461) +++ sandbox/httpd/src/native/mod_manager/mod_manager.c 2008-03-26 11:53:33 UTC (rev 1462) @@ -263,7 +263,7 @@ /* * Insert the context from Context information */ -static int insert_update_contexts(mem_t *mem, char *str, int node, int vhost) +static int insert_update_contexts(mem_t *mem, char *str, int node, int vhost, int status) { char *ptr = str; char *previous = str; @@ -273,6 +273,7 @@ info.node = node; info.vhost = vhost; + info.status = status; if (ptr == NULL) { ptr = empty; previous = ptr; @@ -395,7 +396,7 @@ int vid = 1; /* zero and "" is empty */ while (phost) { insert_update_hosts(hoststatsmem, phost->host, id, vid); - insert_update_contexts(contextstatsmem, phost->context, id, vid); + insert_update_contexts(contextstatsmem, phost->context, id, vid, STOPPED); phost = phost->next; vid++; }

16 years, 9 months

1
0
0 / 0

JBoss Native SVN: r1461 - sandbox/httpd/src/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2008-03-26 07:44:29 -0400 (Wed, 26 Mar 2008) New Revision: 1461 Modified: sandbox/httpd/src/java/TestHttpClient.java Log: Add test for the application commands. Modified: sandbox/httpd/src/java/TestHttpClient.java =================================================================== --- sandbox/httpd/src/java/TestHttpClient.java 2008-03-26 11:36:55 UTC (rev 1460) +++ sandbox/httpd/src/java/TestHttpClient.java 2008-03-26 11:44:29 UTC (rev 1461) @@ -28,11 +28,26 @@ HttpClient httpClient = new HttpClient(); PostMethod pm = null; - if (command.compareToIgnoreCase("DISABLE")==0) { + if (command.compareToIgnoreCase("ENABLE")==0) { + pm = (PostMethod) new EnableMethod(URL); + pm.addParameter("JVMRoute","node1"); + pm.addParameter("context", "/myapp"); + } + else if (command.compareToIgnoreCase("DISABLE")==0) { pm = (PostMethod) new DisableMethod(URL); pm.addParameter("JVMRoute","node1"); - pm.addParameter("context", "/hisapp"); + pm.addParameter("context", "/myapp"); } + else if (command.compareToIgnoreCase("STOP")==0) { + pm = (PostMethod) new StopMethod(URL); + pm.addParameter("JVMRoute","node1"); + pm.addParameter("context", "/myapp"); + } + else if (command.compareToIgnoreCase("REMOVE")==0) { + pm = (PostMethod) new RemoveMethod(URL); + pm.addParameter("JVMRoute","node1"); + pm.addParameter("context", "/myapp"); + } else if (command.compareToIgnoreCase("CONFIG")==0) { pm = (PostMethod) new ConfigMethod(URL); pm.addParameter("JVMRoute","node1"); @@ -40,7 +55,7 @@ pm.addParameter("Host", "jfcpc"); pm.addParameter("Port", "8009"); pm.addParameter("Type", "ajp"); - pm.addParameter("Context", "/hisapp,/myapp"); + pm.addParameter("Context", "/hisapp,/ourapp"); } else if (command.compareToIgnoreCase("DUMP")==0) { pm = (PostMethod) new DumpMethod(URL);

16 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits March 2008