cvs commit: jakarta-tomcat-4.0/resources/confinstall server_1.xml server_2.xml tomcat-users_1.xml tomcat-users_2.xml

2004-05-22 Thread markt 
markt   2004/05/22 10:34:58

  Modified:.build.xml tomcat.nsi
   resources INSTALLLICENSE config.ini
   resources/confinstall server_1.xml server_2.xml
tomcat-users_1.xml tomcat-users_2.xml
  Log:
  Update to use NSIS version 2. Only uses new features where required
  to get installer task to complete. Some minor changes in behaviour but
  otherwise remains consistent with previous behaviour.
  Updating to version 2 to allow me to fix a bug in the installer without
  having to swap between NSIS versions for TC4 and TC5.
  
  Revision  ChangesPath
  1.83  +2 -2  jakarta-tomcat-4.0/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- build.xml 23 Oct 2003 15:32:10 -  1.82
  +++ build.xml 22 May 2004 17:34:57 -  1.83
  @@ -261,14 +261,14 @@
   
 
   
  -
   
   
   
  -
  +
 
   
   http://jakarta.apache.org/tomcat";
  +SectionIn 1 2 3
   
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Uninstall Tomcat 4.1.lnk" \
  - "$INSTDIR\uninst-tomcat4.exe"
  +Call findJavaPath
  +Pop $2
   
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Tomcat 4.1 Program Directory.lnk" \
  - "$INSTDIR"
  +SetOutPath "$SMPROGRAMS\Apache Tomcat 4.1"
   
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Start Tomcat.lnk" \
  - "$2\bin\java.exe" \
  - '-jar -Duser.dir="$INSTDIR" 
-Djava.endorsed.dirs="$INSTDIR\common\endorsed" "$INSTDIR\bin\bootstrap.jar" start' \
  - "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
  +CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Tomcat Home Page.lnk" \
  +   "http://jakarta.apache.org/tomcat";
   
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Stop Tomcat.lnk" \
  - "$2\bin\java.exe" \
  - '-jar -Duser.dir="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" stop' \
  - "$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
  +CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Uninstall Tomcat 4.1.lnk" \
  +   "$INSTDIR\uninst-tomcat4.exe"
   
  -SectionEnd
  +CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Tomcat 4.1 Program Directory.lnk" 
\
  +   "$INSTDIR"
   
  -SectionDivider " documentation and examples "
  +CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Start Tomcat.lnk" \
  +   "$2\bin\java.exe" \
  +   '-jar -Duser.dir="$INSTDIR" 
-Djava.endorsed.dirs="$INSTDIR\common\endorsed" "$INSTDIR\bin\bootstrap.jar" start' \
  +   "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
   
  -Section "Tomcat Documentation"
  +CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Stop Tomcat.lnk" \
  +   "$2\bin\java.exe" \
  +   '-jar -Duser.dir="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" stop' \
  +   "$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
   
  -  SectionIn 1 3
  -  SetOutPath $INSTDIR\webapps
  -  File /r webapps\tomcat-docs
  +  SectionEnd
  +SubSectionEnd
   
  -  IfFileExists "$SMPROGRAMS\Apache Tomcat 4.1" 0 NoLinks
  +SubSection "Documentation and Examples"
  +  Section "Tomcat Documentation"
   
  -  SetOutPath "$SMPROGRAMS\Apache Tomcat 4.1"
  -
  -  CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Tomcat Documentation.lnk" \
  - "$INSTDIR\webapps\tomcat-docs\index.html"
  -
  - NoLinks:
  +SectionIn 1 3
  +SetOutPath $INSTDIR\webapps
  +File /r webapps\tomcat-docs
   
  -SectionEnd
  +IfFileExists "$SMPROGRAMS\Apache Tomcat 4.1" 0 NoLinks
   
  -Section "Example Web Applications"
  +SetOutPath "$SMPROGRAMS\Apache Tomcat 4.1"
   
  -  SectionIn 1 3
  +CreateShortCut "$SMPROGRAMS\Apache Tomcat 4.1\Tomcat Documentation.lnk" \
  +   "$INSTDIR\webapps\tomcat-docs\index.html"
   
  -  SetOverwrite off
  -  SetOutPath $INSTDIR\conf
  -  File conf\server.xml
  -  SetOverwrite on
  -  SetOutPath $INSTDIR\webapps
  -  File /r webapps\examples
  -  File /r webapps\webdav
  +NoLinks:
   
  -SectionEnd
  +  SectionEnd
   
  -SectionDivider " developer resources "
  +  Section "Example Web Applications"
   
  -Section "Tomcat Source Code"
  +SectionIn 1 3
   
  -  SectionIn 3
  -  SetOutPath $INSTDIR
  -  File /r src
  -  File /r jtc-src
  +SetOverwrite off
  +SetOutPath $INSTDIR\conf
  +File conf\server.xml
  +SetOverwrite on
  +SetOutPath $INSTDIR\webapps
  +File /r webapps\examples
  +File /r webapps\webdav
   
  -SectionEnd
  +  SectionEnd
   
  -Section -post
  +SubSEctionEnd
  +SubSection "Developer Resources"
   
  -  SetOverwrite off
  -  SetOutPath $INSTDIR\conf
  -  File /oname=server.xml conf\server-noexamples.xml.config
  -  SetOutPath $

