svn commit: r1057118 - /tomcat/trunk/webapps/docs/config/systemprops.xml

[markt]

Author: markt
Date: Mon Jan 10 08:40:12 2011
New Revision: 1057118

URL: http://svn.apache.org/viewvc?rev=1057118&view=rev
Log:
Document a couple of long standing system properties

Modified:
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1057118&r1=1057117&r2=1057118&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Mon Jan 10 08:40:12 2011
@@ -495,6 +495,20 @@
   Context elements.
 
 
+
+  The class name of the factory to use to create resources of type
+  javax.sql.DataSource. If not specified the default of
+  org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory is used
+  which is a package renamed (to avoid conflictions) copy of
+  http://commons.apache.org/dbcp";>Apache Commons DBCP.
+
+
+
+  The class name of the factory to use to create resources of type
+  javax.mail.Session. If not specified the default of
+  org.apache.naming.factory.MailSessionFactory is used.
+
+
 
   Provides a default value for the jvmRoute attribute of 
the
   Engine element. It does not override the value



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50449] Methodexpression with arguments fails in JSF composite component

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50449

Bernhard Keprt  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |

--- Comment #2 from Bernhard Keprt  2011-01-10 
06:57:21 EST ---
I also experience this problem.
I use Tomcat 7.0.5 BETA, JSF-SUN RI 2.0.2.

For me, its a message like this:
javax.el.MethodNotFoundException: /resources/components/sortableColumn.xhtml
@22,74 action="#{cc.attrs.model.changeOrder('test', 'test')}": Method not
found: at.compax.aax2sv.model.collectionmo...@4741e072.changeorder()

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50449] Methodexpression with arguments fails in JSF composite component

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50449

Bernhard Keprt  changed:

   What|Removed |Added

 CC||bernhard.ke...@gmail.com

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50449] Methodexpression with arguments fails in JSF composite component

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50449

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||WORKSFORME

--- Comment #3 from Mark Thomas  2011-01-10 07:29:15 EST ---
As I said, this works for me when tested with the provided test case.

If this doesn't work for you, you will need to provide the simplest a test case
that demonstrates this.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057246 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Mon Jan 10 15:46:18 2011
New Revision: 1057246

