cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/tools/src/loader Loader.java
Date Fri, 05 Mar 2004 02:24:26 GMT
joerg       2004/03/04 18:24:26

  Modified:    .        status.xml cocoon.bat cocoon.sh
               tools/src/loader Loader.java
  Log:
  bug 27254 fixed: path separator handling in cocoon.bat/.sh and Loader.java.
  
  Revision  Changes    Path
  1.258     +4 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.257
  retrieving revision 1.258
  diff -u -r1.257 -r1.258
  --- status.xml	5 Mar 2004 01:58:31 -0000	1.257
  +++ status.xml	5 Mar 2004 02:24:26 -0000	1.258
  @@ -196,6 +196,9 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="JH" type="fix" fixes-bug="27254" due-to="Georg Ragaller" due-to-email="georg.ragaller@nse.de">
  +     Fixed path separator handling in cocoon.bat/.sh and Loader.java.
  +   </action>
      <action dev="JH" type="fix" fixes-bug="27456" due-to="Oscar Picasso" due-to-email="oscpro@yahoo.com">
        Fixed duplicate startDocument event in BetwixtTransformer.
      </action>
  
  
  
  1.20      +5 -5      cocoon-2.1/cocoon.bat
  
  Index: cocoon.bat
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/cocoon.bat,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- cocoon.bat	4 Feb 2004 17:59:44 -0000	1.19
  +++ cocoon.bat	5 Mar 2004 02:24:26 -0000	1.20
  @@ -123,25 +123,25 @@
   :: ----- Servlet ---------------------------------------------------------------
   
   :doServlet
  -%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed"
"-Dwebapp=%JETTY_WEBAPP%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dhome=%COCOON_HOME%" "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
  +%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed"
"-Dwebapp=%JETTY_WEBAPP%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dhome=%COCOON_HOME%" "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib;%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
   goto end
   
   :: ----- Servlet with Administration Web Interface -----------------------------
   
   :doAdmin
  -%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed"
"-Dwebapp=%JETTY_WEBAPP%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dhome=%COCOON_HOME%" "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
"%COCOON_HOME%\tools\jetty\conf\admin.xml"
  +%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed"
"-Dwebapp=%JETTY_WEBAPP%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dhome=%COCOON_HOME%" "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib;%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
"%COCOON_HOME%\tools\jetty\conf\admin.xml"
   goto end
   
   :: ----- Servlet Debug ---------------------------------------------------------
   
   :doDebug
  -%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n
 -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed" "-Dwebapp=%JETTY_WEBAPP%"
"-Dhome=%COCOON_HOME%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
  +%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%JAVA_DEBUG_PORT%,server=y,suspend=n
 -classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed" "-Dwebapp=%JETTY_WEBAPP%"
"-Dhome=%COCOON_HOME%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib;%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
   goto end
   
   :: ----- Servlet Profile ---------------------------------------------------------
   
   :doProfile
  -%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xrunhprof:heap=all,cpu=samples,thread=y,depth=3
-classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed" "-Dwebapp=%JETTY_WEBAPP%"
"-Dhome=%COCOON_HOME%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib,%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
  +%EXEC% "%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -Xrunhprof:heap=all,cpu=samples,thread=y,depth=3
-classpath "%CP%" "-Djava.endorsed.dirs=%COCOON_HOME%\lib\endorsed" "-Dwebapp=%JETTY_WEBAPP%"
"-Dhome=%COCOON_HOME%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%JETTY_PORT%
-Djetty.admin.port=%JETTY_ADMIN_PORT% "-Dloader.jar.repositories=%COCOON_HOME%\tools\jetty\lib;%COCOON_HOME%\lib\endorsed"
-Dloader.main.class=org.mortbay.jetty.Server Loader "%COCOON_HOME%\tools\jetty\conf\main.xml"
   
   :: ----- End -------------------------------------------------------------------
   
  
  
  
  1.11      +2 -2      cocoon-2.1/cocoon.sh
  
  Index: cocoon.sh
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/cocoon.sh,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- cocoon.sh	1 Dec 2003 13:21:09 -0000	1.10
  +++ cocoon.sh	5 Mar 2004 02:24:26 -0000	1.11
  @@ -129,7 +129,7 @@
   JETTY_HOME="-Dhome=$COCOON_HOME"
   JETTY_PORT_ARGS="-Djetty.port=$JETTY_PORT"
   JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT"
  -JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib,$ENDORSED_LIBS"
  +JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib:$ENDORSED_LIBS"
   
   # ----- Do the action ----------------------------------------------------------
   
  
  
  
  1.3       +2 -2      cocoon-2.1/tools/src/loader/Loader.java
  
  Index: Loader.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/tools/src/loader/Loader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Loader.java	14 Jan 2004 14:05:11 -0000	1.2
  +++ Loader.java	5 Mar 2004 02:24:26 -0000	1.3
  @@ -77,7 +77,7 @@
   
           RepositoryClassLoader classLoader = new RepositoryClassLoader(this.getClass().getClassLoader());
   
  -        StringTokenizer st = new StringTokenizer(repositories,",;:");
  +        StringTokenizer st = new StringTokenizer(repositories, File.pathSeparator);
           while (st.hasMoreTokens()) {
               classLoader.addRepository(new File(st.nextToken()));        
           }        
  
  
  

Mime
View raw message