Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4353 - in labs/jbossweb/trunk: src/share/native/build src/share/native/build/patch src/share/native/php5servlet src/share/native/srclib/openssl src/share/resources/ROOT.war src/share/resources/bin src/windows/native/service/jbosssvc xdocs/install
|
From: <jbo...@li...> - 2006-05-22 17:43:37
|
Author: mla...@jb... Date: 2006-05-22 13:43:12 -0400 (Mon, 22 May 2006) New Revision: 4353 Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.bat labs/jbossweb/trunk/src/share/native/build/buildsvc.bat labs/jbossweb/trunk/src/share/native/build/buildworld.bat labs/jbossweb/trunk/src/share/native/build/patch/libxml2-2.6.24.patch labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp labs/jbossweb/trunk/src/share/resources/bin/run.bat labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc labs/jbossweb/trunk/xdocs/install/service.xml Log: EOL Style:Native Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildprep.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/build/buildprep.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,60 +1,60 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM -REM -REM -@if "%OS%" == "Windows_NT" setlocal -set NATIVETAG=HEAD - -REM Replace NATIVEEXT with tagged version number, like 1.1.0 -set NATIVEEXT=current - -REM Use tag or trunk -REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk -set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3 - -set NATIVEDIST=tomcat-native-%NATIVEEXT% -@rmdir /S /Q %NATIVEDIST% 2>NUL -svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST% - -set APRVER=1.2.7 -set SSLVER=0.9.8b - -REM Prebuild -cd %NATIVEDIST% -mkdir srclib -cd srclib - -REM Download APR -wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-src.zip -unzip -qo apr-%APRVER%-win32-src.zip -@del /Q apr-%APRVER%-win32-src.zip - -REM Download OpenSSL -wget http://www.openssl.org/source/openssl-%SSLVER%.tar.gz -tar zxf openssl-%SSLVER%.tar.gz 2>NUL -@del /Q openssl-%SSLVER%.tar.gz -cd .. -cd .. - -cp ./buildworld.bat %NATIVEDIST%/ -cp ./buildsvc.bat %NATIVEDIST%/ -cp ./NMAKEcommon.inc %NATIVEDIST%/build/ -cp ../NMAKEmakefile %NATIVEDIST%/ -cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/ -cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%SSLVER%/ - -REM zip -9rqo ../../%NATIVEDIST%.zip %NATIVEDIST% -REM tar cfz ../../%NATIVEDIST%.tar.gz %NATIVEDIST% - -REM @rmdir /S /Q %NATIVEDIST% -REM Instead packing move the prepared sources. -@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL -@mv %NATIVEDIST% ../../ +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM +REM +REM +@if "%OS%" == "Windows_NT" setlocal +set NATIVETAG=HEAD + +REM Replace NATIVEEXT with tagged version number, like 1.1.0 +set NATIVEEXT=current + +REM Use tag or trunk +REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk +set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3 + +set NATIVEDIST=tomcat-native-%NATIVEEXT% +@rmdir /S /Q %NATIVEDIST% 2>NUL +svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST% + +set APRVER=1.2.7 +set SSLVER=0.9.8b + +REM Prebuild +cd %NATIVEDIST% +mkdir srclib +cd srclib + +REM Download APR +wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-src.zip +unzip -qo apr-%APRVER%-win32-src.zip +@del /Q apr-%APRVER%-win32-src.zip + +REM Download OpenSSL +wget http://www.openssl.org/source/openssl-%SSLVER%.tar.gz +tar zxf openssl-%SSLVER%.tar.gz 2>NUL +@del /Q openssl-%SSLVER%.tar.gz +cd .. +cd .. + +cp ./buildworld.bat %NATIVEDIST%/ +cp ./buildsvc.bat %NATIVEDIST%/ +cp ./NMAKEcommon.inc %NATIVEDIST%/build/ +cp ../NMAKEmakefile %NATIVEDIST%/ +cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/ +cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%SSLVER%/ + +REM zip -9rqo ../../%NATIVEDIST%.zip %NATIVEDIST% +REM tar cfz ../../%NATIVEDIST%.tar.gz %NATIVEDIST% + +REM @rmdir /S /Q %NATIVEDIST% +REM Instead packing move the prepared sources. +@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL +@mv %NATIVEDIST% ../../ Property changes on: labs/jbossweb/trunk/src/share/native/build/buildprep.bat ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,46 +1,46 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM -REM -REM -@if "%OS%" == "Windows_NT" setlocal -set MSVS8VC=C:\opt\MSVS8\VC\bin -REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin - - -@if not "%1" == "d" goto checkCPU -@shift -@rmdir /S /Q jbosssvc 2>NUL -svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc -svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build - -:checkCPU -@if /i "%1" == "x86" goto cpuX86 -@if /i "%1" == "amd64" goto cpuAMD64 -@if /i "%1" == "ia64" goto cpuIA64 -echo Usage: buildsvc <CPU> -goto cmdEnd - -:cpuX86 -set CPU=I386 -call %MSVS8VC%\vcvars32 -goto cmdBuild - -:cpuAMD64 -set CPU=AMD64 -call %MSVS8VC%\amd64\vcvarsamd64 -goto cmdBuild - -:cmdBuild -cd jbosssvc -nmake -f NMAKEMakefile -nmake -f NMAKEMakefile install - -:cmdEnd +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM +REM +REM +@if "%OS%" == "Windows_NT" setlocal +set MSVS8VC=C:\opt\MSVS8\VC\bin +REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin + + +@if not "%1" == "d" goto checkCPU +@shift +@rmdir /S /Q jbosssvc 2>NUL +svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc +svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build + +:checkCPU +@if /i "%1" == "x86" goto cpuX86 +@if /i "%1" == "amd64" goto cpuAMD64 +@if /i "%1" == "ia64" goto cpuIA64 +echo Usage: buildsvc <CPU> +goto cmdEnd + +:cpuX86 +set CPU=I386 +call %MSVS8VC%\vcvars32 +goto cmdBuild + +:cpuAMD64 +set CPU=AMD64 +call %MSVS8VC%\amd64\vcvarsamd64 +goto cmdBuild + +:cmdBuild +cd jbosssvc +nmake -f NMAKEMakefile +nmake -f NMAKEMakefile install + +:cmdEnd Property changes on: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildworld.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,83 +1,83 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM -REM -REM -@if "%OS%" == "Windows_NT" setlocal -set MSVS8VC=C:\opt\msvs8\VC\bin -REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin -set PSDK5=C:\opt\psdk5 -REM PSDK5=C:\D\PSDK05 - -set OPENSSLBIN=buildssl -set OPENSSLVER=0.9.8b -set APRVER=1.2.7 -set FLAVOR=DLL - -@if not "%1" == "sdk" goto checkFLAVOR -shift -set usesdk=1 - -:checkFLAVOR -@if /i "%1" == "dll" goto makeDLL -set FLAVOR=STATIC -goto checkCPU -:makeDLL -set FLAVOR=DLL - -:checkCPU -@if /i "%2" == "x86" goto cpuX86 -@if /i "%2" == "amd64" goto cpuAMD64 -@if /i "%2" == "ia64" goto cpuIA64 -echo Usage: buildworld <CPU> -goto cmdEnd - -:cpuX86 -set CPU=I386 -set OPENSSLBIN=buildsslasm %1 -@if "%usesdk%" == "1" ( - call %PSDK5%\SetEnv /XP32 /RETAIL -) else ( - call %MSVS8VC%\vcvars32 -) -goto cmdBuild - -:cpuAMD64 -set CPU=AMD64 -set OPENSSLBIN=buildsslamd64 %1 -@if "%usesdk%" == "1" ( - call %PSDK5%\SetEnv /X64 /RETAIL -) else ( - call %MSVS8VC%\amd64\vcvarsamd64 -) -goto cmdBuild - -:cpuIA64 -set CPU=IA64 -set OPENSSLBIN=buildsslia64 %1 -@if "%usesdk%" == "1" ( - call %PSDK5%\SetEnv /SRV64 /RETAIL -) else ( - call %MSVS8VC%\amd64\vcvarsamd64 -) -goto cmdBuild - -:cmdBuild -cd srclib/openssl-%OPENSSLVER% -call %OPENSSLBIN% %1 -cd .. -cd apr-%APRVER% -nmake -f NMAKEMakefile %FLAVOR%=1 -cd .. -cd .. -nmake -f NMAKEMakefile %FLAVOR%=1 -nmake -f NMAKEMakefile %FLAVOR%=1 install - -:cmdEnd +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM +REM +REM +@if "%OS%" == "Windows_NT" setlocal +set MSVS8VC=C:\opt\msvs8\VC\bin +REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin +set PSDK5=C:\opt\psdk5 +REM PSDK5=C:\D\PSDK05 + +set OPENSSLBIN=buildssl +set OPENSSLVER=0.9.8b +set APRVER=1.2.7 +set FLAVOR=DLL + +@if not "%1" == "sdk" goto checkFLAVOR +shift +set usesdk=1 + +:checkFLAVOR +@if /i "%1" == "dll" goto makeDLL +set FLAVOR=STATIC +goto checkCPU +:makeDLL +set FLAVOR=DLL + +:checkCPU +@if /i "%2" == "x86" goto cpuX86 +@if /i "%2" == "amd64" goto cpuAMD64 +@if /i "%2" == "ia64" goto cpuIA64 +echo Usage: buildworld <CPU> +goto cmdEnd + +:cpuX86 +set CPU=I386 +set OPENSSLBIN=buildsslasm %1 +@if "%usesdk%" == "1" ( + call %PSDK5%\SetEnv /XP32 /RETAIL +) else ( + call %MSVS8VC%\vcvars32 +) +goto cmdBuild + +:cpuAMD64 +set CPU=AMD64 +set OPENSSLBIN=buildsslamd64 %1 +@if "%usesdk%" == "1" ( + call %PSDK5%\SetEnv /X64 /RETAIL +) else ( + call %MSVS8VC%\amd64\vcvarsamd64 +) +goto cmdBuild + +:cpuIA64 +set CPU=IA64 +set OPENSSLBIN=buildsslia64 %1 +@if "%usesdk%" == "1" ( + call %PSDK5%\SetEnv /SRV64 /RETAIL +) else ( + call %MSVS8VC%\amd64\vcvarsamd64 +) +goto cmdBuild + +:cmdBuild +cd srclib/openssl-%OPENSSLVER% +call %OPENSSLBIN% %1 +cd .. +cd apr-%APRVER% +nmake -f NMAKEMakefile %FLAVOR%=1 +cd .. +cd .. +nmake -f NMAKEMakefile %FLAVOR%=1 +nmake -f NMAKEMakefile %FLAVOR%=1 install + +:cmdEnd Property changes on: labs/jbossweb/trunk/src/share/native/build/buildworld.bat ___________________________________________________________________ Name: svn:eol-style + native Property changes on: labs/jbossweb/trunk/src/share/native/build/patch/libxml2-2.6.24.patch ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile =================================================================== --- labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,87 +1,87 @@ -# Copyright 2001-2006 The Apache Software Foundation or its licensors, as -# applicable. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ==================================================================== -# -# NMAKEmakefile Master PHP5 Servlet SAPI makefile. -# Usage: -# DEBUG=1 Build DEBUG version of TCN -# -# Originally contributed by Mladen Turk <mturk jboss.com> -# -# ==================================================================== -# - -TARGET = DLL -BUILDIR_EXT = DLL -PROJECT = php5servlet -PHP5_LIB = php5ts.lib - -!include <../build/NMAKEcommon.inc> - -CFLAGS = $(CFLAGS) -DPHP5SERVLET_EXPORTS -DZTS -DZEND_WIN32 -DPHP_WIN32 - -!IFDEF DEBUG -CFLAGS = $(CFLAGS) -DZEND_DEBUG=1 -!ELSE -CFLAGS = $(CFLAGS) -DZEND_DEBUG=0 -!ENDIF - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES) - -!IFNDEF WITH_PHP5 -WITH_PHP5 = ../srclib/php -!ENDIF - -INCLUDES = $(INCLUDES) -I$(WITH_PHP5)/include/php -I$(WITH_PHP5)/include/php/win32 \ - -I$(WITH_PHP5)/include/php/Zend -I$(WITH_PHP5)/include/php/main -I$(WITH_PHP5)/include/php/TSRM - -LDIRS = /libpath:"$(WITH_PHP5)/dev" -LFLAGS = $(LFLAGS) $(PHP5_LIB) -LFLAGS = $(LFLAGS) user32.lib - -PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src -OBJECTS = \ - $(BUILDIR)\php5servlet.obj - -BUILDLIB = $(BUILDIR)\$(PROJECT).dll -BUILDPDB = $(BUILDIR)\$(PROJECT).pdb -BUILDRES = $(BUILDIR)\$(PROJECT).res -BUILDMAN = $(BUILDLIB).manifest - -all : $(BUILDIR) $(BUILDLIB) - -$(BUILDIR) : - @$(MAKETARGET) - -{$(SRCDIR)}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(OBJECTS): $(SRCDIR)/*.c - -$(BUILDRES): $(SRCDIR)/php5servlet.rc - $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/php5servlet.rc - -$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2 - -clean: - @$(CLEANTARGET) +# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master PHP5 Servlet SAPI makefile. +# Usage: +# DEBUG=1 Build DEBUG version of TCN +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +TARGET = DLL +BUILDIR_EXT = DLL +PROJECT = php5servlet +PHP5_LIB = php5ts.lib + +!include <../build/NMAKEcommon.inc> + +CFLAGS = $(CFLAGS) -DPHP5SERVLET_EXPORTS -DZTS -DZEND_WIN32 -DPHP_WIN32 + +!IFDEF DEBUG +CFLAGS = $(CFLAGS) -DZEND_DEBUG=1 +!ELSE +CFLAGS = $(CFLAGS) -DZEND_DEBUG=0 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES) + +!IFNDEF WITH_PHP5 +WITH_PHP5 = ../srclib/php +!ENDIF + +INCLUDES = $(INCLUDES) -I$(WITH_PHP5)/include/php -I$(WITH_PHP5)/include/php/win32 \ + -I$(WITH_PHP5)/include/php/Zend -I$(WITH_PHP5)/include/php/main -I$(WITH_PHP5)/include/php/TSRM + +LDIRS = /libpath:"$(WITH_PHP5)/dev" +LFLAGS = $(LFLAGS) $(PHP5_LIB) +LFLAGS = $(LFLAGS) user32.lib + +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\php5servlet.obj + +BUILDLIB = $(BUILDIR)\$(PROJECT).dll +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res +BUILDMAN = $(BUILDLIB).manifest + +all : $(BUILDIR) $(BUILDLIB) + +$(BUILDIR) : + @$(MAKETARGET) + +{$(SRCDIR)}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)/*.c + +$(BUILDRES): $(SRCDIR)/php5servlet.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/php5servlet.rc + +$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2 + +clean: + @$(CLEANTARGET) Property changes on: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc =================================================================== --- labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,80 +1,80 @@ -/* - * JBoss, the OpenSource webOS - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -#include <windows.h> - -#define PRODUCT_VER_STRING "1.0.1.0\0" - -#define STR_COPYRIGHT "Copyright 2006 JBoss inc. " \ - "or its licensors, as applicable." - -#define STR_LICENSE "Distributable under LGPL license. " \ - "See terms of license at gnu.org." - -#define STR_COMPANY "JBoss, Inc." -#define STR_TRADEMARK " JBoss Inc." -#define STR_PRODUCT "PHP5 Servlet SAPI" -#define STR_VERISON "1.0.1.0" -#define CSV_VERISON 1,0,1,0 - -#define PRIVATE_BUILD 0 -#define PRERELEASE_BUILD 0 - -#if PRIVATE_BUILD -#define STR_PRIVATE "Initial Prerelease" -#define STR_SPECIAL "Basic functionality" -#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD -#else -#define STD_FILEFLAGS 0x0L -#endif - -#if RERELEASE_BUILD -#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE -#else -#define PSTD_FILEFLAGS STD_FILEFLAGS -#endif - -#ifdef _DEBUG -#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG -#else -#define APP_FILEFLAGS STD_FILEFLAGS -#endif - -1 VERSIONINFO - FILEVERSION CSV_VERISON - PRODUCTVERSION CSV_VERISON - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS APP_FILEFLAGS - FILEOS VOS_NT - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", STR_LICENSE "\0" - VALUE "CompanyName", STR_COMPANY "\0" - VALUE "FileDescription", "PHP5 Servlet SAPI Module\0" - VALUE "FileVersion", STR_VERISON "\0" - VALUE "InternalName", "php5servlet" - VALUE "LegalCopyright", STR_COPYRIGHT "\0" - VALUE "LegalTrademarks", STR_TRADEMARK "\0" - VALUE "OriginalFilename", "php5servlet.dll" - VALUE "ProductName", STR_PRODUCT "\0" - VALUE "ProductVersion", STR_VERISON "\0" -#if PRIVATE_BUILD - VALUE "PrivateBuild", STR_PRIVATE "\0" - VALUE "SpecialBuild", STR_SPECIAL "\0" -#endif - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +/* + * JBoss, the OpenSource webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +#include <windows.h> + +#define PRODUCT_VER_STRING "1.0.1.0\0" + +#define STR_COPYRIGHT "Copyright 2006 JBoss inc. " \ + "or its licensors, as applicable." + +#define STR_LICENSE "Distributable under LGPL license. " \ + "See terms of license at gnu.org." + +#define STR_COMPANY "JBoss, Inc." +#define STR_TRADEMARK " JBoss Inc." +#define STR_PRODUCT "PHP5 Servlet SAPI" +#define STR_VERISON "1.0.1.0" +#define CSV_VERISON 1,0,1,0 + +#define PRIVATE_BUILD 0 +#define PRERELEASE_BUILD 0 + +#if PRIVATE_BUILD +#define STR_PRIVATE "Initial Prerelease" +#define STR_SPECIAL "Basic functionality" +#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD +#else +#define STD_FILEFLAGS 0x0L +#endif + +#if RERELEASE_BUILD +#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE +#else +#define PSTD_FILEFLAGS STD_FILEFLAGS +#endif + +#ifdef _DEBUG +#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG +#else +#define APP_FILEFLAGS STD_FILEFLAGS +#endif + +1 VERSIONINFO + FILEVERSION CSV_VERISON + PRODUCTVERSION CSV_VERISON + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS APP_FILEFLAGS + FILEOS VOS_NT + FILETYPE VFT_DLL + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", STR_LICENSE "\0" + VALUE "CompanyName", STR_COMPANY "\0" + VALUE "FileDescription", "PHP5 Servlet SAPI Module\0" + VALUE "FileVersion", STR_VERISON "\0" + VALUE "InternalName", "php5servlet" + VALUE "LegalCopyright", STR_COPYRIGHT "\0" + VALUE "LegalTrademarks", STR_TRADEMARK "\0" + VALUE "OriginalFilename", "php5servlet.dll" + VALUE "ProductName", STR_PRODUCT "\0" + VALUE "ProductVersion", STR_VERISON "\0" +#if PRIVATE_BUILD + VALUE "PrivateBuild", STR_PRIVATE "\0" + VALUE "SpecialBuild", STR_SPECIAL "\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Property changes on: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-WIN64A -call ms\do_win64a - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-WIN64A +call ms\do_win64a + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-NT -call ms\do_masm - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-NT +call ms\do_masm + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-WIN64I -call ms\do_win64i - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision: 1.0 $, $Date: 2005/07/12 14:56:09 $ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-WIN64I +call ms\do_win64i + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp =================================================================== --- labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,81 +1,81 @@ -<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - <title><%= application.getServerInfo() %></title> - <meta name="author" value="Mladen Turk"> - <link href="style.css" type="text/css" rel="stylesheet"> - </head> -<body> - <table border="0" width="100%" cellspacing="4"> - <tr> - <td colspan="2"> - <a href="http://www.jboss.com/"><img src="images/jbosslogo.gif" align="left" alt="JBoss Inc." border="0"></a> - <a href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossweb"><img src="images/jbossweblogo.gif" align="right" alt="JBossWeb @ JBoss labs" border="0"></a> - </td> - </tr> - <tr> - <td colspan="2"><hr noshade="noshade" size="1"> - </td> - </tr> - <tr> - <td width="80%" valign="top" align="left"> - <table border="0" cellspacing="0" cellpadding="0" width="100%"> - <tr> - <td class="section" colspan="2"><a name="Version"><%= application.getServerInfo() %></a></td></tr><tr><td width="20px"> - </td> - <td><br> -<p><div align="center"><h1>It works!</h1></div> -</p> -<br> -<p> -JBoss Web Server is an enterprise ready web server designed for medium -and large applications, based on the -<a href="http://tomcat.apache.org">Apache Tomcat</a>. It is meant to -be used as a replacement for the standard Web servers on all major -platforms. JBoss Web Server provides organizations with a single -deployment platform for Java Server Pages (JSP) and Java Servlet -technologies, Microsoft .NET, PHP, and CGI. It uses a genuine high -performance hybrid technology that incorporates the best of the most -recent OS technologies for processing high volume data, while keeping -all the reference Java specifications. It supports both in and out of -the process execution of CGI and PHP scripts, as well as .NET applications. -The hybrid technology model offers the best from threading and event -processing models, and that makes the JBoss Web Server one of the fastest -and most scalable web servers in the market. -</p> -<br> -<br> -<p> - <ul> - <li><a href="/status">Server Status</a></li> - <li><a href="/status?full=true">Full Server Status</a></li> - <li><a href="/jmx-console/">JMX Console</a></li> - <li><a href="/web-console/">JBoss Web Console</a></li> - </ul> -</p> -<br> -<br> -<p> -<div align="center"> -<img src="images/jboss_ics.gif" alt="" border="0"> -<img src="images/tomcat_pb.gif" alt="" border="0"> -<img src="images/openssl_ics.gif" alt="" border="0"> -<img src="images/jbweb_pb.gif" alt="" border="0"> -</div> -</p> -</td> -</tr> -</table> -</td> -</tr> -<tr> - <td colspan="2"><hr noshade="noshade" size="1"> - </td> -</tr> -<tr> - <td colspan="2"><div align="center"><font color="#525D76" size="-1"><em>Copyright © 2006, JBoss Inc.</em></font></div> - </td> -</tr> -</table> -</body> +<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title><%= application.getServerInfo() %></title> + <meta name="author" value="Mladen Turk"> + <link href="style.css" type="text/css" rel="stylesheet"> + </head> +<body> + <table border="0" width="100%" cellspacing="4"> + <tr> + <td colspan="2"> + <a href="http://www.jboss.com/"><img src="images/jbosslogo.gif" align="left" alt="JBoss Inc." border="0"></a> + <a href="http://labs.jboss.com/portal/index.html?ctrl:id=page.default.info&project=jbossweb"><img src="images/jbossweblogo.gif" align="right" alt="JBossWeb @ JBoss labs" border="0"></a> + </td> + </tr> + <tr> + <td colspan="2"><hr noshade="noshade" size="1"> + </td> + </tr> + <tr> + <td width="80%" valign="top" align="left"> + <table border="0" cellspacing="0" cellpadding="0" width="100%"> + <tr> + <td class="section" colspan="2"><a name="Version"><%= application.getServerInfo() %></a></td></tr><tr><td width="20px"> + </td> + <td><br> +<p><div align="center"><h1>It works!</h1></div> +</p> +<br> +<p> +JBoss Web Server is an enterprise ready web server designed for medium +and large applications, based on the +<a href="http://tomcat.apache.org">Apache Tomcat</a>. It is meant to +be used as a replacement for the standard Web servers on all major +platforms. JBoss Web Server provides organizations with a single +deployment platform for Java Server Pages (JSP) and Java Servlet +technologies, Microsoft .NET, PHP, and CGI. It uses a genuine high +performance hybrid technology that incorporates the best of the most +recent OS technologies for processing high volume data, while keeping +all the reference Java specifications. It supports both in and out of +the process execution of CGI and PHP scripts, as well as .NET applications. +The hybrid technology model offers the best from threading and event +processing models, and that makes the JBoss Web Server one of the fastest +and most scalable web servers in the market. +</p> +<br> +<br> +<p> + <ul> + <li><a href="/status">Server Status</a></li> + <li><a href="/status?full=true">Full Server Status</a></li> + <li><a href="/jmx-console/">JMX Console</a></li> + <li><a href="/web-console/">JBoss Web Console</a></li> + </ul> +</p> +<br> +<br> +<p> +<div align="center"> +<img src="images/jboss_ics.gif" alt="" border="0"> +<img src="images/tomcat_pb.gif" alt="" border="0"> +<img src="images/openssl_ics.gif" alt="" border="0"> +<img src="images/jbweb_pb.gif" alt="" border="0"> +</div> +</p> +</td> +</tr> +</table> +</td> +</tr> +<tr> + <td colspan="2"><hr noshade="noshade" size="1"> + </td> +</tr> +<tr> + <td colspan="2"><div align="center"><font color="#525D76" size="-1"><em>Copyright © 2006, JBoss Inc.</em></font></div> + </td> +</tr> +</table> +</body> </html> \ No newline at end of file Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/share/resources/bin/run.bat =================================================================== --- labs/jbossweb/trunk/src/share/resources/bin/run.bat 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/share/resources/bin/run.bat 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,108 +1,108 @@ -@echo off -rem ------------------------------------------------------------------------- -rem JBoss Bootstrap Script for Win32 -rem ------------------------------------------------------------------------- - -rem $Id: run.bat,v 1.13.4.2 2005/05/04 23:05:42 starksm Exp $ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -set PATH=%DIRNAME%\native;%PATH% -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -rem Find run.jar, or we can't continue - -set RUNJAR=%DIRNAME%\run.jar -if exist "%RUNJAR%" goto FOUND_RUN_JAR -echo Could not locate %RUNJAR%. Please check that you are in the -echo bin directory when running this script. -goto END - -:FOUND_RUN_JAR - -if not "%JAVA_HOME%" == "" goto ADD_TOOLS - -set JAVA=java - -echo JAVA_HOME is not set. Unexpected results may occur. -echo Set JAVA_HOME to the directory of your local JDK to avoid this message. -goto SKIP_TOOLS - -:ADD_TOOLS - -set JAVA=%JAVA_HOME%\bin\java - -if exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS -echo Could not locate %JAVA_HOME%\lib\tools.jar. Unexpected results may occur. -echo Make sure that JAVA_HOME points to a JDK and not a JRE. - -:SKIP_TOOLS - -rem Include the JDK javac compiler for JSP pages. The default is for a Sun JDK -rem compatible distribution to which JAVA_HOME points - -set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar - -rem If JBOSS_CLASSPATH is empty, don't include it, as this will -rem result in including the local directory, which makes error tracking -rem harder. -if "%JBOSS_CLASSPATH%" == "" ( - set JBOSS_CLASSPATH=%JAVAC_JAR%;%RUNJAR% -) ELSE ( - set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%JAVAC_JAR%;%RUNJAR% -) - -rem Setup JBoss specific properties -set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME% -set JBOSS_HOME=%DIRNAME%\.. - -rem Sun JVM memory allocation pool parameters. Modify as appropriate. -set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m - -rem JPDA options. Uncomment and modify as appropriate to enable remote debugging. -rem set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS% - -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -echo =============================================================================== -echo . -echo JBoss Bootstrap Environment -echo . -echo JBOSS_HOME: %JBOSS_HOME% -echo . -echo JAVA: %JAVA% -echo . -echo JAVA_OPTS: %JAVA_OPTS% -echo . -echo CLASSPATH: %JBOSS_CLASSPATH% -echo . -echo =============================================================================== -echo . - -:RESTART -"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" -classpath "%JBOSS_CLASSPATH%" org.jboss.Main %* -IF ERRORLEVEL 10 GOTO RESTART - -:END -if "%NOPAUSE%" == "" pause - -:END_NO_PAUSE +@echo off +rem ------------------------------------------------------------------------- +rem JBoss Bootstrap Script for Win32 +rem ------------------------------------------------------------------------- + +rem $Id: run.bat,v 1.13.4.2 2005/05/04 23:05:42 starksm Exp $ + +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=.\ +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% +set PROGNAME=run.bat +if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% + +set PATH=%DIRNAME%\native;%PATH% +rem Read all command line arguments + +REM +REM The %ARGS% env variable commented out in favor of using %* to include +REM all args in java command line. See bug #840239. [jpl] +REM +REM set ARGS= +REM :loop +REM if [%1] == [] goto endloop +REM set ARGS=%ARGS% %1 +REM shift +REM goto loop +REM :endloop + +rem Find run.jar, or we can't continue + +set RUNJAR=%DIRNAME%\run.jar +if exist "%RUNJAR%" goto FOUND_RUN_JAR +echo Could not locate %RUNJAR%. Please check that you are in the +echo bin directory when running this script. +goto END + +:FOUND_RUN_JAR + +if not "%JAVA_HOME%" == "" goto ADD_TOOLS + +set JAVA=java + +echo JAVA_HOME is not set. Unexpected results may occur. +echo Set JAVA_HOME to the directory of your local JDK to avoid this message. +goto SKIP_TOOLS + +:ADD_TOOLS + +set JAVA=%JAVA_HOME%\bin\java + +if exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS +echo Could not locate %JAVA_HOME%\lib\tools.jar. Unexpected results may occur. +echo Make sure that JAVA_HOME points to a JDK and not a JRE. + +:SKIP_TOOLS + +rem Include the JDK javac compiler for JSP pages. The default is for a Sun JDK +rem compatible distribution to which JAVA_HOME points + +set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar + +rem If JBOSS_CLASSPATH is empty, don't include it, as this will +rem result in including the local directory, which makes error tracking +rem harder. +if "%JBOSS_CLASSPATH%" == "" ( + set JBOSS_CLASSPATH=%JAVAC_JAR%;%RUNJAR% +) ELSE ( + set JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%JAVAC_JAR%;%RUNJAR% +) + +rem Setup JBoss specific properties +set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME% +set JBOSS_HOME=%DIRNAME%\.. + +rem Sun JVM memory allocation pool parameters. Modify as appropriate. +set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m + +rem JPDA options. Uncomment and modify as appropriate to enable remote debugging. +rem set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS% + +rem Setup the java endorsed dirs +set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed + +echo =============================================================================== +echo . +echo JBoss Bootstrap Environment +echo . +echo JBOSS_HOME: %JBOSS_HOME% +echo . +echo JAVA: %JAVA% +echo . +echo JAVA_OPTS: %JAVA_OPTS% +echo . +echo CLASSPATH: %JBOSS_CLASSPATH% +echo . +echo =============================================================================== +echo . + +:RESTART +"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" -classpath "%JBOSS_CLASSPATH%" org.jboss.Main %* +IF ERRORLEVEL 10 GOTO RESTART + +:END +if "%NOPAUSE%" == "" pause + +:END_NO_PAUSE Property changes on: labs/jbossweb/trunk/src/share/resources/bin/run.bat ___________________________________________________________________ Name: svn:eol-style - CRLF + native Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile =================================================================== --- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,71 +1,71 @@ -# Copyright 2001-2005 The Apache Software Foundation or its licensors, as -# applicable. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ==================================================================== -# -# NMAKEmakefile JBoss Service Make file. -# Usage: -# DEBUG=1 Build DEBUG version -# -# Originally contributed by Mladen Turk <mturk jboss.com> -# -# ==================================================================== -# - -TARGET = EXE -PROJECT = jbosssvc -!include <build/NMAKEcommon.inc> - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -LFLAGS = $(LFLAGS) user32.lib - -PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src -OBJECTS = \ - $(BUILDIR)\jboss.obj - -BUILDEXE = $(BUILDIR)\$(PROJECT).exe -BUILDPDB = $(BUILDIR)\$(PROJECT).pdb -BUILDRES = $(BUILDIR)\$(PROJECT).res -BUILDMAN = $(BUILDLIB).manifest - -all : $(BUILDIR) $(BUILDEXE) - -$(BUILDIR) : - @$(MAKETARGET) - -{$(SRCDIR)}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(BUILDRES): $(SRCDIR)/jboss.rc - $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/jboss.rc - -$(BUILDEXE): $(BUILDIR) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDEXE) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);1 - -clean: - @$(CLEANTARGET) - -!IFNDEF INSTALLDIR -INSTALLDIR = ../../native-builds/windows-%CPU%/bin -!ENDIF - -install: all - @gmkdir -p $(INSTALLDIR) - @cp -f -t $(INSTALLDIR) $(BUILDEXE) +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile JBoss Service Make file. +# Usage: +# DEBUG=1 Build DEBUG version +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +TARGET = EXE +PROJECT = jbosssvc +!include <build/NMAKEcommon.inc> + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +LFLAGS = $(LFLAGS) user32.lib + +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\jboss.obj + +BUILDEXE = $(BUILDIR)\$(PROJECT).exe +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res +BUILDMAN = $(BUILDLIB).manifest + +all : $(BUILDIR) $(BUILDEXE) + +$(BUILDIR) : + @$(MAKETARGET) + +{$(SRCDIR)}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): $(SRCDIR)/jboss.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/jboss.rc + +$(BUILDEXE): $(BUILDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDEXE) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);1 + +clean: + @$(CLEANTARGET) + +!IFNDEF INSTALLDIR +INSTALLDIR = ../../native-builds/windows-%CPU%/bin +!ENDIF + +install: all + @gmkdir -p $(INSTALLDIR) + @cp -f -t $(INSTALLDIR) $(BUILDEXE) Property changes on: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc =================================================================== --- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,86 +1,86 @@ -/* - * JBoss, the OpenSource webOS - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -#include <windows.h> - -#define PRODUCT_VER_STRING "1.0.1.0\0" - -#define STR_COPYRIGHT "Copyright 2006 JBoss inc. " \ - "or its licensors, as applicable." - -#define STR_LICENSE "Distributable under LGPL license. " \ - "See terms of license at gnu.org." - -#define STR_COMPANY "JBoss, Inc." -#define STR_TRADEMARK " JBoss Inc." -#define STR_PRODUCT "JBoss Service" -#define STR_VERISON "1.0.1.0" -#define CSV_VERISON 1,0,1,0 - -#define PRIVATE_BUILD 0 -#define PRERELEASE_BUILD 0 - -#if PRIVATE_BUILD -#define STR_PRIVATE "Initial Prerelease" -#define STR_SPECIAL "Basic functionality" -#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD -#else -#define STD_FILEFLAGS 0x0L -#endif - -#if RERELEASE_BUILD -#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE -#else -#define PSTD_FILEFLAGS STD_FILEFLAGS -#endif - -#ifdef _DEBUG -#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG -#else -#define APP_FILEFLAGS STD_FILEFLAGS -#endif - - -IDI_MAINICON ICON "jboss.ico" - -LANGUAGE 0x9,0x1 -1 11 MSG00001.bin - - 1 VERSIONINFO - FILEVERSION CSV_VERISON - PRODUCTVERSION CSV_VERISON - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS APP_FILEFLAGS - FILEOS VOS_NT - FILETYPE VFT_APP - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", STR_LICENSE "\0" - VALUE "CompanyName", STR_COMPANY "\0" - VALUE "FileDescription", "JBoss NT service runner\0" - VALUE "FileVersion", STR_VERISON "\0" - VALUE "InternalName", "jbosssvc" - VALUE "LegalCopyright", STR_COPYRIGHT "\0" - VALUE "LegalTrademarks", STR_TRADEMARK "\0" - VALUE "OriginalFilename", "jbosssvc.exe" - VALUE "ProductName", STR_PRODUCT "\0" - VALUE "ProductVersion", STR_VERISON "\0" -#if PRIVATE_BUILD - VALUE "PrivateBuild", STR_PRIVATE "\0" - VALUE "SpecialBuild", STR_SPECIAL "\0" -#endif - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +/* + * JBoss, the OpenSource webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +#include <windows.h> + +#define PRODUCT_VER_STRING "1.0.1.0\0" + +#define STR_COPYRIGHT "Copyright 2006 JBoss inc. " \ + "or its licensors, as applicable." + +#define STR_LICENSE "Distributable under LGPL license. " \ + "See terms of license at gnu.org." + +#define STR_COMPANY "JBoss, Inc." +#define STR_TRADEMARK " JBoss Inc." +#define STR_PRODUCT "JBoss Service" +#define STR_VERISON "1.0.1.0" +#define CSV_VERISON 1,0,1,0 + +#define PRIVATE_BUILD 0 +#define PRERELEASE_BUILD 0 + +#if PRIVATE_BUILD +#define STR_PRIVATE "Initial Prerelease" +#define STR_SPECIAL "Basic functionality" +#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD +#else +#define STD_FILEFLAGS 0x0L +#endif + +#if RERELEASE_BUILD +#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE +#else +#define PSTD_FILEFLAGS STD_FILEFLAGS +#endif + +#ifdef _DEBUG +#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG +#else +#define APP_FILEFLAGS STD_FILEFLAGS +#endif + + +IDI_MAINICON ICON "jboss.ico" + +LANGUAGE 0x9,0x1 +1 11 MSG00001.bin + + 1 VERSIONINFO + FILEVERSION CSV_VERISON + PRODUCTVERSION CSV_VERISON + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS APP_FILEFLAGS + FILEOS VOS_NT + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", STR_LICENSE "\0" + VALUE "CompanyName", STR_COMPANY "\0" + VALUE "FileDescription", "JBoss NT service runner\0" + VALUE "FileVersion", STR_VERISON "\0" + VALUE "InternalName", "jbosssvc" + VALUE "LegalCopyright", STR_COPYRIGHT "\0" + VALUE "LegalTrademarks", STR_TRADEMARK "\0" + VALUE "OriginalFilename", "jbosssvc.exe" + VALUE "ProductName", STR_PRODUCT "\0" + VALUE "ProductVersion", STR_VERISON "\0" +#if PRIVATE_BUILD + VALUE "PrivateBuild", STR_PRIVATE "\0" + VALUE "SpecialBuild", STR_SPECIAL "\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Property changes on: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc ___________________________________________________________________ Name: svn:eol-style - CRLF + native Modified: labs/jbossweb/trunk/xdocs/install/service.xml =================================================================== --- labs/jbossweb/trunk/xdocs/install/service.xml 2006-05-22 17:40:21 UTC (rev 4352) +++ labs/jbossweb/trunk/xdocs/install/service.xml 2006-05-22 17:43:12 UTC (rev 4353) @@ -1,92 +1,92 @@ -<?xml version="1.0"?> -<!DOCTYPE document [ - <!ENTITY project SYSTEM "project.xml"> -]> -<document url="service.html"> - &project; - <properties> - <author email="mla...@jb...">Mladen Turk</author> - <title>Windows service</title> - </properties> - - <body> - <section name="Overview"> - <br/> - <p>JBoss Web comes with Windows service executable that can run JBoss Web Server - as service. - </p> - <p>The service executable <code>jbosssvc.exe</code> transforms the <code>run.bat</code> - and <code>shutdown.bat</code> batch scripts to services. This means that any change - made to those scripts will be used both in service and command line mode. - </p> - <subsection name="Installing service"> - <p>To install the JBoss Web server as Windows service use the provided - <code>service.bat</code> batch file - </p> - <screen> - <note>Change directory to the JBossWeb bin directory</note> - <typedos>cd c:\jbossweb-4.0.4RC1-windows-i586\bin</typedos> - <note>Install the service</note> - <typedos>service.bat install</typedos> - </screen> - </subsection> - - <subsection name="Starting the service"> - <p>To start the JBoss Web server as Windows service use Control pannel or - <code>net start</code> command. - </p> - <screen> - <note>Start the service</note> - <typedos>net start JBossWebServer</typedos> - <note>The JBoss Web Server 4 service is starting.</note> - <note>The JBoss Web Server 4 service was started successfully.</note> - </screen> - <p>When running in service mode the console output is redirected to the - file <code>run.log</code>. You can inspect the file for any errors during - service startup. - </p> - </subsection> - - <subsection name="Stopping the service"> - <p>To stop the JBoss Web server as Windows service use Control pannel or - <code>net stop</code> command. - </p> - <screen> - <note>Stop the service</note> - <typedos>net stop JBossWebServer</typedos> - <note>The JBoss Web Server 4 service was stopped successfully.</note> - </screen> - <p>When running in service mode the console output is redirected to the - file <code>shutdown.log</code>. You can inspect the file for any errors during - service shutdown. - </p> - </subsection> - - <subsection name="Restarting the service"> - <p>To restart the JBoss Web server as Windows service use Control pannel. - </p> - </subsection> - - <subsection name="Removing service"> - <p>To remove the JBoss Web server as Windows service use the provided - <code>service.bat</code> batch file. - </p> - <screen> - <note>Change directory to the JBossWeb bin directory</note> - <typedos>cd c:\jbossweb-4.0.4RC1-windows-i586\bin</typedos> - <note>Remove the service</note> - <typedos>service.bat uninstall</typedos> - </screen> - </subsection> - - </section> - <section name="Customization"> - <br/> - <p>Service customization is done by editing the service.bat script. - Each command has a separate section that you can customize. The most - common customization task would be changing service names if more then - one service instances per box are required. - </p> - </section> - </body> -</document> +<?xml version="1.0"?> +<!DOCTYPE document [ + <!ENTITY project SYSTEM "project.xml"> +]> +<document url="service.html"> + &project; + <properties> + <author email="mla...@jb...">Mladen Turk</author> + <title>Windows service</title> + </properties> + + <body> + <section name="Overview"> + <br/> + <p>JBoss Web comes with Windows service executable that can run JBoss Web Server + as service. + </p> + <p>The service executable <code>jbosssvc.exe</code> transforms the <code>run.bat</code> + and <code>shutdown.bat</code> batch scripts to services. This means that any change + made to those scripts will be used both in service and command line mode. + </p> + <subsection name="Installing service"> + <p>To install the JBoss Web server as Windows service use the provided + <code>service.bat</code> batch file + </p> + <screen> + <note>Change directory to the JBossWeb bin directory</note> + <typedos>cd c:\jbossweb-4.0.4RC1-windows-i586\bin</typedos> + <note>Install the service</note> + <typedos>service.bat install</typedos> + </screen> + </subsection> + + <subsection name="Starting the service"> + <p>To start the JBoss Web server as Windows service use Control pannel or + <code>net start</code> command. + </p> + <screen> + <note>Start the service</note> + <typedos>net start JBossWebServer</typedos> + <note>The JBoss Web Server 4 service is starting.</note> + <note>The JBoss Web Server 4 service was started successfully.</note> + </screen> + <p>When running in service mode the console output is redirected to the + file <code>run.log</code>. You can inspect the file for any errors during + service startup. + </p> + </subsection> + + <subsection name="Stopping the service"> + <p>To stop the JBoss Web server as Windows service use Control pannel or + <code>net stop</code> command. + </p> + <screen> + <note>Stop the service</note> + <typedos>net stop JBossWebServer</typedos> + <note>The JBoss Web Server 4 service was stopped successfully.</note> + </screen> + <p>When running in service mode the console output is redirected to the + file <code>shutdown.log</code>. You can inspect the file for any errors during + service shutdown. + </p> + </subsection> + + <subsection name="Restarting the service"> + <p>To restart the JBoss Web server as Windows service use Control pannel. + </p> + </subsection> + + <subsection name="Removing service"> + <p>To remove the JBoss Web server as Windows service use the provided + <code>service.bat</code> batch file. + </p> + <screen> + <note>Change directory to the JBossWeb bin directory</note> + <typedos>cd c:\jbossweb-4.0.4RC1-windows-i586\bin</typedos> + <note>Remove the service</note> + <typedos>service.bat uninstall</typedos> + </screen> + </subsection> + + </section> + <section name="Customization"> + <br/> + <p>Service customization is done by editing the service.bat script. + Each command has a separate section that you can customize. The most + common customization task would be changing service names if more then + one service instances per box are required. + </p> + </section> + </body> +</document> Property changes on: labs/jbossweb/trunk/xdocs/install/service.xml ___________________________________________________________________ Name: svn:eol-style + native |