URL: http://svn.apache.org/viewvc?rev=1057246&view=rev
Log:
Fix FindBugs warnings in StandardHost

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1057246&r1=1057245&r2=1057246&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon Jan 10 
15:46:18 2011
@@ -711,28 +711,27 @@ public class StandardHost extends Contai
 protected synchronized void startInternal() throws LifecycleException {
 
 // Set error report valve
-if ((errorReportValveClass != null)
-&& (!errorReportValveClass.equals(""))) {
+String errorValve = getErrorReportValveClass();
+if ((errorValve != null) && (!errorValve.equals(""))) {
 try {
 boolean found = false;
 Valve[] valves = getPipeline().getValves();
 for (Valve valve : valves) {
-if (errorReportValveClass.equals(
-valve.getClass().getName())) {
+if (errorValve.equals(valve.getClass().getName())) {
 found = true;
 break;
 }
 }
 if(!found) {
-Valve valve = (Valve) Class.forName(errorReportValveClass).
-newInstance();
+Valve valve =
+(Valve) Class.forName(errorValve).newInstance();
 getPipeline().addValve(valve);
 }
 } catch (Throwable t) {
 ExceptionUtils.handleThrowable(t);
-log.error(sm.getString
-("standardHost.invalidErrorReportValveClass", 
- errorReportValveClass), t);
+log.error(sm.getString(
+"standardHost.invalidErrorReportValveClass",
+errorValve), t);
 }
 }
 super.startInternal();

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1057246&r1=1057245&r2=1057246&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Mon Jan 10 15:46:18 
2011
@@ -1,6 +1,11 @@
 
   
   
+
+
+
+  
+  
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057252 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHost.java webapps/docs/html-manager-howto.xml webapps/docs/manager-howto.xml

[markt]

Author: markt
Date: Mon Jan 10 16:01:09 2011
New Revision: 1057252

URL: http://svn.apache.org/viewvc?rev=1057252&view=rev
Log:
Remove Host.liveDeploy that just duplicates Host.autoDeploy

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/webapps/docs/html-manager-howto.xml
tomcat/trunk/webapps/docs/manager-howto.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1057252&r1=1057251&r2=1057252&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon Jan 10 
16:01:09 2011
@@ -166,7 +166,8 @@ public class StandardHost extends Contai
   */
  private Map childClassLoaders =
  new WeakHashMap();
-
+ 
+ 
 // - Properties
 
 
@@ -398,28 +399,6 @@ public class StandardHost extends Contai
 
 
 /**
- * Return the value of the live deploy flag.  If true, it indicates that 
- * a background thread should be started that looks for web application
- * context files, WAR files, or unpacked directories being dropped in to
- * the appBase directory, and deploys new ones as they are
- * encountered.
- */
-public boolean getLiveDeploy() {
-return (this.autoDeploy);
-}
-
-
-/**
- * Set the live deploy flag value for this host.
- * 
- * @param liveDeploy The new live deploy flag
- */
-public void setLiveDeploy(boolean liveDeploy) {
-setAutoDeploy(liveDeploy);
-}
-
-
-/**
  * Return the Java class name of the error report valve class
  * for new web applications.
  */

Modified: tomcat/trunk/webapps/docs/html-manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-manager-howto.xml?rev=1057252&r1=1057251&r2=1057252&view=diff
==
--- tomcat/trunk/webapps/docs/html-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-manager-howto.xml Mon Jan 10 16:01:09 2011
@@ -467,9 +467,9 @@ file, the war will be unpacked into a di
 directory.
 
 If the application war or directory is deployed in your Host appBase
-directory and either the Host is configured with autoDeploy=true or
-liveDeploy=true, the Context path must match the directory name or
-war file name without the ".war" extension.
+directory and either the Host is configured with autoDeploy=true the Context
+path must match the directory name or war file name without the ".war"
+extension.
 
 For security when untrusted users can manage web applications, the
 Host deployXML flag can be set to false.  This prevents untrusted users
@@ -528,9 +528,9 @@ error message.  Possible causes for prob
 Context path must match the directory or WAR file name:
 
 If the application war or directory is deployed in your Host appBase
-directory and either the Host is configured with autoDeploy=true or
-liveDeploy=true, the Context path must match the directory name or
-war file name without the ".war" extension.
+directory and either the Host is configured with autoDeploy=true the 
Context
+path must match the directory name or war file name without the ".war"
+extension.
 
 Only web applications in the Host web application directory can
  be deployed

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1057252&r1=1057251&r2=1057252&view=diff
==
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Mon Jan 10 16:01:09 2011
@@ -426,9 +426,9 @@ file, the war will be unpacked into a di
 directory.
 
 If the application war or directory is installed in your Host appBase
-directory and either the Host is configured with autoDeploy=true or
-liveDeploy=true, the Context path must match the directory name or
-war file name without the ".war" extension.
+directory and either the Host is configured with autoDeploy=true or the
+Context path must match the directory name or war file name without the
+".war" extension.
 
 For security when untrusted users can manage web applications, the
 Host deployXML flag can be set to false.  This prevents untrusted users
@@ -488,9 +488,9 @@ error message.  Possible causes for prob
 Context path must match the directory or WAR file name:
 
 If the application war or directory is installed in your Host appBase
-directory and either the Host is configured with autoDeploy=true or
-liveDeploy=true, the Context path must match the directory name or
-war file name withou

svn commit: r1057266 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc: naming/ pool/ pool/interceptor/ pool/jmx/

[fhanik]

Author: fhanik
Date: Mon Jan 10 16:33:52 2011
New Revision: 1057266

URL: http://svn.apache.org/viewvc?rev=1057266&view=rev
Log:
Remove override annotations to compile with JDK 1.5

Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1057266&r1=1057265&r2=1057266&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
 Mon Jan 10 16:33:52 2011
@@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactor
  */
 public class GenericNamingResourcesFactory implements ObjectFactory {
 private static final Log log = 
LogFactory.getLog(GenericNamingResourcesFactory.class);
-@Override
+
 public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment) throws Exception {
 if ((obj == null) || !(obj instanceof Reference)) {
 return null;

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1057266&r1=1057265&r2=1057266&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
 Mon Jan 10 16:33:52 2011
@@ -192,7 +192,7 @@ public class DataSourceProxy implements 
 else return p.getSize();
 }
 
-@Override
+
 public String toString() {
 return super.toString()+"{"+getPoolProperties()+"}";
 }
@@ -205,7 +205,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public String getPoolName() {
 return pool.getName();
 }
@@ -218,7 +218,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setDriverClassName(String driverClassName) {
 this.poolProperties.setDriverClassName(driverClassName);
 }
@@ -226,7 +226,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setInitialSize(int initialSize) {
 this.poolProperties.setInitialSize(initialSize);
 }
@@ -234,7 +234,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setInitSQL(String initSQL) {
 this.poolProperties.setInitSQL(initSQL);
 }
@@ -242,7 +242,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setLogAbandoned(boolean logAbandoned) {
 this.poolProperties.setLogAbandoned(logAbandoned);
 }
@@ -250,7 +250,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setMaxActive(int maxActive) {
 this.poolProperties.setMaxActive(maxActive);
 }
@@ -258,7 +258,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setMaxIdle(int maxIdle) {
 this.poolProperties.setMaxIdle(maxIdle);
 }
@@ -266,7 +266,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setMaxWait(int maxWait) {
 this.poolProperties.setMaxWait(maxWait);
 }
@@ -274,7 +274,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {
 
this.poolProperties.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
 }
@@ -282,7 +282,7 @@ public class DataSourceProxy implements 
 /** 
  * {...@inheritdoc}
  */
-@Override
+
 public void setMinIdle(int minIdle) {
 this.poolProperties.setMin

svn commit: r1057267 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: interceptor/StatementCache.java jmx/ConnectionPool.java

[fhanik]

Author: fhanik
Date: Mon Jan 10 16:38:08 2011
New Revision: 1057267

URL: http://svn.apache.org/viewvc?rev=1057267&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=49953


Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1057267&r1=1057266&r2=1057267&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Mon Jan 10 16:38:08 2011
@@ -63,6 +63,7 @@ public class StatementCache extends Stat
 return cacheSize;
 }
 
+@Override
 public void setProperties(Map properties) {
 super.setProperties(properties);
 InterceptorProperty p = properties.get("prepared");
@@ -90,11 +91,13 @@ public class StatementCache extends Stat
 
 private AtomicInteger cacheSize;
 
+@Override
 public void poolStarted(ConnectionPool pool) {
 cacheSizeMap.putIfAbsent(pool, new AtomicInteger(0));
 super.poolStarted(pool);
 }
 
+@Override
 public void poolClosed(ConnectionPool pool) {
 cacheSizeMap.remove(pool);
 super.poolClosed(pool);
@@ -156,7 +159,7 @@ public class StatementCache extends Stat
 }
 }
 
-
+@Override
 public Object invoke(Object proxy, Method method, Object[] args) throws 
Throwable {
 boolean process = process(this.types, method, false);
 if (process && args.length>0 && args[0] instanceof String) {

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1057267&r1=1057266&r2=1057267&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
 Mon Jan 10 16:38:08 2011
@@ -75,7 +75,7 @@ public class ConnectionPool extends Noti
 public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY";
 public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT 
CONNETION ABANDONED";
 
-
+@Override
 public MBeanNotificationInfo[] getNotificationInfo() { 
 MBeanNotificationInfo[] pres = super.getNotificationInfo();
 MBeanNotificationInfo[] loc = getDefaultNotificationInfo();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49953] Missing @Override annotations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49953

Filip Hanik  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #6 from Filip Hanik  2011-01-10 11:38:17 EST ---
svn r 1057267

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057268 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java PoolProperties.java

[fhanik]

Author: fhanik
Date: Mon Jan 10 16:41:43 2011
New Revision: 1057268

URL: http://svn.apache.org/viewvc?rev=1057268&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50333
dont allow 0 or negative max active values

Modified:

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1057268&r1=1057267&r2=1057268&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Jan 10 16:41:43 2011
@@ -402,6 +402,10 @@ public class ConnectionPool {
 } //end if
 
 //make sure the pool is properly configured
+if (properties.getMaxActive()<1) {
+log.warn("maxActive is smaller than 1, setting maxActive to: 
"+PoolProperties.DEFAULT_MAX_ACTIVE);
+properties.setMaxActive(PoolProperties.DEFAULT_MAX_ACTIVE);
+}
 if (properties.getMaxActive()http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1057268&r1=1057267&r2=1057268&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Mon Jan 10 16:41:43 2011
@@ -36,6 +36,8 @@ import org.apache.juli.logging.LogFactor
 public class PoolProperties implements PoolConfiguration {
 private static final Log log = LogFactory.getLog(PoolProperties.class);
 
+public static final int DEFAULT_MAX_ACTIVE = 100;
+
 protected static AtomicInteger poolCounter = new AtomicInteger(0);
 protected Properties dbProperties = new Properties();
 protected String url = null;
@@ -46,7 +48,7 @@ public class PoolProperties implements P
 protected String defaultCatalog = null;
 protected String connectionProperties;
 protected int initialSize = 10;
-protected int maxActive = 100;
+protected int maxActive = DEFAULT_MAX_ACTIVE;
 protected int maxIdle = maxActive;
 protected int minIdle = initialSize;
 protected int maxWait = 3;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50333] IllegalArgumentException occurs when setting maxActive to smaller than 1.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50333

Filip Hanik  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Filip Hanik  2011-01-10 11:41:53 EST ---
svn r 1057268

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057270 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml

[jfclere]

Author: jfclere
Date: Mon Jan 10 16:43:40 2011
New Revision: 1057270

URL: http://svn.apache.org/viewvc?rev=1057270&view=rev
Log:
filter input of manager app servlets

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1057270&r1=1057269&r2=1057270&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
Mon Jan 10 16:43:40 2011
@@ -407,10 +407,11 @@ public final class HTMLManagerServlet ex
 
 args = new Object[7];
 args[0] = URL_ENCODER.encode(displayPath);
-args[1] = displayPath;
-args[2] = context.getDisplayName();
-if (args[2] == null) {
+args[1] = RequestUtil.filter(displayPath);
+if (context.getDisplayName() == null) {
 args[2] = " ";
+} else {
+args[2] = RequestUtil.filter(context.getDisplayName());
 }
 args[3] = new Boolean(context.getAvailable());
 args[4] = response.encodeURL

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1057270&r1=1057269&r2=1057270&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
Mon Jan 10 16:43:40 2011
@@ -575,7 +575,7 @@ public class StatusTransformer {
 }
 
 writer.print("");
-writer.print(webModuleName);
+writer.print(filter(webModuleName));
 writer.print("");
 if (iterator.hasNext()) {
 writer.print("");
@@ -650,7 +650,7 @@ public class StatusTransformer {
 }
 
 writer.print("");
-writer.print(name);
+writer.print(filter(name));
 writer.print("");
 writer.print("");
 
@@ -778,11 +778,11 @@ public class StatusTransformer {
 mBeanServer.invoke(objectName, "findMappings", null, null);
 
 writer.print("");
-writer.print(servletName);
+writer.print(filter(servletName));
 if ((mappings != null) && (mappings.length > 0)) {
 writer.print(" [ ");
 for (int i = 0; i < mappings.length; i++) {
-writer.print(mappings[i]);
+writer.print(filter(mappings[i]));
 if (i < mappings.length - 1) {
 writer.print(" , ");
 }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1057270&r1=1057269&r2=1057270&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 10 16:43:40 2011
@@ -47,6 +47,9 @@
   
 
   
+filter input of manager app servlets. (kkolinko)
+  
+  
 43960: Expose available property of StandardWrapper via JMX.
 (markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057271 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Mon Jan 10 16:44:04 2011
New Revision: 1057271

URL: http://svn.apache.org/viewvc?rev=1057271&view=rev
Log:
Release information.

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1057271&r1=1057270&r2=1057271&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Jan 10 16:44:04 2011
@@ -30,6 +30,7 @@ version.minor=0
 version.build=0
 version.patch=0
 version.suffix=-dev
+version=6.0.30
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057272 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Mon Jan 10 16:45:54 2011
New Revision: 1057272

URL: http://svn.apache.org/viewvc?rev=1057272&view=rev
Log:
Oops need the build.

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1057272&r1=1057271&r2=1057272&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Jan 10 16:45:54 2011
@@ -27,7 +27,7 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=0
+version.build=30
 version.patch=0
 version.suffix=-dev
 version=6.0.30



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057275 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/config/

[markt]

Author: markt
Date: Mon Jan 10 16:48:25 2011
New Revision: 1057275

URL: http://svn.apache.org/viewvc?rev=1057275&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50205
Add deployIgnore to Host
Based on a patch by Jim Riggs

Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/config/host.xml

Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=1057275&r1=1057274&r2=1057275&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Mon Jan 10 16:48:25 2011
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
 
-
 /**
  * A Host is a Container that represents a virtual host in the
  * Catalina servlet engine.  It is useful in the following types of scenarios:
@@ -148,6 +145,22 @@ public interface Host extends Container 
 public void setDeployOnStartup(boolean deployOnStartup);
 
 
+/**
+ * Return the regular expression that defines the files and directories in
+ * the host's {...@link #appBase} that will be ignored by the automatic
+ * deployment process.
+ */
+public String getDeployIgnore();
+
+
+/**
+ * Set the regular expression that defines the files and directories in
+ * the host's {...@link #appBase} that will be ignored by the automatic
+ * deployment process.
+ */
+public void setDeployIgnore(String deployIgnore);
+
+
 // - Public Methods
 
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1057275&r1=1057274&r2=1057275&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon Jan 10 
16:48:25 2011
@@ -168,6 +168,14 @@ public class StandardHost extends Contai
  new WeakHashMap();
  
  
+ /**
+  * Any file or directory in {...@link #appBase} that this pattern matches 
will
+  * be ignored by the automatic deployment process (both
+  * {...@link #deployOnStartup} and {...@link #autoDeploy}).
+  */
+ private String deployIgnore = null;
+
+
 // - Properties
 
 
@@ -424,8 +432,8 @@ public class StandardHost extends Contai
this.errorReportValveClass);
 
 }
-
-
+
+
 /**
  * Return the canonical, fully qualified, name of the virtual host
  * this Container represents.
@@ -500,6 +508,32 @@ public class StandardHost extends Contai
 }
 
 
+/**
+ * Return the regular expression that defines the files and directories in
+ * the host's {...@link #appBase} that will be ignored by the automatic
+ * deployment process.
+ */
+@Override
+public String getDeployIgnore() {
+return this.deployIgnore;
+}
+
+
+/**
+ * Set the regular expression that defines the files and directories in
+ * the host's {...@link #appBase} that will be ignored by the automatic
+ * deployment process.
+ */
+@Override
+public void setDeployIgnore(String deployIgnore) {
+String oldDeployIgnore = this.deployIgnore;
+this.deployIgnore = deployIgnore;
+support.firePropertyChange("deployIgnore",
+   oldDeployIgnore, 
+   this.deployIgnore);
+}
+
+
 // - Public Methods
 
 

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1057275&r1=1057274&r2=1057275&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Mon Jan 
10 16:48:25 2011
@@ -1164,6 +1164,10 @@
description="Should we create directories upon startup for 
appBase and xmlBase? "
type="boolean"/>
   
+
+
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 

svn commit: r1057276 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_30/

[jfclere]

Author: jfclere
Date: Mon Jan 10 16:48:44 2011
New Revision: 1057276

URL: http://svn.apache.org/viewvc?rev=1057276&view=rev
Log:
tag for release 6.0.30.

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_30/   (props changed)
  - copied from r1057274, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_30/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jan 10 16:48:44 2011
@@ -0,0 +1,7 @@
+.classpath
+.project
+.settings
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_30/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 10 16:48:44 2011
@@ -0,0 +1 @@
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1055055,1055236,1055458,1056264



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49954] Code tidyup

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49954

Filip Hanik  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057278 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Mon Jan 10 16:50:34 2011
New Revision: 1057278

URL: http://svn.apache.org/viewvc?rev=1057278&view=rev
Log:
Proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1057278&r1=1057277&r2=1057278&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 10 16:50:34 2011
@@ -150,3 +150,10 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1056889&view=rev
   +1: kkolinko, markt
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50205
+  Add deployIgnore to Host
+  Based on a patch by Jim Riggs
+  http://svn.apache.org/viewvc?rev=1057275&view=rev
+  +1: markt
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057279 - in /tomcat/trunk: java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan 10 16:58:10 2011
New Revision: 1057279

URL: http://svn.apache.org/viewvc?rev=1057279&view=rev
Log:
More filtering

Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1057279&r1=1057278&r2=1057279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Mon 
Jan 10 16:58:10 2011
@@ -523,19 +523,21 @@ public final class HTMLManagerServlet ex
 }
 
 args = new Object[7];
-args[0] = "" + displayPath + "";
-args[1] = ctxt.getWebappVersion();
-if ("".equals(args[1])) {
-args[1]= noVersion;
+args[0] = "" + RequestUtil.filter(displayPath) + "";
+if ("".equals(ctxt.getWebappVersion())) {
+args[1] = noVersion;
+} else {
+args[1] = RequestUtil.filter(ctxt.getWebappVersion());
 }
-args[2] = ctxt.getDisplayName();
-if (args[2] == null) {
+if (ctxt.getDisplayName() == null) {
 args[2] = " ";
+} else {
+args[2] = RequestUtil.filter(ctxt.getDisplayName());
 }
 args[3] = Boolean.valueOf(ctxt.getAvailable());
-args[4] = response.encodeURL(request.getContextPath() +
- "/html/sessions?" + pathVersion);
+args[4] = 
RequestUtil.filter(response.encodeURL(request.getContextPath() +
+ "/html/sessions?" + pathVersion));
 Manager manager = ctxt.getManager(); 
 if (manager instanceof DistributedManager && 
showProxySessions) {
 args[5] = Integer.valueOf(
@@ -552,20 +554,20 @@ public final class HTMLManagerServlet ex
 (MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
 
 args = new Object[14];
-args[0] = response.encodeURL(request.getContextPath() +
-"/html/start?" + pathVersion);
+args[0] = RequestUtil.filter(response.encodeURL(request
+.getContextPath() + "/html/start?" + pathVersion));
 args[1] = appsStart;
-args[2] = response.encodeURL(request.getContextPath() +
-"/html/stop?" + pathVersion);
+args[2] = RequestUtil.filter(response.encodeURL(request
+.getContextPath() + "/html/stop?" + pathVersion));
 args[3] = appsStop;
-args[4] = response.encodeURL(request.getContextPath() +
- "/html/reload?" + pathVersion);
+args[4] = RequestUtil.filter(response.encodeURL(request
+.getContextPath() + "/html/reload?" + pathVersion));
 args[5] = appsReload;
-args[6] = response.encodeURL(request.getContextPath() +
- "/html/undeploy?" + pathVersion);
+args[6] = RequestUtil.filter(response.encodeURL(request
+.getContextPath() + "/html/undeploy?" + pathVersion));
 args[7] = appsUndeploy;
-args[8] = response.encodeURL(request.getContextPath() +
- "/html/expire?" + pathVersion);
+args[8] = RequestUtil.filter(response.encodeURL(request
+.getContextPath() + "/html/expire?" + pathVersion));
 args[9] = appsExpire;
 args[10] = smClient.getString(
 "htmlManagerServlet.expire.explain");

Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1057279&r1=1057278&r2=1057279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Mon 
Jan 10 16:58:10 2011
@@ -572,7 +572,7 @@ public class StatusTransformer {
 }
 
 writer.print("");
-writer.print(webModuleName);
+writer.print(filter(webModuleName));
 writer.print("");
 if (iterator.hasNext()) {
 writer.print("");
@@ -649,7 +649

svn commit: r1057280 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Jan 10 16:59:22 2011
New Revision: 1057280

URL: http://svn.apache.org/viewvc?rev=1057280&view=rev
Log:
Correction

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1057280&r1=1057279&r2=1057280&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 10 16:59:22 2011
@@ -315,7 +315,7 @@
 note regarding server VMs. (markt)
   
   
-Further filtering of Manager and Host Manager display output. 
(kkolinko) 
+Further filtering of Manager display output. (kkolinko) 
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057285 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_6: ./ build.properties.default java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/StatusTransformer.jav

[markt]

Author: markt
Date: Mon Jan 10 17:08:47 2011
New Revision: 1057285

URL: http://svn.apache.org/viewvc?rev=1057285&view=rev
Log:
Tag 7.0.6

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/   (props changed)
  - copied from r1057278, tomcat/trunk/

tomcat/tc7.0.x/tags/TOMCAT_7_0_6/java/org/apache/catalina/manager/HTMLManagerServlet.java
  - copied unchanged from r1057279, 
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java

tomcat/tc7.0.x/tags/TOMCAT_7_0_6/java/org/apache/catalina/manager/StatusTransformer.java
  - copied unchanged from r1057279, 
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/webapps/docs/changelog.xml
  - copied unchanged from r1057280, tomcat/trunk/webapps/docs/changelog.xml
Removed:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/modules/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_6/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jan 10 17:08:47 2011
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_6/
--
svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915

Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default?rev=1057285&r1=1057278&r2=1057285&view=diff
==
--- tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default (original)
+++ tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default Mon Jan 10 
17:08:47 2011
@@ -29,7 +29,7 @@ version.major=7
 version.minor=0
 version.build=6
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057286 - /tomcat/tc7.0.x/tags/TOMCAT_7_0_6/

[markt]

Author: markt
Date: Mon Jan 10 17:09:56 2011
New Revision: 1057286

URL: http://svn.apache.org/viewvc?rev=1057286&view=rev
Log:
Need to re-tag

Removed:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057288 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_6: ./ build.properties.default modules/

[markt]

Author: markt
Date: Mon Jan 10 17:17:41 2011
New Revision: 1057288

URL: http://svn.apache.org/viewvc?rev=1057288&view=rev
Log:
Tag 7.0.6

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/   (props changed)
  - copied from r1057287, tomcat/trunk/
Removed:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/modules/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_6/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jan 10 17:17:41 2011
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_6/
--
svn:mergeinfo = /tomcat/tc6.0.x/trunk:742915

Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default?rev=1057288&r1=1057287&r2=1057288&view=diff
==
--- tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default (original)
+++ tomcat/tc7.0.x/tags/TOMCAT_7_0_6/build.properties.default Mon Jan 10 
17:17:41 2011
@@ -29,7 +29,7 @@ version.major=7
 version.minor=0
 version.build=6
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Release build 6.0.30

[jean-frederic clere]

The candidates binaries are available here:
http://people.apache.org/~jfclere/tomcat-6/v6.0.30/

According to the release process, the 6.0.30 build corresponding to the
tag TOMCAT_6_0_30 is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057290 - /tomcat/tc6.0.x/trunk/build.properties.default

[jfclere]

Author: jfclere
Date: Mon Jan 10 17:31:23 2011
New Revision: 1057290

URL: http://svn.apache.org/viewvc?rev=1057290&view=rev
Log:
Rollback release information.

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1057290&r1=1057289&r2=1057290&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Jan 10 17:31:23 2011
@@ -27,10 +27,9 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=30
+version.build=0
 version.patch=0
 version.suffix=-dev
-version=6.0.30
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057292 - /tomcat/trunk/build.properties.default

[markt]

Author: markt
Date: Mon Jan 10 17:35:04 2011
New Revision: 1057292

URL: http://svn.apache.org/viewvc?rev=1057292&view=rev
Log:
Prep for next release

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1057292&r1=1057291&r2=1057292&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jan 10 17:35:04 2011
@@ -27,7 +27,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=6
+version.build=7
 version.patch=0
 version.suffix=-dev
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

ASF test Jira instance now running Tomcat 7.0.6

[Mark Thomas]

Having tagged and built 7.0.6 I have just switched the ASF test Jira
instance [1] from 6.0.29 to 7.0.6. A quick smoke test suggests all is
OK. Folks will be testing this instance over the next few weeks prior to
the migration of the live Jira instance so if there are any issues we
should find them soon.

Assuming all goes well, post migration the live Jira instance will run
7.0.6 and will continue to run 7.0.latest. If you have a spare 5 minutes
try out the test Jira instance. If you find something that is broken,
please let the infrastructure team know.

Cheers,

Mark

[1] https://issues.apache.org/jira-test

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50205] Add deployIgnorePaths attribute to StandardHost

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50205

Mark Thomas  changed:

   What|Removed |Added

  Component|Catalina|Catalina
Version|trunk   |6.0.29
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |default

--- Comment #3 from Mark Thomas  2011-01-10 13:10:38 EST ---
Fixed in 7.0.x and included in 7.0.6

Proposed for 6.0.x

I used a slightly different patch but it was heavily based on your work.
Thanks.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49953] Missing @Override annotations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49953

--- Comment #7 from Sebb  2011-01-10 13:47:39 EST ---
Created an attachment (id=26467)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26467)
Missed from r1057267

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49953] Missing @Override annotations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49953

--- Comment #8 from Sebb  2011-01-10 13:48:34 EST ---
Created an attachment (id=26468)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26468)
Add missing annotations

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49953] Missing @Override annotations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49953

--- Comment #9 from Sebb  2011-01-10 13:49:10 EST ---
Created an attachment (id=26469)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26469)
Add missing annotations

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49953] Missing @Override annotations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49953

Sebb  changed:

   What|Removed |Added

  Attachment #26045|0   |1
is obsolete||

--- Comment #10 from Sebb  2011-01-10 13:49:38 EST ---
(From update of attachment 26045)
Parially applied

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 49953] Missing @Override annotations

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=49953

Sebb  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |

--- Comment #11 from Sebb  2011-01-10 13:50:28 EST ---
Part of the original patch was omitted; there are two other methods that are
missing the @Override annotations.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.30

[Jason Brittain]

On Mon, Jan 10, 2011 at 9:18 AM, jean-frederic clere wrote:

> According to the release process, the 6.0.30 build corresponding to the
> tag TOMCAT_6_0_30 is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [X ] Stable
>

It looks great.  I tested it this morning.. it worked fine for all of my
tests, on Linux.  I tested:
- tar.gz binary bundle
- deployments via the manager
- ran several different webapps, both simple and complex
- HTTP and HTTPS JIO connectors
- JMX connector and context statistics
- No new errors in the logs

Thanks.
--
Jason Brittain
Mulesoft 

[VOTE] Release Apache Tomcat 7.0.6

[Mark Thomas]

The proposed Apache Tomcat 7.0.6 release is now available for voting.

It can be obtained from:
http://people.apache.org/~markt/dev/tomcat-7/v7.0.6/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_6/

The proposed 7.0.6 release is:

[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 7.0.6 Alpha
[ ] Beta   - go ahead and release as 7.0.6 Beta
[ ] Stable - go ahead and release as 7.0.6 Stable

This vote will run until at least 19.00 UTC Thursday 13th January (3
working days).

Cheers,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.30

[Yoav Shapira]

On Mon, Jan 10, 2011 at 1:52 PM, Jason Brittain
 wrote:
> On Mon, Jan 10, 2011 at 9:18 AM, jean-frederic clere wrote:
>
>> According to the release process, the 6.0.30 build corresponding to the
>> tag TOMCAT_6_0_30 is:
>> [ ] Broken
>> [ ] Alpha
>> [ ] Beta
>> [X ] Stable

+1 stable from me too.  I didn't too as extensive a test as Jason.
Just one home-made app with its test suite.

Yoav

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057325 - /tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt

[markt]

Author: markt
Date: Mon Jan 10 19:17:34 2011
New Revision: 1057325

URL: http://svn.apache.org/viewvc?rev=1057325&view=rev
Log:
Missing eol style property

Modified:
tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt   
(props changed)

Propchange: 
tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
--
svn:eol-style = native



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50565] New: Static variables should be accessed in a static way

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50565

   Summary: Static variables should be accessed in a static way
   Product: Tomcat Modules
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: minor
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=26471)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26471)
Static variables should be accessed in a static way

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50566] New: Duplicate assignment to connection variable

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50566

   Summary: Duplicate assignment to connection variable
   Product: Tomcat Modules
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


Created an attachment (id=26472)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=26472)
Remove duplication

Code has:

connection = connection = driver.connect(driverURL, properties);

which is redundant.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 50567] New: Classpath does not need to reference tomcat-dbcp.jar

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=50567

   Summary: Classpath does not need to reference tomcat-dbcp.jar
   Product: Tomcat Modules
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: s...@apache.org


The classpath file has the line:



AFAICT, this is not needed, as Eclipse does not complain when it is removed.

If it is needed, then at least the same version of Tomcat should be referenced.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: DO NOT REPLY [Bug 50333] IllegalArgumentException occurs when setting maxActive to smaller than 1.

[Rainer Jung]

Hi Filip,

On 10.01.2011 17:41, bugzi...@apache.org wrote:

https://issues.apache.org/bugzilla/show_bug.cgi?id=50333

Filip Hanik  changed:

What|Removed |Added

  Status|NEW |RESOLVED
  Resolution||FIXED

--- Comment #1 from Filip Hanik  2011-01-10 11:41:53 EST ---
svn r 1057268


if you write it as r1057268 a regexp that I think Mark added sometime to 
Bugzilla will detect it and provide a nice link to the viewvc revision 
entry in the HTML view of the ticket. It does not work when whitespace 
is between the "r" and the revision number.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 7.0.6

[sebb]

On 10 January 2011 18:54, Mark Thomas  wrote:
> The proposed Apache Tomcat 7.0.6 release is now available for voting.
>
> It can be obtained from:
> http://people.apache.org/~markt/dev/tomcat-7/v7.0.6/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_6/

Some files with no AL headers:

res/findbugs/filter-false-positives.xml
test/javax/el/TestCompositeELResolver.java
test/org/apache/catalina/util/TestContextName.java
test/org/apache/el/TesterEnum.java
test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java

The Manifest for tomcat-dbcp.jar says:
   Implementation-Version: 7.0.5
Is that intended?
In previous releases (7.0.0, 7.0.2, 7.0.4, 7.0.5) of Tomcat, the dbcp
jar manifest had the same version as Tomcat itself.

> The proposed 7.0.6 release is:
>
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 7.0.6 Alpha
> [ ] Beta   - go ahead and release as 7.0.6 Beta
> [ ] Stable - go ahead and release as 7.0.6 Stable
>
> This vote will run until at least 19.00 UTC Thursday 13th January (3
> working days).
>
> Cheers,
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 18462] System.err gets overriden to output to System.out

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=18462

Konstantin Kolinko  changed:

   What|Removed |Added

  Component|Catalina|Catalina
Version|4.1.24  |trunk
Product|Tomcat 4|Tomcat 7

--- Comment #12 from Konstantin Kolinko  2011-01-10 
18:39:36 EST ---
Moving from Tomcat 4/4.1.24 to Tomcat 7.

My concern is when Tomcat is installed on Windows: it is by default configured
to log err and out to separate files.

Steps to reproduce:
1. Install apache-tomcat-6.0.30.exe with the Examples webapp.
2. Launch Tomcat and navigate to
http://localhost:8080/examples/jsp/simpletag/foo.jsp
3. Look into logs/tomcat6-stdout.2011-01-10.log
Actual result: The file contains the following:
===
2011-01-10 23:33:27 Commons Daemon procrun stdout initialized
Did you see me on the stderr window?


Did you see me on the browser window as well?
===
Expected result: The "Did you see me on the stderr window?" message should have
been printed into *stderr* log, not in *stdout* log.

At the same time the tomcat6-stderr.2011-01-10.log file contains a lot of text,
printed by the logging subsystem. It is java.util.logging.ConsoleHandler that
prints there.

As was noticed earlier, the culprit is Embedded#initStreams() (TC5.5,6,7) and
Catalina#initStreams() (TC7).
>>  // Replace System.out and System.err with a custom PrintStream
>>  SystemLogHandler systemlog = new SystemLogHandler(System.out);
>>  System.setOut(systemlog);
>>  System.setErr(systemlog);

Initialization of JULI happens before this redirection, and thus
java.util.logging.ConsoleHandler prints to the original System.err.

My thoughts of this:
1) SystemLogHandler can be enhanced to support separate out and err streams.
2) If we do not fix this, then maybe configure commons-daemon to log both
streams to the same file by default.
It is done by setting Stderr name in its configuration to be an empty string.
-- See method redirectStdStreams() in prunsrv.c.
3) It is worth being mentioned in the FAQ.
4) This feature is not needed at all if no Context is configured with
"swallowOutput=true". So maybe make it configurable and turn it off by default.
The name for the configuration property might be "redirectStreams", like it is
already used as the field name Embedded#redirectStreams.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 962] Add logging option for stderr and stout

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=962

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|LATER   |WONTFIX

--- Comment #2 from Konstantin Kolinko  2011-01-10 
18:56:01 EST ---
Regardless of this option, the original stderr and stdout should still go
somewhere, so we cannot get rid of those streams being redirected externally by
whatever runs Tomcat.

In current versions of Tomcat there is "swallowOutput" option on Context [1],
that will cause stderr and stdout of a webapp being caught and redirected to
the proper logging subsystem -- for those webapps that are still using
System.err and System.out.

[1] http://tomcat.apache.org/tomcat-6.0-doc/config/context.html

The  element is no longer used in the configuration.

I am changing resolution of this issue from "RESOLVED LATER" to "RESOLVED
WONTFIX".

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 33606] System.err and System.out point to the same Stream

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=33606

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|WONTFIX |DUPLICATE

--- Comment #2 from Konstantin Kolinko  2011-01-10 
18:58:26 EST ---


*** This bug has been marked as a duplicate of bug 18462 ***

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 18462] System.err gets overriden to output to System.out

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=18462

Konstantin Kolinko  changed:

   What|Removed |Added

 CC||oliver.henn...@aloba.ch

--- Comment #13 from Konstantin Kolinko  2011-01-10 
18:58:27 EST ---
*** Bug 33606 has been marked as a duplicate of this bug. ***

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.30

