cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup LocalStrings.properties ExpandWar.java

2005-02-01 Thread remm 
remm2005/02/01 05:12:31

  Modified:catalina/src/share/org/apache/catalina/startup
LocalStrings.properties ExpandWar.java
  Log:
  - Use NIO for the raw copying operation, as it is faster (a little under 
30%), which decreases a little the impact of antResourceLocking.
  
  Revision  ChangesPath
  1.12  +1 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- LocalStrings.properties   3 Jan 2005 16:10:19 -   1.11
  +++ LocalStrings.properties   1 Feb 2005 13:12:31 -   1.12
  @@ -37,6 +37,7 @@
   engineConfig.cce=Lifecycle event data object {0} is not an Engine
   engineConfig.start=EngineConfig: Processing START
   engineConfig.stop=EngineConfig: Processing STOP
  +expandWar.copy=Error copying {0} to {1}
   hostConfig.appBase=Application base directory {0} does not exist
   hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
   hostConfig.cce=Lifecycle event data object {0} is not a Host
  
  
  
  1.10  +17 -29
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
  
  Index: ExpandWar.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ExpandWar.java27 Jul 2004 17:53:14 -  1.9
  +++ ExpandWar.java1 Feb 2005 13:12:31 -   1.10
  @@ -25,12 +25,15 @@
   import java.io.IOException;
   import java.net.JarURLConnection;
   import java.net.URL;
  +import java.nio.channels.FileChannel;
   import java.util.Enumeration;
   import java.util.jar.JarEntry;
   import java.util.jar.JarFile;
   
   import org.apache.catalina.Host;
   import org.apache.catalina.util.StringManager;
  +import org.apache.commons.logging.Log;
  +import org.apache.commons.logging.LogFactory;
   
   /**
* Expand out a WAR in a Host's appBase.
  @@ -43,6 +46,7 @@
   
   public class ExpandWar {
   
  +private static Log log = LogFactory.getLog(ExpandWar.class);
   
   /**
* The string resources for this package.
  @@ -189,17 +193,6 @@
* @param dest File object representing the destination
*/
   public static boolean copy(File src, File dest) {
  -return copyInternal(src, dest, new byte[4096]);
  -}
  -
  -
  -/**
  - * Copy the specified file or directory to the destination.
  - *
  - * @param src File object representing the source
  - * @param dest File object representing the destination
  - */
  -public static boolean copyInternal(File src, File dest, byte[] buf) {
   
   boolean result = true;
   
  @@ -218,33 +211,28 @@
   File fileSrc = new File(src, files[i]);
   File fileDest = new File(dest, files[i]);
   if (fileSrc.isDirectory()) {
  -result = copyInternal(fileSrc, fileDest, buf);
  +result = copy(fileSrc, fileDest);
   } else {
  -FileInputStream is = null;
  -FileOutputStream os = null;
  +FileChannel ic = null;
  +FileChannel oc = null;
   try {
  -is = new FileInputStream(fileSrc);
  -os = new FileOutputStream(fileDest);
  -int len = 0;
  -while (true) {
  -len = is.read(buf);
  -if (len == -1)
  -break;
  -os.write(buf, 0, len);
  -}
  +ic = (new FileInputStream(fileSrc)).getChannel();
  +oc = (new FileOutputStream(fileDest)).getChannel();
  +ic.transferTo(0, ic.size(), oc);
   } catch (IOException e) {
  -e.printStackTrace();
  +log.error(sm.getString
  +("expandWar.copy", fileSrc, fileDest), e);
   result = false;
   } finally {
  -if (is != null) {
  +if (ic != null) {
   try {
  -is.close();
  +ic.close();
   } catch (IOException e) {
   }
   }
  -if (os != null) {
  +if (oc != null) {
   try {
  -os.clo

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup LocalStrings.properties Embedded.java Catalina.java

2004-10-23 Thread remm 
remm2004/10/23 09:54:23

  Modified:catalina/src/share/org/apache/catalina/startup
LocalStrings.properties Embedded.java Catalina.java
  Log:
  - Add explicit error message if temp dir does not exist.
  - Remove useless calls to Embedded.initDirs.
  
  Revision  ChangesPath
  1.8   +1 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LocalStrings.properties   17 Sep 2004 15:07:27 -  1.7
  +++ LocalStrings.properties   23 Oct 2004 16:54:23 -  1.8
  @@ -29,6 +29,7 @@
   contextConfig.unavailable=Marking this application unavailable due to previous 
error(s)
   embedded.alreadyStarted=Embedded service has already been started
   embedded.noEngines=No engines have been defined yet
  +embedded.notmp=Cannot find specified temporary folder at {0}
   embedded.notStarted=Embedded service has not yet been started
   embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve
   engineConfig.cce=Lifecycle event data object {0} is not an Engine
  
  
  
  1.25  +7 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
  
  Index: Embedded.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Embedded.java 29 Sep 2004 09:55:38 -  1.24
  +++ Embedded.java 23 Oct 2004 16:54:23 -  1.25
  @@ -927,6 +927,12 @@
   }
   System.setProperty("catalina.base", catalinaBase);
   }
  +
  +String temp = System.getProperty("java.io.tmpdir");
  +if (temp == null || (!(new File(temp)).exists())
  +|| (!(new File(temp)).isDirectory())) {
  +log.error(sm.getString("embedded.notmp", temp));
  +}
   
   }
   
  
  
  
  1.35  +2 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Catalina.java 29 Sep 2004 09:55:39 -  1.34
  +++ Catalina.java 23 Oct 2004 16:54:23 -  1.35
  @@ -429,6 +429,7 @@
* Start a new server instance.
*/
   public void load() {
  +
   initDirs();
   
   // Before digester - it may be needed
  @@ -503,8 +504,6 @@
*/
   public void load(String args[]) {
   
  -setCatalinaHome();
  -setCatalinaBase();
   try {
   if (arguments(args))
   load();
  
  
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup LocalStrings.properties

2004-09-17 Thread luehe 
luehe   2004/09/17 08:01:30

  Modified:catalina/src/share/org/apache/catalina/startup
LocalStrings.properties
  Log:
  Provide mechanism to override the login-method-to-authenticator mappings
  specified in Authenticators.properties, and provide custom Authenticator
  implementations.
  
  Revision  ChangesPath
  1.6   +1 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LocalStrings.properties   10 Apr 2004 15:09:12 -  1.5
  +++ LocalStrings.properties   17 Sep 2004 15:01:30 -  1.6
  @@ -1,3 +1,4 @@
  +authenticator.notInstanceOfValve=Specified Authenticator is not a Valve
   contextConfig.applicationClose=Error closing application web.xml
   contextConfig.applicationConfig=Configuration error in application web.xml
   contextConfig.applicationListener=Exception creating listener of class {0}
  
  
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup LocalStrings.properties

2004-04-10 Thread remm 
remm2004/04/10 08:09:12

  Modified:catalina/src/share/org/apache/catalina/startup
LocalStrings.properties
  Log:
  - Forgot the resources.
  
  Revision  ChangesPath
  1.5   +3 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LocalStrings.properties   13 Jan 2004 16:31:35 -  1.4
  +++ LocalStrings.properties   10 Apr 2004 15:09:12 -  1.5
  @@ -48,7 +48,9 @@
   hostConfig.expand.error=Exception while expanding web application archive {0}
   hostConfig.expanding=Expanding discovered web application archives
   hostConfig.context.restart=Error during context {0} restart
  -hostConfig.start=HostConfig: Processing START
  +hostConfig.removeXML=Context {0} is undeployed
  +hostConfig.removeDIR=Directory {0} is undeployed
  +hostConfig.removeWAR=War {0} is undeployedhostConfig.start=HostConfig: Processing 
START
   hostConfig.stop=HostConfig: Processing STOP
   hostConfig.undeploy=Undeploying web application at context path {0}
   hostConfig.undeploy.error=Error undeploying web application at context path {0}
  
  
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup LocalStrings.properties

2003-01-16 Thread costin 
costin  2003/01/16 13:45:25

  Modified:catalina/src/share/org/apache/catalina/startup
LocalStrings.properties
  Log:
  Part 2 of messages change.
  
  If the tld can't be read, it helps to know what context has the problem.
  
  Revision  ChangesPath
  1.3   +3 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings.properties   15 Jan 2003 03:40:43 -  1.2
  +++ LocalStrings.properties   16 Jan 2003 21:45:25 -  1.3
  @@ -22,9 +22,9 @@
   contextConfig.role.runas=WARNING: Security role name {0} used in a  without 
being defined in a 
   contextConfig.start=ContextConfig: Processing START
   contextConfig.stop=ContextConfig: Processing STOP
  -contextConfig.tldEntryException=Exception processing TLD {0} in JAR at resource 
path {1}
  -contextConfig.tldFileException=Exception processing TLD at resource path {0}
  -contextConfig.tldJarException=Exception processing JAR at resource path {0}
  +contextConfig.tldEntryException=Exception processing TLD {0} in JAR at resource 
path {1} in context {2}
  +contextConfig.tldFileException=Exception processing TLD at resource path {0} in 
context {1}
  +contextConfig.tldJarException=Exception processing JAR at resource path {0} in 
context {1}
   contextConfig.tldResourcePath=Invalid TLD resource path {0}
   contextConfig.unavailable=Marking this application unavailable due to previous 
error(s)
   embedded.alreadyStarted=Embedded service has already been started
  
  
  

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