cvs commit: jakarta-tomcat-5 build.xml build.properties.default tomcat.nsi

2005-08-02 Thread remm 
remm2005/08/02 12:08:07

  Modified:.build.xml build.properties.default tomcat.nsi
  Log:
  - Add placeholder code to download Windows .dll.
  
  Revision  ChangesPath
  1.234 +2 -0  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.233
  retrieving revision 1.234
  diff -u -r1.233 -r1.234
  --- build.xml 2 Aug 2005 15:33:07 -   1.233
  +++ build.xml 2 Aug 2005 19:08:07 -   1.234
  @@ -1445,6 +1445,7 @@
   
   
   
  +
   
   
   
   
  +
 
   
   
  
  
  
  1.157 +2 -1  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.156
  retrieving revision 1.157
  diff -u -r1.156 -r1.157
  --- build.properties.default  2 Aug 2005 15:33:07 -   1.156
  +++ build.properties.default  2 Aug 2005 19:08:07 -   1.157
  @@ -220,6 +220,7 @@
   nsis.exe=${nsis.home}/makensis.exe
   nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
   nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
  +nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
   nsis.loc=${base-sf.loc}/nsis/nsis-2.08.exe
   
   
  
  
  
  1.80  +18 -1 jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- tomcat.nsi2 Aug 2005 18:35:15 -   1.79
  +++ tomcat.nsi2 Aug 2005 19:08:07 -   1.80
  @@ -83,6 +83,7 @@
   LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet 
container."
   LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat 
Servlet container core."
   LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start 
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 
or Windows XP."
  +LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs 
Tomcat native .dll for better performance and scalability in production 
environments."
   ;LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat 
source code."
   LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program 
group for Tomcat."
   LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat 
documentation bundle. This include documentation on the servlet container and 
its configuration options, on the Jasper JSP page compiler, as well as on the 
native webserver connectors."
  @@ -198,6 +199,21 @@
   
   SectionEnd
   
  +Section "Native" SecTomcatNative
  +
  +  SectionIn 3
  +
  +  NSISdl::download /TIMEOUT=3 http://blabla/tcnative-1-1.1.0.dll 
$INSTDIR\bin\tcnative-1.dll
  +  Pop $0
  +  StrCmp $0 success success
  +SetDetailsView show
  +DetailPrint "download failed from http://blabla/tcnative-1-1.1.0.dll: $0"
  +  success:
  +
  +  ClearErrors
  +
  +SectionEnd
  +
   ;Section "Source Code" SecTomcatSource
   ;
   ;  SectionIn 3
  @@ -355,6 +371,7 @@
 !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat)
 !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore)
 !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} 
$(DESC_SecTomcatService)
  +  !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatNative} 
$(DESC_SecTomcatNative)
   ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource} 
$(DESC_SecTomcatSource)
   ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecCompat} $(DESC_SecCompat)
 !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2005-08-02 Thread remm 
remm2005/08/02 08:33:08

  Modified:.build.xml build.properties.default
  Log:
  - Update to the soon-to-be new location for native.
  
  Revision  ChangesPath
  1.233 +2 -1  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.232
  retrieving revision 1.233
  diff -u -r1.232 -r1.233
  --- build.xml 30 Jul 2005 21:22:24 -  1.232
  +++ build.xml 2 Aug 2005 15:33:07 -   1.233
  @@ -158,7 +158,8 @@
   
   
  -
  +

   
  
  
  
  1.156 +3 -3  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -r1.155 -r1.156
  --- build.properties.default  2 Aug 2005 14:01:58 -   1.155
  +++ build.properties.default  2 Aug 2005 15:33:07 -   1.156
  @@ -150,9 +150,9 @@
   
   
   # - Tomcat native library -
  -tomcat-native.home=${base.path}/tomcat-native-1.0
  +tomcat-native.home=${base.path}/tomcat-native-1.1.0
   tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
  
-tomcat-native.loc=${base-jakarta.loc}/tomcat-connectors/jni/tomcat-native.tar.gz
  
+tomcat-native.loc=${base-jakarta.loc}/tomcat-connectors/native/tomcat-native-1.1.0.tar.gz
   
   
   # --
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2005-01-20 Thread remm 
remm2005/01/20 04:00:20

  Modified:.build.xml build.properties.default
  Log:
  - Better handling of MX4J downloading.
  
  Revision  ChangesPath
  1.222 +1 -2  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -r1.221 -r1.222
  --- build.xml 8 Jan 2005 11:14:37 -   1.221
  +++ build.xml 20 Jan 2005 12:00:20 -  1.222
  @@ -1758,10 +1758,9 @@
 
   
   
  -
  +
 
 
  -  
   
   
   
  
  
  
  1.140 +4 -4  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- build.properties.default  19 Jan 2005 14:34:38 -  1.139
  +++ build.properties.default  20 Jan 2005 12:00:20 -  1.140
  @@ -59,7 +59,7 @@
   base-struts.loc=http://archive.apache.org/dist/struts
   
   # - Sourceforge files base location -
  -base-sf.loc=http://telia.dl.sourceforge.net/sourceforge
  +base-sf.loc=http://unc.dl.sourceforge.net/sourceforge
   
   # --
   #REQUIRED LIBRARIES
  @@ -189,11 +189,11 @@
   
commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.0.tar.gz
   
   # - Java Management Extensions (JMX), JMX RI 1.2.1 or later or MX4J 
2.0.1 or later -
  -jmx.home=${base.path}/mx4j-2.1.0/mx4j-2.1.0
  +jmx.home=${base.path}/mx4j-2.1.1
   jmx.lib=${jmx.home}/lib
   jmx.jar=${jmx.lib}/mx4j.jar
   jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
  -jmx.loc=${base-sf.loc}/mx4j/mx4j-2.1.0.zip
  +jmx.loc=${base-sf.loc}/mx4j/mx4j-2.1.1.tar.gz
   
   
   # - JUnit Unit Test Suite, version 3.7 or later -
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2003-03-13 Thread costin 
costin  2003/03/13 14:48:00

  Modified:.build.xml build.properties.default
  Log:
  More consistency.
  
  If it's a dependency package, it should be located in base.dir ( our repository ) -
  it doesn't matter if we build it or do a real download.
  
  Probably it would make sense to treat our own packages in the same way,
  but next time.
  
  Revision  ChangesPath
  1.106 +27 -40jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- build.xml 13 Mar 2003 22:08:21 -  1.105
  +++ build.xml 13 Mar 2003 22:48:00 -  1.106
  @@ -46,12 +46,9 @@
 
 
 
  -  
  -  
 
 
  -  
  -  
  +
 
 
 
  @@ -85,12 +82,12 @@
   
   
   
  +  targetfile="${servlet-api.jar}">
 
   
   
   
  +  targetfile="${jsp-api.jar}">
 
   
   
  @@ -119,11 +116,26 @@
 
   
   
  +
  +  
  +
  +
  +
  +  
  +
 
   
   
 
 
  +
  +
  +
  +
  +
   
   
   
  @@ -133,20 +145,16 @@
 
   == Building: ${servlet-api.jar}
   
  -
  -
  -
  +
  +
   
 
   
 
   == Building: ${jsp-api.jar}
  -
  -
  -
  +
  +
   
  -
  -
 
   
 
  @@ -196,7 +204,7 @@
 
 
  -  
  +  
   
 
   
  @@ -456,11 +464,9 @@
   
   
   
  -
  -
  +
   
  -
  -
  +
   
 
   
  @@ -469,14 +475,6 @@
   
 
  -
  -  
  -
  -
  -  
  -
   
   
   
  @@ -682,17 +680,6 @@
 
   
  -Target: Servlet API - Dist ...
  -
  -
  -Target: JSP API - Dist ...
  -
  -
  -
  -
  -
   
   Target: Modeler - Dist ...
   
  @@ -804,8 +791,8 @@
   
   
   
  -
  -
  +
  +

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2003-01-27 Thread jfarcand 
jfarcand2003/01/27 10:05:10

  Modified:.build.xml build.properties.default
  Log:
  Default download to the HEAD target.
  
  Revision  ChangesPath
  1.72  +5 -5  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- build.xml 27 Jan 2003 17:35:28 -  1.71
  +++ build.xml 27 Jan 2003 18:05:10 -  1.72
  @@ -1089,19 +1089,19 @@
 
   
   
   
   
   
 
   
  
  
  
  1.60  +2 -2  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.properties.default  27 Jan 2003 17:35:28 -  1.59
  +++ build.properties.default  27 Jan 2003 18:05:10 -  1.60
  @@ -33,7 +33,7 @@
   
   # - CVS root for the jakarta repositories --
   cvsroot=":pserver:[EMAIL PROTECTED]:/home/cvspublic"
  -cvstag=""
  +cvstag="HEAD"
   
   # - Default Base Path for Dependent Packages -
   #base.path=/usr/share/java
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2003-01-27 Thread jfarcand 
jfarcand2003/01/27 09:35:28

  Modified:.build.xml build.properties.default
  Log:
  Add support for cvs tag when using the checkout target.
  
  Revision  ChangesPath
  1.71  +2 -1  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- build.xml 23 Jan 2003 02:52:47 -  1.70
  +++ build.xml 27 Jan 2003 17:35:28 -  1.71
  @@ -1069,9 +1069,10 @@
   
 
   
  -
  +
   
   
  
  
  
  1.59  +2 -2  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- build.properties.default  23 Jan 2003 02:51:27 -  1.58
  +++ build.properties.default  27 Jan 2003 17:35:28 -  1.59
  @@ -33,7 +33,7 @@
   
   # - CVS root for the jakarta repositories --
   cvsroot=":pserver:[EMAIL PROTECTED]:/home/cvspublic"
  -
  +cvstag=""
   
   # - Default Base Path for Dependent Packages -
   #base.path=/usr/share/java
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2003-01-22 Thread jfarcand 
jfarcand2003/01/22 18:51:27

  Modified:.build.xml build.properties.default
  Log:
  Re-arrange the watchdog target (was broken). Rename the target run-watchdog. This 
