svn commit: r1454828 - /tomcat/trunk/build.xml
Author: rjung
Date: Sun Mar 10 10:57:45 2013
New Revision: 1454828
URL: http://svn.apache.org/r1454828
Log:
Fix external javadoc URL for commons-io.
- Add correct "proper/commons-io" prefix to no
longer rely on legacy link redirects
- Add new needed path segment "/javadocs/"
See:
https://issues.apache.org/jira/browse/IO-369
http://svn.apache.org/r1451593
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1454828&r1=1454827&r2=1454828&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Mar 10 10:57:45 2013
@@ -1745,7 +1745,7 @@ Apache Tomcat ${version} native binaries
http://docs.oracle.com/javase/6/docs/api/"/>
- http://commons.apache.org/io/api-release/"/>
+ http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
http://docs.oracle.com/javaee/6/api/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454830 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: rjung
Date: Sun Mar 10 10:59:08 2013
New Revision: 1454830
URL: http://svn.apache.org/r1454830
Log:
Fix external javadoc URL for commons-io.
- Add correct "proper/commons-io" prefix to no
longer rely on legacy link redirects
- Add new needed path segment "/javadocs/"
See:
https://issues.apache.org/jira/browse/IO-369
http://svn.apache.org/r1451593
Backport of r1454828 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1454828
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1454830&r1=1454829&r2=1454830&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun Mar 10 10:59:08 2013
@@ -1662,7 +1662,7 @@ Apache Tomcat ${version} native binaries
http://docs.oracle.com/javase/6/docs/api/"/>
- http://commons.apache.org/io/api-release/"/>
+ http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
http://docs.oracle.com/javaee/6/api/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454831 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
Author: rjung
Date: Sun Mar 10 11:08:02 2013
New Revision: 1454831
URL: http://svn.apache.org/r1454831
Log:
Fix javadoc.
Remove spurious leftover from r1452791.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1454831&r1=1454830&r2=1454831&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Sun Mar
10 11:08:02 2013
@@ -60,7 +60,6 @@ public final class UEncoder {
/** URL Encode string, using a specified encoding.
*
-* @param buf The writer
* @param s string to be encoded
* @throws IOException If an I/O error occurs
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454832 - /tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Author: rjung
Date: Sun Mar 10 11:20:53 2013
New Revision: 1454832
URL: http://svn.apache.org/r1454832
Log:
Add info about failing charset to unit test.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java?rev=1454832&r1=1454831&r2=1454832&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java Sun Mar
10 11:20:53 2013
@@ -68,6 +68,7 @@ public class TestB2CConverter {
@Test
public void testLeftoverSize() {
float maxLeftover = 0;
+String charsetName = "UNSET";
for (Charset charset : Charset.availableCharsets().values()) {
float leftover;
if (charset.name().toLowerCase().startsWith("x-")) {
@@ -83,9 +84,11 @@ public class TestB2CConverter {
}
if (leftover > maxLeftover) {
maxLeftover = leftover;
+charsetName = charset.name();
}
}
-Assert.assertTrue("Limit needs to be at least " + maxLeftover,
+Assert.assertTrue("Limit needs to be at least " + maxLeftover +
+" (used in charset '" + charsetName + "')",
maxLeftover <= B2CConverter.LEFTOVER_SIZE);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454835 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/buf/TestB2CConverter.java
Author: rjung
Date: Sun Mar 10 11:23:16 2013
New Revision: 1454835
URL: http://svn.apache.org/r1454835
Log:
Add info about failing charset to unit test.
Backport of r1454832 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1454832
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java?rev=1454835&r1=1454834&r2=1454835&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Sun Mar 10 11:23:16 2013
@@ -68,6 +68,7 @@ public class TestB2CConverter {
@Test
public void testLeftoverSize() {
float maxLeftover = 0;
+String charsetName = "UNSET";
for (Charset charset : Charset.availableCharsets().values()) {
float leftover;
if (charset.name().toLowerCase().startsWith("x-")) {
@@ -83,9 +84,11 @@ public class TestB2CConverter {
}
if (leftover > maxLeftover) {
maxLeftover = leftover;
+charsetName = charset.name();
}
}
-Assert.assertTrue("Limit needs to be at least " + maxLeftover,
+Assert.assertTrue("Limit needs to be at least " + maxLeftover +
+" (used in charset '" + charsetName + "')",
maxLeftover <= B2CConverter.LEFTOVER_SIZE);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454837 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Author: rjung
Date: Sun Mar 10 11:28:42 2013
New Revision: 1454837
URL: http://svn.apache.org/r1454837
Log:
Fix unit test failing only for TC 7 (Java 6)
by excluding the Java for-internal-use-only
charset 'COMPOUND_TEXT'.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java?rev=1454837&r1=1454836&r2=1454837&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Sun Mar 10 11:28:42 2013
@@ -76,6 +76,13 @@ public class TestB2CConverter {
// Likely something used internally by the JRE
continue;
}
+if (charset.name().equals("COMPOUND_TEXT")) {
+// Java for-internal-use-only charset
+// See:
+// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6392670
+// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6381697
+continue;
+}
try {
leftover = charset.newEncoder().maxBytesPerChar();
} catch (UnsupportedOperationException uoe) {
-
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.38
On 09.03.2013 14:45, Rainer Jung wrote:
> - some Javadoc warnings
...
> - new ones:
> - java/org/apache/tomcat/util/buf/UEncoder.java:67: warning -
> @param argument "buf" is not a parameter name.
Fixed in r1454831 (@param removed).
> - two in package java/org/apache/tomcat/util/http/fileupload/disk/,
> which are probably due to "javadoc: warning - Error fetching URL:
> http://commons.apache.org/io/api-release/package-list";. Indeed
> that URL responds with a redirect and then a "Not Found".
Fixed in r1454828 and r1454830 (URL update).
> - Unit tests
> - one error in TestB2CConverter due to an unexpected internal
> charset "COMPOUND_TEXT" which we should exclude from the test.
> All other charsets pass the test.
Fixed in r1454837 ("COMPOUND_TEXT" excluded, comment added).
> - one new SEVERE message 144 times with exception stack in Echo
> servlet when running TestInputBuffer, details below.
> It would be nice to get rid of that one.
...
> "SEVERE: Servlet.service() for servlet [Echo] in context with path []
> threw exception"
>
> It happens in org.apache.catalina.connector.TestInputBuffer for all
> connectors and the exception is
>
> [junit] java.nio.charset.MalformedInputException: Input length = 1
> [junit] at
> java.nio.charset.CoderResult.throwException(CoderResult.java:260)
> ...
>
> which wasn't there in the previous release.
I verified that all of those belong to utf8 test cases which are marked
as expecting an internal server error. So probably there's no way around
those exception outputs during the test run.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454839 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Author: markt
Date: Sun Mar 10 11:55:41 2013
New Revision: 1454839
URL: http://svn.apache.org/r1454839
Log:
Fix failing unit tests
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1454839&r1=1454838&r2=1454839&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Sun Mar 10 11:55:41 2013
@@ -212,14 +212,19 @@ public class WsServerContainer extends W
pojo.getAnnotation(ServerEndpoint.class);
PojoMethodMapping methodMapping = pojoMethodMap.get(pojo);
if (methodMapping != null) {
-Configurator configurator;
-try {
-configurator = annotation.configurator().newInstance();
-} catch (InstantiationException | IllegalAccessException e) {
-throw new IllegalStateException(sm.getString(
-"serverContainer.configuratorFail",
-annotation.configurator().getName(),
-pojo.getClass().getName()), e);
+Class configuratorClazz =
+annotation.configurator();
+Configurator configurator = null;
+if (!configuratorClazz.equals(Configurator.class)) {
+try {
+configurator = annotation.configurator().newInstance();
+} catch (InstantiationException |
+IllegalAccessException e) {
+throw new IllegalStateException(sm.getString(
+"serverContainer.configuratorFail",
+annotation.configurator().getName(),
+pojo.getClass().getName()), e);
+}
}
sec = ServerEndpointConfig.Builder.create(
pojo, methodMapping.getWsPath()).
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54659] Echo Websocket Sample using Annotation API throws IllegalStateException
https://issues.apache.org/bugzilla/show_bug.cgi?id=54659 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Mark Thomas --- There were some failing unit tests that had the same root cause. Fixing the unit tests (r1454839) also fixed this. The current default is correct so it needs special handling. -- 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
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1099 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1454837 Blamelist: rjung Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/4056 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1454839 Blamelist: markt,rjung Build succeeded! sincerely, -The Buildbot
svn commit: r1454953 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties StandardContext.java
Author: markt
Date: Sun Mar 10 23:15:01 2013
New Revision: 1454953
URL: http://svn.apache.org/r1454953
Log:
Log message on SCI error
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1454953&r1=1454952&r2=1454953&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Sun Mar
10 23:15:01 2013
@@ -126,6 +126,7 @@ standardContext.predestroy.required=Both
standardContext.reloadingCompleted=Reloading Context with name [{0}] is
completed
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.resourcesStart=Error starting static Resources
+standardContext.sciFail=Error during ServletContainerInitializer processing
standardContext.securityConstraint.mixHttpMethod=It is not permitted to mix
and in the same web resource collection
standardContext.securityConstraint.pattern=Invalid {0} in
security constraint
standardContext.servletMap.name=Servlet mapping specifies an unknown servlet
name {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1454953&r1=1454952&r2=1454953&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sun Mar 10
23:15:01 2013
@@ -5199,7 +5199,7 @@ public class StandardContext extends Con
entry.getKey().onStartup(entry.getValue(),
getServletContext());
} catch (ServletException e) {
-// TODO: Log error
+log.error(sm.getString("standardContext.sciFail"), e);
ok = false;
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454957 - in /tomcat/trunk/res/META-INF/tomcat-websocket.jar/services: javax.websocket.server.ServerEndpointConfig.Configurator javax.websocket.server.ServerEndpointConfigurator
Author: markt Date: Sun Mar 10 23:28:48 2013 New Revision: 1454957 URL: http://svn.apache.org/r1454957 Log: Update file name for ServiceLoader Added: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig.Configurator - copied unchanged from r1454945, tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfigurator Removed: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfigurator - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454958 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 10 23:31:03 2013
New Revision: 1454958
URL: http://svn.apache.org/r1454958
Log:
Log message on SCI error
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1454953
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1454958&r1=1454957&r2=1454958&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Sun Mar 10 23:31:03 2013
@@ -153,6 +153,7 @@ standardContext.reloadingCompleted=Reloa
standardContext.reloadingFailed=Reloading this Context failed due to previous
errors
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.resourcesStart=Error starting static Resources
+standardContext.sciFail=Error during ServletContainerInitializer processing
standardContext.securityConstraint.mixHttpMethod=It is not permitted to mix
and in the same web resource collection
standardContext.securityConstraint.pattern=Invalid {0} in
security constraint
standardContext.servletMap.name=Servlet mapping specifies an unknown servlet
name {0}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1454958&r1=1454957&r2=1454958&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun
Mar 10 23:31:03 2013
@@ -5370,7 +5370,7 @@ public class StandardContext extends Con
entry.getKey().onStartup(entry.getValue(),
getServletContext());
} catch (ServletException e) {
-// TODO: Log error
+log.error(sm.getString("standardContext.sciFail"), e);
ok = false;
break;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1454958&r1=1454957&r2=1454958&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Mar 10 23:31:03 2013
@@ -54,6 +54,16 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+
+
+
+
+Ensure a log message is generated when a web application fails to start
+due to an error processing a ServletContainerInitializer. (markt)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454962 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
Author: markt
Date: Sun Mar 10 23:53:52 2013
New Revision: 1454962
URL: http://svn.apache.org/r1454962
Log:
Prevent errors if Jar scanning is a too keen
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1454962&r1=1454961&r2=1454962&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Sun Mar 10
23:53:52 2013
@@ -23,6 +23,7 @@ import javax.servlet.ServletContainerIni
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HandlesTypes;
+import javax.websocket.ContainerProvider;
import javax.websocket.DeploymentException;
import javax.websocket.Endpoint;
import javax.websocket.server.ServerApplicationConfig;
@@ -56,6 +57,11 @@ public class WsSci implements ServletCon
try {
for (Class clazz : clazzes) {
+// Protect against scanning the WebSocket API JARs
+if (clazz.getPackage().getName().startsWith(
+ContainerProvider.class.getPackage().getName())) {
+continue;
+}
if (ServerApplicationConfig.class.isAssignableFrom(clazz)) {
serverApplicationConfigs.add(
(ServerApplicationConfig) clazz.newInstance());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1454965 - in /tomcat/trunk/res/maven: mvn-pub.xml tomcat-websocket-api.pom tomcat-websocket.pom
Author: markt Date: Mon Mar 11 00:11:10 2013 New Revision: 1454965 URL: http://svn.apache.org/r1454965 Log: Add the websocket JARa to the Maven publishing process Added: tomcat/trunk/res/maven/tomcat-websocket-api.pom (with props) tomcat/trunk/res/maven/tomcat-websocket.pom (with props) Modified: tomcat/trunk/res/maven/mvn-pub.xml Modified: tomcat/trunk/res/maven/mvn-pub.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1454965&r1=1454964&r2=1454965&view=diff == --- tomcat/trunk/res/maven/mvn-pub.xml (original) +++ tomcat/trunk/res/maven/mvn-pub.xml Mon Mar 11 00:11:10 2013 @@ -312,6 +312,8 @@ + + Added: tomcat/trunk/res/maven/tomcat-websocket-api.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-websocket-api.pom?rev=1454965&view=auto == --- tomcat/trunk/res/maven/tomcat-websocket-api.pom (added) +++ tomcat/trunk/res/maven/tomcat-websocket-api.pom Mon Mar 11 00:11:10 2013 @@ -0,0 +1,32 @@ + + + + 4.0.0 + org.apache.tomcat + tomcat-websocket-api + @MAVEN.DEPLOY.VERSION@ + WebSocket (JSR356) API + http://tomcat.apache.org/ + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + Propchange: tomcat/trunk/res/maven/tomcat-websocket-api.pom -- svn:eol-style = native Added: tomcat/trunk/res/maven/tomcat-websocket.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-websocket.pom?rev=1454965&view=auto == --- tomcat/trunk/res/maven/tomcat-websocket.pom (added) +++ tomcat/trunk/res/maven/tomcat-websocket.pom Mon Mar 11 00:11:10 2013 @@ -0,0 +1,52 @@ + + + + 4.0.0 + org.apache.tomcat + tomcat-websocket + @MAVEN.DEPLOY.VERSION@ + Tomcat WebSocket (JSR356) implementation + http://tomcat.apache.org/ + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + org.apache.tomcat + tomcat-websocket-api + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat + tomcat-juli + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat + tomcat-util + @MAVEN.DEPLOY.VERSION@ + compile + + + Propchange: tomcat/trunk/res/maven/tomcat-websocket.pom -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54663] New: JSP Comment processing in jsp:include
https://issues.apache.org/bugzilla/show_bug.cgi?id=54663
Bug ID: 54663
Summary: JSP Comment processing in jsp:include
Product: Tomcat 7
Version: trunk
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: bluewolf.ch...@gmail.com
Classification: Unclassified
<%@ page contentType="text/html;charset=utf-8" %>
<%-- --%>
I tried to find any spec. statements about comment usages within standard
action tags but I couldn't.
So I think the usage of comment like above is tolerable but compilation is
always failed.
org.apache.jasper.JasperException: /test.jsp (line: 5, column: 4) Expecting
"jsp:param" standard action with "name" and "value" attributes
at
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:42)
at
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:408)
at
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:89)
at org.apache.jasper.compiler.Parser.parseParam(Parser.java:825)
at org.apache.jasper.compiler.Parser.parseBody(Parser.java:1674)
at org.apache.jasper.compiler.Parser.parseOptionalBody(Parser.java:1002)
at org.apache.jasper.compiler.Parser.parseInclude(Parser.java:854)
at org.apache.jasper.compiler.Parser.parseStandardAction(Parser.java:1116)
at org.apache.jasper.compiler.Parser.parseElements(Parser.java:1453)
at org.apache.jasper.compiler.Parser.parse(Parser.java:138)
at
org.apache.jasper.compiler.ParserController.doParse(ParserController.java:256)
at
org.apache.jasper.compiler.ParserController.parse(ParserController.java:103)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:199)
.
I suggest the code like below:
package org.apache.jasper.compiler;
class Parser implements TagConstants {
private void parseBody(Node parent, String tag, String bodyType)
throws JasperException {
...
while (reader.hasMoreInput()) {
...
} else if (bodyType == JAVAX_BODY_CONTENT_PARAM) {
if (reader.matches("<%--")) {
parseComment(parent);
reader.skipSpaces();
continue;
}
// (note the == since we won't recognize JAVAX_*
// from outside this module).
reader.skipSpaces();
parseParam(parent);
} else if (bodyType == JAVAX_BODY_CONTENT_TEMPLATE_TEXT) {
--
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
[Bug 54663] JSP Comment processing in jsp:include
https://issues.apache.org/bugzilla/show_bug.cgi?id=54663
--- Comment #1 from Eugene Chung (TmaxSoft) ---
Sorry, my first suggestion was wrong.
} else if (bodyType == JAVAX_BODY_CONTENT_PARAM) {
// (note the == since we won't recognize JAVAX_*
// from outside this module).
reader.skipSpaces();
if (reader.matches("<%--")) {
parseComment(parent);
reader.skipSpaces();
continue;
}
parseParam(parent);
}
...
--
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