cvs commit: jakarta-tomcat-4.0/resources/confinstall server_1.xml server_2.xml tomcat-users_1.xml tomcat-users_2.xml

2002-01-31 Thread remm 

remm02/01/31 16:15:11

  Added:   resources config.ini
   resources/confinstall server_1.xml server_2.xml
tomcat-users_1.xml tomcat-users_2.xml
  Log:
  - Make use of the new InstallOptions helper DLL to display a page asking
some questions to the user:
- user/pass used for the admin webapp
- port number on which to install Tomcat
Then the user can log in to the admin webapp and change
all the other parameters.
  - Create some shorcuts to the admin webapp and the TC start page.
  - The way the values are filled in in the config files is a big hack, since
NSIS doesn't support filtering (yet). Once filtering is in, we can add some more
options, and clean up the script.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-4.0/resources/config.ini
  
  Index: config.ini
  ===
  [Settings]
  NumFields=7
  
  Title=Test Install Setup: Testing Installer Options
  
  ; uncomment this to confirm on exit.
  ; CancelConfirm=Are you sure you want to cancel the install?
  
  ; comment this out to hide the back button
  BackEnabled=0
  
  ; you can override the defaults here
  CancelButtonText=Skip
  NextButtonText=Next >
  
  
  [Field 1]
  Type=Label
  Text=HTTP/1.1 Connector Port
  left=0
  right=150
  top=5
  bottom=20
  
  [Field 2]
  Type=Text
  left=150
  right=200
  top=0
  bottom=20
  
  [Field 3]
  Type=Label
  text=Administrator Login
  left=0
  right=300
  top=30
  bottom=45
  
  [Field 4]
  Type=Label
  Text=User Name
  left=0
  right=150
  top=50
  bottom=65
  
  [Field 5]
  Type=Text
  left=150
  right=250
  top=45
  bottom=65
  
  [Field 6]
  Type=Label
  Text=Password
  left=0
  right=150
  top=70
  bottom=85
  
  [Field 7]
  Type=Password
  left=150
  right=250
  top=65
  bottom=85
  
  
  
  
  1.1  jakarta-tomcat-4.0/resources/confinstall/server_1.xml
  
  Index: server_1.xml
  ===
  
  
  
  
  
  
  
  


  


  
  
  
  
  
  
  
  

  factory
  org.apache.catalina.users.MemoryUserDatabaseFactory


  pathname
  conf/tomcat-users.xml

  
  

  

  


  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  


  


  

  


  

  
  

  

  

  

  


  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  


  

  
  
  

  




  usersa
  password
  driverClassName
org.hsql.jdbcDriver
  driverName
jdbc:HypersonicSQL:database



  
mail.smtp.host
localhost
  


  
  

  
  
  

  

  


  
  
  
  
  
  


  


  
  
  

  
  
  
  
  
  1.1  jakarta-tomcat-4.0/resources/confinstall/tomcat-users_1.xml
  
  Index: tomcat-users_1.xml
  ===
  
  
  
  
  
  1.1  jakarta-tomcat-4.0/resources/confinstall/tomcat-users_2.xml
  
  Index: tomcat-users_2.xml
  ===



  
  
  
  

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