target will checkout watchdog,
  compile it, start Tomcat, deploy watchdog and run the test. In build.properties, it 
is possible to c
  onfigure the watchdog target (servlet, jsp or all).
  
  The new target are: dist-watchdog, run-watchdog and run-watchdog-security
  
  No reason to not run it before making a critical change :-)
  
  Revision  ChangesPath
  1.69  +110 -72   jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- build.xml 22 Jan 2003 10:23:22 -  1.68
  +++ build.xml 23 Jan 2003 02:51:27 -  1.69
  @@ -44,7 +44,8 @@
 
 
 
  -  
  +  
  +  
 
 
 
  @@ -453,66 +454,120 @@
 
   
 
  -  
  -
  -
  -
  -
  -  
  -
  -
  -   
  -
  -
  -   
  -
  -
  -   
  -
  -
  -   
  -
  -
  -   
  -
  -
  -  
  -
  +  
  +   
   
  -
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -
  -
  -  
  -
  +   
  +
  +
   
  -
  +
  +
   
  -
  -   
  -
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -
  -
  -  
  -
  +  
  +
  +  
  +
  +  
  +
  +
  +  
  +  
  +  
  +
  +  
  +
  +  
  +  
  +  
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +  
   
 
   
  -
  +  
  + 
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +  
  +
  +  
 
 
   
  @@ -969,23 +1024,6 @@
 
 
 
  -
  -
  -  
  -
  -  
  -
  -
  -  
  -  
  -  
  -
  -
  -  
  -  
  -  
  -  
   
   
 
  
  
  
  1.58  +3 -2  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- build.properties.default  17 Jan 2003 20:30:30 -  1.57
  +++ build.properties.default  23 Jan 2003 02:51:27 -  1.58
  @@ -267,7 +267,8 @@
   
   
   # - Watchdog, version 20020801 or later -
  -watchdog.home=${base.path}/watchdog-4.0
  +watchdog.home=${base.path}/jakarta-watchdog-4.0
   watchdog.webapps=${watchdog.home}/dist/webapps
   watchdog.war=${watchdog.webapps}/servlet-tests.war
   watchdog.loc=jakarta-watchdog-4.0
  +watchdog.target=all
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-5 build.xml build.properties.default

2002-11-05 Thread costin 
costin  2002/11/05 11:25:50

  Modified:.build.xml build.properties.default
  Log:
  Get modeler from cvs ( for now )
  
  Revision  ChangesPath
  1.56  +20 -0 jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- build.xml 29 Oct 2002 18:07:37 -  1.55
  +++ build.xml 5 Nov 2002 19:25:49 -   1.56
  @@ -248,9 +248,20 @@
   
 
   
  +  
  +== Building: commons-modeler 
  +
  +
  +
  +
  +
  +
  +  
  +
 
   
  +
   
 
   
  @@ -836,10 +847,19 @@
 
   
   
  + 
  +
  +
  +  
  +  
  +  
  +
  +
   
 
 
  
  
  
  1.50  +6 -3  jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- build.properties.default  29 Oct 2002 18:07:37 -  1.49
  +++ build.properties.default  5 Nov 2002 19:25:49 -   1.50
  @@ -134,10 +134,13 @@
   
   
   # - Commons Modeler, version 1.0 or later -
  -commons-modeler.home=${base.path}/commons-modeler-1.0
  -commons-modeler.lib=${commons-modeler.home}
  +commons-modeler.home=${base.path}/commons-modeler-1.1dev
  +#commons-modeler.home=${base.path}/commons-modeler-1.0
  +#commons-modeler.lib=${commons-modeler.home}
  +commons-modeler.lib=${commons-modeler.home}/dist
   commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
   
commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
  +commons-modeler.cvs.loc=jakarta-commons/modeler
   
   
   # - Commons Pool, version 1.0.1 or later -
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: