jbossweb-commits September 2007

jbossweb-commits@lists.jboss.org

1 participants
33 discussions

JBossWeb SVN: r256 - trunk/java/org/apache/catalina/startup.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-09-03 10:04:04 -0400 (Mon, 03 Sep 2007) New Revision: 256 Modified: trunk/java/org/apache/catalina/startup/TldConfig.java Log: - JBoss vfsfile is directly accessible, so the old JBoss Web 2.0 way of doing things is best. Modified: trunk/java/org/apache/catalina/startup/TldConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/TldConfig.java 2007-09-03 13:52:04 UTC (rev 255) +++ trunk/java/org/apache/catalina/startup/TldConfig.java 2007-09-03 14:04:04 UTC (rev 256) @@ -693,12 +693,9 @@ File file = null; try { file = new File(urls[i].toURI()); - } catch (IllegalArgumentException e) { - // Ignore, not a file URL - log.debug("Not a file URL: " + urls[i]); - continue; - } catch (URISyntaxException e) { - // Ignore, probably an unencoded char + } catch (Exception e) { + // Ignore, probably an unencoded char or non file URL, + // attempt direct access file = new File(urls[i].getFile()); } try {

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r255 - trunk/java/org/apache/catalina/core.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-09-03 09:52:04 -0400 (Mon, 03 Sep 2007) New Revision: 255 Modified: trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Log: - Add custom instance manager to the servlet context. - Missing findConnectors call. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2007-09-03 13:25:51 UTC (rev 254) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2007-09-03 13:52:04 UTC (rev 255) @@ -4334,6 +4334,8 @@ instanceManager = new DefaultInstanceManager (context, injectionMap, this, this.getClass().getClassLoader()); getServletContext().setAttribute(InstanceManager.class.getName(), instanceManager); + } else { + getServletContext().setAttribute(InstanceManager.class.getName(), instanceManager); } } Modified: trunk/java/org/apache/catalina/core/mbeans-descriptors.xml =================================================================== --- trunk/java/org/apache/catalina/core/mbeans-descriptors.xml 2007-09-03 13:25:51 UTC (rev 254) +++ trunk/java/org/apache/catalina/core/mbeans-descriptors.xml 2007-09-03 13:52:04 UTC (rev 255) @@ -594,6 +594,12 @@ type="org.apache.catalina.connector.Connector"/> </operation> + <operation name="findConnectors" + description="Return the connectors associated with this wrapper" + impact="INFO" + returnType="[Lorg.apache.catalina.connector.Connector;"> + </operation> + <operation name="start" description="Start" impact="ACTION" returnType="void" /> <operation name="stop" description="Stop" impact="ACTION" returnType="void" /> </mbean>

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r254 - trunk/java/org/apache/catalina/startup.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-09-03 09:25:51 -0400 (Mon, 03 Sep 2007) New Revision: 254 Modified: trunk/java/org/apache/catalina/startup/TldConfig.java Log: - JBoss passes non file URL here, so the finer exception type doesn't work well. Modified: trunk/java/org/apache/catalina/startup/TldConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/TldConfig.java 2007-08-31 17:44:44 UTC (rev 253) +++ trunk/java/org/apache/catalina/startup/TldConfig.java 2007-09-03 13:25:51 UTC (rev 254) @@ -693,6 +693,10 @@ File file = null; try { file = new File(urls[i].toURI()); + } catch (IllegalArgumentException e) { + // Ignore, not a file URL + log.debug("Not a file URL: " + urls[i]); + continue; } catch (URISyntaxException e) { // Ignore, probably an unencoded char file = new File(urls[i].getFile());

16 years, 8 months

1
0
0 / 0

← Newer
1
2
3
4
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits September 2007