[Konstantin Kolinko]

2011/1/10 jean-frederic clere :
> The candidates binaries are available here:
> http://people.apache.org/~jfclere/tomcat-6/v6.0.30/
>
> According to the release process, the 6.0.30 build corresponding to the
> tag TOMCAT_6_0_30 is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [x] Stable
>

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057436 - /tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java

[fhanik]

Author: fhanik
Date: Tue Jan 11 01:32:37 2011
New Revision: 1057436

URL: http://svn.apache.org/viewvc?rev=1057436&view=rev
Log:
Correctly acquire the getConnection method for the right number of arguments

Modified:
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java

Modified: tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java?rev=1057436&r1=1057435&r2=1057436&view=diff
==
--- tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java Tue 
Jan 11 01:32:37 2011
@@ -42,8 +42,10 @@ import javax.sql.DataSource;
  */
 public class DataSourceLinkFactory extends ResourceLinkFactory {
 
-
-// -- ObjectFactory Methods
+public static void setGlobalContext(Context newGlobalContext) {
+ResourceLinkFactory.setGlobalContext(newGlobalContext);
+}
+// - ObjectFactory Methods
 
 
 /**
@@ -52,14 +54,12 @@ public class DataSourceLinkFactory exten
  * @param obj The reference object describing the DataSource
  */
 @Override
-public Object getObjectInstance(Object obj, Name name, Context nameCtx,
-Hashtable environment)
+public Object getObjectInstance(Object obj, Name name, Context nameCtx, 
Hashtable environment)
 throws NamingException {
 Object result = super.getObjectInstance(obj, name, nameCtx, 
environment);
 // Can we process this request?
 if (result!=null) {
 Reference ref = (Reference) obj;
-
 RefAddr userAttr = ref.get("username");
 RefAddr passAttr = ref.get("password");
 if (userAttr.getContent()!=null && passAttr.getContent()!=null) {
@@ -94,17 +94,20 @@ public class DataSourceLinkFactory exten
 private final DataSource ds; 
 private final String username; 
 private final String password;
-public DataSourceHandler(DataSource ds, String username, String 
password) {
+private final Method getConnection;
+public DataSourceHandler(DataSource ds, String username, String 
password) throws Exception {
 this.ds = ds;
 this.username = username;
 this.password = password;
+getConnection = ds.getClass().getMethod("getConnection", 
String.class, String.class);
 }
 
 @Override
 public Object invoke(Object proxy, Method method, Object[] args) 
throws Throwable {
 
-if ("getConnection".equals(method.getName()) && args.length==0) {
+if ("getConnection".equals(method.getName()) && (args==null || 
args.length==0)) {
 args = new String[] {username,password};
+method = getConnection;
 } else if ("unwrap".equals(method.getName())) {
 return unwrap((Class)args[0]);
 }
@@ -134,3 +137,4 @@ public class DataSourceLinkFactory exten
 
 
 }
+



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057437 - /tomcat/tc6.0.x/trunk/STATUS.txt

[fhanik]

Author: fhanik
Date: Tue Jan 11 01:36:37 2011
New Revision: 1057437

URL: http://svn.apache.org/viewvc?rev=1057437&view=rev
Log:
 add in full patch, with a minor correction, and add in kkolinko's adjustments 
to variables

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1057437&r1=1057436&r2=1057437&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 11 01:36:37 2011
@@ -135,14 +135,9 @@ PATCHES PROPOSED TO BACKPORT:
   -1:
   
 * Add helper class to allow a shared data source with different credentials
-  http://svn.apache.org/viewvc?view=revision&revision=1055989
+  http://people.apache.org/~fhanik/dslink.patch
   +1: fhanik, funkman
   -1:
-   0: kkolinko (have not tested it with TC6 yet)
-  Additional patch:
-  http://svn.apache.org/viewvc?rev=1056569&view=rev
-  +1: kkolinko
-  -1:
 
 * Additional patch for bug 50413:
   Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1057482 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

[kkolinko]

Author: kkolinko
Date: Tue Jan 11 03:49:07 2011
New Revision: 1057482

URL: http://svn.apache.org/viewvc?rev=1057482&view=rev
Log:
Followup to r1050117
Use StringBuilder to concatenate strings

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1057482&r1=1057481&r2=1057482&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Tue Jan 11 
03:49:07 2011
@@ -306,8 +306,9 @@ class Generator {
 private String createTagHandlerPoolName(String prefix,
 String shortName, Attributes attrs, Node.Nodes namedAttrs,
 boolean hasEmptyBody) {
-StringBuilder poolName = new StringBuilder("_jspx_tagPool_" +
-prefix + "_" + shortName);
+StringBuilder poolName = new StringBuilder(64);
+poolName.append("_jspx_tagPool_").append(prefix).append('_')
+.append(shortName);
 
 if (attrs != null) {
 String[] attrNames =
@@ -324,7 +325,7 @@ class Generator {
 poolName.append('&');
 }
 for (int i = 0; i < attrNames.length; i++) {
-poolName.append("_");
+poolName.append('_');
 poolName.append(attrNames[i]);
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1044708 - /tomcat/trunk/java/javax/el/CompositeELResolver.java

[Konstantin Kolinko]

2010/12/11  :
> Author: markt
> Date: Sat Dec 11 20:36:29 2010
> New Revision: 1044708
>
> URL: http://svn.apache.org/viewvc?rev=1044708&view=rev
> Log:
> javax.el should not depend on javax.servlet.jsp.el
>
> Modified:
>    tomcat/trunk/java/javax/el/CompositeELResolver.java
>
> Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1044708&r1=1044707&r2=1044708&view=diff
> ==
> --- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
> +++ tomcat/trunk/java/javax/el/CompositeELResolver.java Sat Dec 11 20:36:29 
> 2010
> @@ -21,8 +21,6 @@ import java.beans.FeatureDescriptor;
>  import java.util.Iterator;
>  import java.util.NoSuchElementException;
>
> -import javax.servlet.jsp.el.ScopedAttributeELResolver;
> -
>  public class CompositeELResolver extends ELResolver {
>
>     private int size;
> @@ -120,8 +118,10 @@ public class CompositeELResolver extends
>         for (int i = 0; i < sz; i++) {
>             type = this.resolvers[i].getType(context, base, property);
>             if (context.isPropertyResolved()) {
> -                if (resolvers[i] instanceof ScopedAttributeELResolver) {
> +                if (resolvers[i].getClass().getName().equals(
> +                        "javax.servlet.jsp.el.ScopedAttributeELResolver")) {
>                     // Special case since this will always return Object.class
> +                    // for type
>                     Object value =
>                         resolvers[i].getValue(context, base, property);
>                     if (value != null) {

The instanceof in the old code works for any class that extends
ScopedAttributeELResolver. The new code does not.



Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1057275 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/config/

[Konstantin Kolinko]

2011/1/10  :
> Author: markt
> Date: Mon Jan 10 16:48:25 2011
> New Revision: 1057275
>
> URL: http://svn.apache.org/viewvc?rev=1057275&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50205
> Add deployIgnore to Host
> Based on a patch by Jim Riggs
>
> Modified:
>    tomcat/trunk/java/org/apache/catalina/Host.java
>    tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
>    tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
>    tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
>    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
>    tomcat/trunk/webapps/docs/config/host.xml
>

(..skipped)
Looking at HostConfig#filterAppPaths()

>     /**
> +     * Filter the list of application file paths to remove those that match
> +     * the regular expression defined by {...@link Host#getDeployIgnore()}.
> +     *
> +     * @param unfilteredAppPaths    The list of application paths to filtert
> +     *
> +     * @return  The filtered list of application paths
> +     */
> +    protected String[] filterAppPaths(String[] unfilteredAppPaths) {
> +        if (host.getDeployIgnore() == null) {
> +            return unfilteredAppPaths;
> +        }
> +
> +        Pattern filter = Pattern.compile(host.getDeployIgnore());

1) It would be better to store the value as Pattern inside the Host
and implement Host.getDeployIgnorePattern() method that will return
Pattern.  This way a syntax error can be detected at assignment time.
2) null string and "" string should be treated equally


> +
> +        List filteredList = new ArrayList();
> +        for (String appPath : unfilteredAppPaths) {
> +            if (filter.matcher(appPath).matches()) {
> +                log.debug(sm.getString("hostConfig.ignorePath", appPath));

Wrap with log.isDebugEnabled()

> +            } else {
> +                filteredList.add(appPath);
> +            }
> +        }
> +        return filteredList.toArray(new String[filteredList.size()]);
> +    }

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org