svn commit: r148876 - /cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java /cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java

[cziegeler]

Author: cziegeler
Date: Fri Jan 28 03:41:21 2005
New Revision: 148876

URL: http://svn.apache.org/viewcvs?view=rev&rev=148876
Log:
Update settings
Modified:
   cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
   cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Url: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java?view=diff&rev=148876&p1=cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java&r1=148875&p2=cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java&r2=148876
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java  
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java  Fri Jan 
28 03:41:21 2005
@@ -279,7 +279,8 @@
         }
         this.workDir.mkdirs();
         this.appContext.put(Constants.CONTEXT_WORK_DIR, workDir);
-
+        this.settings.setWorkDirectory(this.workDir.getAbsolutePath());
+        
         String path = this.servletContextPath;
         // these two variables are just for debugging. We can't log at this 
point
         // as the logger isn't initialized yet.
@@ -360,6 +361,7 @@
         }
         this.uploadDir.mkdirs();
         this.appContext.put(Constants.CONTEXT_UPLOAD_DIR, this.uploadDir);
+        this.settings.setUploadDirectory(this.uploadDir.getAbsolutePath());
 
         String cacheDirParam = this.settings.getCacheDirectory();
         if (cacheDirParam != null) {
@@ -387,6 +389,7 @@
         }
         this.cacheDir.mkdirs();
         this.appContext.put(Constants.CONTEXT_CACHE_DIR, this.cacheDir);
+        this.settings.setCacheDirectory(this.cacheDir.getAbsolutePath());
 
         this.appContext.put(Constants.CONTEXT_CONFIG_URL,
                             
this.getConfigFile(this.settings.getConfiguration()));

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java
Url: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java?view=diff&rev=148876&p1=cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java&r1=148875&p2=cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java&r2=148876
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java 
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java Fri Jan 
28 03:41:21 2005
@@ -157,7 +157,6 @@
             return;
         }
         StringTokenizer tokenizer = new StringTokenizer(param, " \t\r\n\f;,", 
false);
-        String[] array = null;    
         while (tokenizer.hasMoreTokens()) {
             final String value = tokenizer.nextToken().trim();
             s.addToLoadClasses(value);
@@ -200,9 +199,7 @@
      */
     private static void handleExtraClassPath(String extraClassPath, Settings 
settings) {
         if (extraClassPath != null) {
-            StringBuffer sb = new StringBuffer();
             StringTokenizer st = new StringTokenizer(extraClassPath, 
SystemUtils.PATH_SEPARATOR, false);
-            int i = 0;
             while (st.hasMoreTokens()) {
                 String s = st.nextToken();
                 settings.addToExtraClasspaths(s);