[Bug 62366] New: Enable use of tomcat 9 for precompiling jsp files (jspc-compiler-tomcat8)
https://bz.apache.org/bugzilla/show_bug.cgi?id=62366
Bug ID: 62366
Summary: Enable use of tomcat 9 for precompiling jsp files
(jspc-compiler-tomcat8)
Product: Tomcat 9
Version: 9.0.8
Hardware: All
OS: All
Status: NEW
Severity: enhancement
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: pavelcibu...@gmail.com
Target Milestone: -
In 45931 function setTrimSpaces(boolean trimSpaces) has been replaced with
setTrimSpaces(TrimSpacesOption trimSpaces). This breaks org.jasig.mojo.jspc
jspc-compiler-tomcat8 maven plugin. This plugin is used for precompiling jsp
files. It would be nice, if this plugin would work with Tomcat 9.
It can be fixed be returning this function:
public void setTrimSpaces(boolean trimSpaces) {
if (trimSpaces) {
setTrimSpaces(TrimSpacesOption.TRUE);
} else {
setTrimSpaces(TrimSpacesOption.FALSE);
}
}
--
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 62366] Enable use of tomcat 9 for precompiling jsp files (jspc-compiler-tomcat8)
https://bz.apache.org/bugzilla/show_bug.cgi?id=62366 --- Comment #1 from Pavel Cibulka --- Function should be in org.apache.jasper.JspC. -- 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: r1831333 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ test/org/apache/naming/ test/webapp-fragments/ test/webapp-fragments/WEB-INF/ webapps/docs/
Author: markt
Date: Thu May 10 12:46:44 2018
New Revision: 1831333
URL: http://svn.apache.org/viewvc?rev=1831333&view=rev
Log:
Partial fix for BZ 50019
Add lookup-name support to env-entry
Added:
tomcat/trunk/test/org/apache/naming/TestEnvEntry.java (with props)
tomcat/trunk/test/org/apache/naming/TesterEnvEntry.java (with props)
tomcat/trunk/test/org/apache/naming/TesterInjectionServlet.java (with
props)
tomcat/trunk/test/webapp-fragments/jndi.jsp (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/trunk/test/webapp-fragments/WEB-INF/web.xml
tomcat/trunk/webapps/docs/changelog.xml
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=1831333&r1=1831332&r2=1831333&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu May
10 12:46:44 2018
@@ -105,6 +105,9 @@ jreLeakListener.xmlParseFail=Error whils
jreLeakListener.authPolicyFail=Error whilst attempting to prevent memory leak
in javax.security.auth.Policy class
jreLeakListener.ldapPoolManagerFail=Failed to trigger creation of the
com.sun.jndi.ldap.LdapPoolManager class during Tomcat start to prevent possible
memory leaks. This is expected on non-Sun JVMs.
jreLeakListener.classToInitializeFail=Failed to load class [{0}] during Tomcat
start to prevent possible memory leaks.
+
+naming.addEnvEntry=Adding environment entry [{0}]
+naming.addResourceEnvRef=Adding resource env ref [{0}]
naming.wsdlFailed=Failed to find wsdl file: [{0}]
naming.bindFailed=Failed to bind object: [{0}]
naming.jmxRegistrationFailed=Failed to register in JMX: [{0}]
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1831333&r1=1831332&r2=1831333&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu
May 10 12:46:44 2018
@@ -53,6 +53,7 @@ import org.apache.naming.ContextAccessCo
import org.apache.naming.ContextBindings;
import org.apache.naming.EjbRef;
import org.apache.naming.HandlerRef;
+import org.apache.naming.LookupRef;
import org.apache.naming.NamingContext;
import org.apache.naming.ResourceEnvRef;
import org.apache.naming.ResourceLinkRef;
@@ -69,6 +70,7 @@ import org.apache.tomcat.util.descriptor
import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
import org.apache.tomcat.util.descriptor.web.ContextService;
import org.apache.tomcat.util.descriptor.web.ContextTransaction;
+import org.apache.tomcat.util.descriptor.web.ResourceBase;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -680,86 +682,89 @@ public class NamingContextListener
*/
public void addEnvironment(ContextEnvironment env) {
-Object value = null;
-// Instantiating a new instance of the correct object type, and
-// initializing it.
-String type = env.getType();
-try {
-if (type.equals("java.lang.String")) {
-value = env.getValue();
-} else if (type.equals("java.lang.Byte")) {
-if (env.getValue() == null) {
-value = Byte.valueOf((byte) 0);
-} else {
-value = Byte.decode(env.getValue());
-}
-} else if (type.equals("java.lang.Short")) {
-if (env.getValue() == null) {
-value = Short.valueOf((short) 0);
-} else {
-value = Short.decode(env.getValue());
-}
-} else if (type.equals("java.lang.Integer")) {
-if (env.getValue() == null) {
-value = Integer.valueOf(0);
-} else {
-value = Integer.decode(env.getValue());
-}
-} else if (type.equals("java.lang.Long")) {
-if (env.getValue() == null) {
-value = Long.valueOf(0);
-} else {
-value = Long.decode(env.getValue());
-}
-} else if (type.equals("java.lang.Boolean")) {
-value = Boolean.valueOf(env.getValue());
-} else if (type.equals("java.la
svn commit: r1831338 - in /tomcat/trunk: java/org/apache/catalina/core/NamingContextListener.java java/org/apache/catalina/deploy/LocalStrings.properties java/org/apache/catalina/deploy/NamingResource
Author: markt
Date: Thu May 10 13:16:20 2018
New Revision: 1831338
URL: http://svn.apache.org/viewvc?rev=1831338&view=rev
Log:
Expand lookup-name implementation to ejb-ref, resource-ref, and resource-env-ref
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1831338&r1=1831337&r2=1831338&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu
May 10 13:16:20 2018
@@ -654,24 +654,27 @@ public class NamingContextListener
*/
public void addEjb(ContextEjb ejb) {
-// Create a reference to the EJB.
-Reference ref = new EjbRef
-(ejb.getType(), ejb.getHome(), ejb.getRemote(), ejb.getLink());
-// Adding the additional parameters, if any
-Iterator params = ejb.listProperties();
-while (params.hasNext()) {
-String paramName = params.next();
-String paramValue = (String) ejb.getProperty(paramName);
-StringRefAddr refAddr = new StringRefAddr(paramName, paramValue);
-ref.add(refAddr);
+Reference ref = lookForLookupRef(ejb);
+
+if (ref == null) {
+// Create a reference to the EJB.
+ref = new EjbRef(ejb.getType(), ejb.getHome(), ejb.getRemote(),
ejb.getLink());
+// Adding the additional parameters, if any
+Iterator params = ejb.listProperties();
+while (params.hasNext()) {
+String paramName = params.next();
+String paramValue = (String) ejb.getProperty(paramName);
+StringRefAddr refAddr = new StringRefAddr(paramName,
paramValue);
+ref.add(refAddr);
+}
}
+
try {
createSubcontexts(envCtx, ejb.getName());
envCtx.bind(ejb.getName(), ref);
} catch (NamingException e) {
log.error(sm.getString("naming.bindFailed", e));
}
-
}
@@ -944,23 +947,25 @@ public class NamingContextListener
*/
public void addResource(ContextResource resource) {
-// Create a reference to the resource.
-Reference ref = new ResourceRef
-(resource.getType(), resource.getDescription(),
- resource.getScope(), resource.getAuth(),
- resource.getSingleton());
-// Adding the additional parameters, if any
-Iterator params = resource.listProperties();
-while (params.hasNext()) {
-String paramName = params.next();
-String paramValue = (String) resource.getProperty(paramName);
-StringRefAddr refAddr = new StringRefAddr(paramName, paramValue);
-ref.add(refAddr);
+Reference ref = lookForLookupRef(resource);
+
+if (ref == null) {
+// Create a reference to the resource.
+ref = new ResourceRef(resource.getType(),
resource.getDescription(),
+resource.getScope(), resource.getAuth(),
resource.getSingleton());
+// Adding the additional parameters, if any
+Iterator params = resource.listProperties();
+while (params.hasNext()) {
+String paramName = params.next();
+String paramValue = (String) resource.getProperty(paramName);
+StringRefAddr refAddr = new StringRefAddr(paramName,
paramValue);
+ref.add(refAddr);
+}
}
+
try {
if (log.isDebugEnabled()) {
-log.debug(" Adding resource ref "
- + resource.getName() + " " + ref);
+log.debug(" Adding resource ref " + resource.getName() + " "
+ ref);
}
createSubcontexts(envCtx, resource.getName());
envCtx.bind(resource.getName(), ref);
@@ -991,15 +996,19 @@ public class NamingContextListener
*/
public void addResourceEnvRef(ContextResourceEnvRef resourceEnvRef) {
-// Create a reference to the resource env.
-Reference ref = new ResourceEnvRef(resourceEnvRef.getType());
-// Adding the additional parameters, if any
-Iterator params = resourceEnvRef.listProperties();
-while (params.hasNext()) {
-String paramName = params.next();
-String paramValue = (String) resourceEnvRef.getProperty(paramName);
-StringRefAddr refAddr = new StringRefAddr(paramName, paramValue);
-
svn commit: r1831341 - /tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
Author: markt
Date: Thu May 10 13:42:58 2018
New Revision: 1831341
URL: http://svn.apache.org/viewvc?rev=1831341&view=rev
Log:
Clean-up
Align implementation for ejb-local-ref and message-destination-ref as neither
are added to the JNDI context
Improve Javadoc
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1831341&r1=1831340&r2=1831341&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu
May 10 13:42:58 2018
@@ -70,6 +70,7 @@ import org.apache.tomcat.util.descriptor
import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
import org.apache.tomcat.util.descriptor.web.ContextService;
import org.apache.tomcat.util.descriptor.web.ContextTransaction;
+import org.apache.tomcat.util.descriptor.web.MessageDestinationRef;
import org.apache.tomcat.util.descriptor.web.ResourceBase;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -444,6 +445,19 @@ public class NamingContextListener
addLocalEjb(ejb);
}
}
+} else if (name.equals("messageDestinationRef")) {
+if (oldValue != null) {
+MessageDestinationRef mdr = (MessageDestinationRef) oldValue;
+if (mdr.getName() != null) {
+removeMessageDestinationRef(mdr.getName());
+}
+}
+if (newValue != null) {
+MessageDestinationRef mdr = (MessageDestinationRef) newValue;
+if (mdr.getName() != null) {
+addMessageDestinationRef(mdr);
+}
+}
} else if (name.equals("resource")) {
if (oldValue != null) {
ContextResource resource = (ContextResource) oldValue;
@@ -561,6 +575,12 @@ public class NamingContextListener
addEjb(ejbs[i]);
}
+// Message Destination References
+MessageDestinationRef[] mdrs =
namingResources.findMessageDestinationRefs();
+for (i = 0; i < mdrs.length; i++) {
+addMessageDestinationRef(mdrs[i]);
+}
+
// WebServices references
ContextService[] services = namingResources.findServices();
for (i = 0; i < services.length; i++) {
@@ -801,10 +821,24 @@ public class NamingContextListener
/**
* Set the specified local EJBs in the naming context.
*
- * @param localEjb the EJB descriptor (unused)
+ * @param localEjb the local EJB descriptor (unused)
*/
public void addLocalEjb(ContextLocalEjb localEjb) {
// NO-OP
+// No factory in org.apache.naming.factory
+// No reference in org.apache.naming
+}
+
+
+/**
+ * Set the specified message destination refs in the naming context.
+ *
+ * @param mdr the message destination ref descriptor (unused)
+ */
+public void addMessageDestinationRef(MessageDestinationRef mdr) {
+// NO-OP
+// No factory in org.apache.naming.factory
+// No reference in org.apache.naming
}
@@ -825,18 +859,16 @@ public class NamingContextListener
}
if (wsdlURL == null) {
try {
-wsdlURL = ((Context) container).
-getServletContext().
-
getResource(service.getWsdlfile());
+wsdlURL = ((Context)
container).getServletContext().getResource(
+service.getWsdlfile());
} catch (MalformedURLException e) {
// Ignore and carry on
}
}
if (wsdlURL == null) {
try {
-wsdlURL = ((Context) container).
-getServletContext().
-getResource("/" +
service.getWsdlfile());
+wsdlURL = ((Context)
container).getServletContext().getResource(
+"/" + service.getWsdlfile());
log.debug(" Changing service ref wsdl file for /"
+ service.getWsdlfile());
} catch (MalformedURLException e) {
@@ -859,18 +891,16 @@ public class NamingContextListener
}
if (jaxrpcURL == null) {
try {
-jaxrpcURL = ((Context) container).
-getServletContext().
-
svn commit: r1831342 - in /tomcat/trunk: java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml
Author: markt
Date: Thu May 10 13:55:39 2018
New Revision: 1831342
URL: http://svn.apache.org/viewvc?rev=1831342&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=50019
Complete the fix
lookup-name support added to all support JNDI references
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1831342&r1=1831341&r2=1831342&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Thu
May 10 13:55:39 2018
@@ -849,123 +849,128 @@ public class NamingContextListener
*/
public void addService(ContextService service) {
-if (service.getWsdlfile() != null) {
-URL wsdlURL = null;
+Reference ref = lookForLookupRef(service);
+
+if (ref == null) {
+
+if (service.getWsdlfile() != null) {
+URL wsdlURL = null;
-try {
-wsdlURL = new URL(service.getWsdlfile());
-} catch (MalformedURLException e) {
-// Ignore and carry on
-}
-if (wsdlURL == null) {
try {
-wsdlURL = ((Context)
container).getServletContext().getResource(
-service.getWsdlfile());
+wsdlURL = new URL(service.getWsdlfile());
} catch (MalformedURLException e) {
// Ignore and carry on
}
-}
-if (wsdlURL == null) {
-try {
-wsdlURL = ((Context)
container).getServletContext().getResource(
-"/" + service.getWsdlfile());
-log.debug(" Changing service ref wsdl file for /"
-+ service.getWsdlfile());
-} catch (MalformedURLException e) {
-log.error(sm.getString("naming.wsdlFailed", e));
+if (wsdlURL == null) {
+try {
+wsdlURL = ((Context)
container).getServletContext().getResource(
+service.getWsdlfile());
+} catch (MalformedURLException e) {
+// Ignore and carry on
+}
+}
+if (wsdlURL == null) {
+try {
+wsdlURL = ((Context)
container).getServletContext().getResource(
+"/" + service.getWsdlfile());
+log.debug(" Changing service ref wsdl file for /"
++ service.getWsdlfile());
+} catch (MalformedURLException e) {
+log.error(sm.getString("naming.wsdlFailed", e));
+}
}
+if (wsdlURL == null)
+service.setWsdlfile(null);
+else
+service.setWsdlfile(wsdlURL.toString());
}
-if (wsdlURL == null)
-service.setWsdlfile(null);
-else
-service.setWsdlfile(wsdlURL.toString());
-}
-if (service.getJaxrpcmappingfile() != null) {
-URL jaxrpcURL = null;
+if (service.getJaxrpcmappingfile() != null) {
+URL jaxrpcURL = null;
-try {
-jaxrpcURL = new URL(service.getJaxrpcmappingfile());
-} catch (MalformedURLException e) {
-// Ignore and carry on
-}
-if (jaxrpcURL == null) {
try {
-jaxrpcURL = ((Context)
container).getServletContext().getResource(
-service.getJaxrpcmappingfile());
+jaxrpcURL = new URL(service.getJaxrpcmappingfile());
} catch (MalformedURLException e) {
// Ignore and carry on
}
-}
-if (jaxrpcURL == null) {
-try {
-jaxrpcURL = ((Context)
container).getServletContext().getResource(
-"/" + service.getJaxrpcmappingfile());
-log.debug(" Changing service ref jaxrpc file for /"
-+ service.getJaxrpcmappingfile());
-} catch (MalformedURLException e) {
-log.error(sm.getString("naming.wsdlFailed", e));
+if (jaxrpcURL == null) {
+try {
+jaxrpcURL = ((Context)
container).getServletContext().getResource(
+
svn commit: r1831345 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ test/org/apache/naming/ test/webapp-fragments/ test/webapp-fragments/WEB-INF/ webapp
Author: markt Date: Thu May 10 14:06:38 2018 New Revision: 1831345 URL: http://svn.apache.org/viewvc?rev=1831345&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=50019 Add support for . Based on a patch by Gurkan Erdogdu. Added: tomcat/tc8.5.x/trunk/test/org/apache/naming/TestEnvEntry.java - copied unchanged from r1831333, tomcat/trunk/test/org/apache/naming/TestEnvEntry.java tomcat/tc8.5.x/trunk/test/org/apache/naming/TesterEnvEntry.java - copied unchanged from r1831333, tomcat/trunk/test/org/apache/naming/TesterEnvEntry.java tomcat/tc8.5.x/trunk/test/org/apache/naming/TesterInjectionServlet.java - copied unchanged from r1831333, tomcat/trunk/test/org/apache/naming/TesterInjectionServlet.java tomcat/tc8.5.x/trunk/test/webapp-fragments/jndi.jsp - copied unchanged from r1831333, tomcat/trunk/test/webapp-fragments/jndi.jsp Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/NamingContextListener.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java tomcat/tc8.5.x/trunk/test/webapp-fragments/WEB-INF/web.xml tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 10 14:06:38 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,
[GitHub] tomcat pull request #110: Debug log for pool's db properties
GitHub user wildloop opened a pull request: https://github.com/apache/tomcat/pull/110 Debug log for pool's db properties I found that all non-string values are ignored by [java.util.Properties.java](https://github.com/JetBrains/jdk8u_jdk/blob/master/src/share/classes/java/util/Properties.java#L970) and sometime we don't know what exactly properties are passed to the driver. The way to log these properties out would be helpful... You can merge this pull request into a Git repository by running: $ git pull https://github.com/wildloop/tomcat trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/110.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #110 commit 60612fc5ec708d38dad66c9b327163846aa3109b Author: wildloop Date: 2018-05-10T14:44:12Z Debug log for pool's db properties I found that all non-string values are ignored by [java.util.Properties.java](https://github.com/JetBrains/jdk8u_jdk/blob/master/src/share/classes/java/util/Properties.java#L970) and sometime we don't know what exactly properties are passed to the driver. The way to log these properties out would be helpful... commit 1e8532ccf275a564e1ffb10cd00df44283f6b0a4 Author: wildloop Date: 2018-05-10T14:47:57Z tabs to spaces --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831350 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ test/org/apache/naming/ test/webapp-fragments/ test/webapp-fragments/WEB-INF/ webapp
Author: markt Date: Thu May 10 15:43:21 2018 New Revision: 1831350 URL: http://svn.apache.org/viewvc?rev=1831350&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=50019 Add support for . Based on a patch by Gurkan Erdogdu. Added: tomcat/tc8.0.x/trunk/test/org/apache/naming/TestEnvEntry.java - copied unchanged from r1831333, tomcat/trunk/test/org/apache/naming/TestEnvEntry.java tomcat/tc8.0.x/trunk/test/org/apache/naming/TesterEnvEntry.java - copied unchanged from r1831333, tomcat/trunk/test/org/apache/naming/TesterEnvEntry.java tomcat/tc8.0.x/trunk/test/org/apache/naming/TesterInjectionServlet.java - copied unchanged from r1831333, tomcat/trunk/test/org/apache/naming/TesterInjectionServlet.java tomcat/tc8.0.x/trunk/test/webapp-fragments/jndi.jsp - copied unchanged from r1831333, tomcat/trunk/test/webapp-fragments/jndi.jsp Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java tomcat/tc8.0.x/trunk/test/webapp-fragments/WEB-INF/web.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 10 15:43:21 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,16
svn commit: r1831352 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ test/org/apache/naming/ test/webapp-3.0-fragments/ webapps/docs/
Author: markt Date: Thu May 10 15:52:10 2018 New Revision: 1831352 URL: http://svn.apache.org/viewvc?rev=1831352&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=50019 Add support for . Based on a patch by Gurkan Erdogdu. Added: tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java - copied, changed from r1831350, tomcat/tc8.0.x/trunk/test/org/apache/naming/TestEnvEntry.java tomcat/tc7.0.x/trunk/test/org/apache/naming/TesterEnvEntry.java - copied unchanged from r1831350, tomcat/tc8.0.x/trunk/test/org/apache/naming/TesterEnvEntry.java tomcat/tc7.0.x/trunk/test/org/apache/naming/TesterInjectionServlet.java - copied unchanged from r1831350, tomcat/tc8.0.x/trunk/test/org/apache/naming/TesterInjectionServlet.java tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/jndi.jsp - copied unchanged from r1831350, tomcat/tc8.0.x/trunk/test/webapp-fragments/jndi.jsp 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/NamingContextListener.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 10 15:52:10 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,
svn commit: r1831352 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ test/org/apache/naming/ test/webapp-3.0-fragments/ webapps/docs/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1831352&r1=1831351&r2=1831352&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
Thu May 10 15:52:10 2018
@@ -56,13 +56,16 @@ import org.apache.catalina.deploy.Contex
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.ContextService;
import org.apache.catalina.deploy.ContextTransaction;
+import org.apache.catalina.deploy.MessageDestinationRef;
import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.ResourceBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.naming.ContextAccessController;
import org.apache.naming.ContextBindings;
import org.apache.naming.EjbRef;
import org.apache.naming.HandlerRef;
+import org.apache.naming.LookupRef;
import org.apache.naming.NamingContext;
import org.apache.naming.ResourceEnvRef;
import org.apache.naming.ResourceLinkRef;
@@ -470,6 +473,19 @@ public class NamingContextListener
addLocalEjb(ejb);
}
}
+} else if (name.equals("messageDestinationRef")) {
+if (oldValue != null) {
+MessageDestinationRef mdr = (MessageDestinationRef) oldValue;
+if (mdr.getName() != null) {
+removeMessageDestinationRef(mdr.getName());
+}
+}
+if (newValue != null) {
+MessageDestinationRef mdr = (MessageDestinationRef) newValue;
+if (mdr.getName() != null) {
+addMessageDestinationRef(mdr);
+}
+}
} else if (name.equals("resource")) {
if (oldValue != null) {
ContextResource resource = (ContextResource) oldValue;
@@ -587,6 +603,12 @@ public class NamingContextListener
addEjb(ejbs[i]);
}
+// Message Destination References
+MessageDestinationRef[] mdrs =
namingResources.findMessageDestinationRefs();
+for (i = 0; i < mdrs.length; i++) {
+addMessageDestinationRef(mdrs[i]);
+}
+
// WebServices references
ContextService[] services = namingResources.findServices();
for (i = 0; i < services.length; i++) {
@@ -678,24 +700,27 @@ public class NamingContextListener
*/
public void addEjb(ContextEjb ejb) {
-// Create a reference to the EJB.
-Reference ref = new EjbRef
-(ejb.getType(), ejb.getHome(), ejb.getRemote(), ejb.getLink());
-// Adding the additional parameters, if any
-Iterator params = ejb.listProperties();
-while (params.hasNext()) {
-String paramName = params.next();
-String paramValue = (String) ejb.getProperty(paramName);
-StringRefAddr refAddr = new StringRefAddr(paramName, paramValue);
-ref.add(refAddr);
+Reference ref = lookForLookupRef(ejb);
+
+if (ref == null) {
+// Create a reference to the EJB.
+ref = new EjbRef(ejb.getType(), ejb.getHome(), ejb.getRemote(),
ejb.getLink());
+// Adding the additional parameters, if any
+Iterator params = ejb.listProperties();
+while (params.hasNext()) {
+String paramName = params.next();
+String paramValue = (String) ejb.getProperty(paramName);
+StringRefAddr refAddr = new StringRefAddr(paramName,
paramValue);
+ref.add(refAddr);
+}
}
+
try {
createSubcontexts(envCtx, ejb.getName());
envCtx.bind(ejb.getName(), ref);
} catch (NamingException e) {
logger.error(sm.getString("naming.bindFailed", e));
}
-
}
@@ -704,86 +729,89 @@ public class NamingContextListener
*/
public void addEnvironment(ContextEnvironment env) {
-Object value = null;
-// Instantiating a new instance of the correct object type, and
-// initializing it.
-String type = env.getType();
-try {
-if (type.equals("java.lang.String")) {
-value = env.getValue();
-} else if (type.equals("java.lang.Byte")) {
-if (env.getValue() == null) {
-value = Byte.valueOf((byte) 0);
-} else {
-value = Byte.decode(env.getValue());
-}
-} else if (type.equals("java.lang.Short")) {
-if (env.getValue() == null) {
-value = Short.valueOf((short)
[Bug 50019] Adding JNDI "lookup-name" support In XML and Resource Annotations
https://bz.apache.org/bugzilla/show_bug.cgi?id=50019 --- Comment #4 from Mark Thomas --- Apologies for the long delay in applying this. Thanks for the patch. Fixed in: - trunk for 9.0.9 onwards - 8.5.x for 8.5.32 onwards - 8.0.x for 8.0.53 onwards - 7.0.x for 7.0.89 onwards -- 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 Apache Tomcat 7.0.88
Hi, On Mon, May 7, 2018 at 8:06 PM, Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.88 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.88/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1184/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_88/ > > The proposed 7.0.88 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.88 Stable Signatures ok. SHA512 checksum ok. Unit test passed. > > Regards, > Violeta -- Best Regards！ Huxing - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831354 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/ test/org/apache/catalina/valves/ webapps/docs/
Author: markt Date: Thu May 10 16:20:16 2018 New Revision: 1831354 URL: http://svn.apache.org/viewvc?rev=1831354&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60490 Format improvements to ErrorReportValve Patch by Michael Osipov Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 10 16:20:16 2018 @@ -1,2 +1,2 @@ -/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730
svn commit: r1831355 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ test/org/apache/catalina/valves/ webapps/docs/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties?rev=1831355&r1=1831354&r2=1831355&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
Thu May 10 16:23:35 2018
@@ -24,8 +24,8 @@ accessLogValve.closeFail = No pude cerra
accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales
de acceso
accessLogValve.rotateFail = No pude rotar historial de acceso
# Error report valve
-errorReportValve.errorReport = Informe de Error
-errorReportValve.statusHeader = Estado HTTP {0} - {1}
+errorReportValve.statusHeader = Estado HTTP {0} \u2013 {1}
+errorReportValve.type=Tipo
errorReportValve.exceptionReport = Informe de Excepci\u00F3n
errorReportValve.statusReport = Informe de estado
errorReportValve.message = mensaje
@@ -33,53 +33,40 @@ errorReportValve.description = descripci
errorReportValve.exception = excepci\u00F3n
errorReportValve.rootCause = causa ra\u00EDz
errorReportValve.note = nota
-errorReportValve.rootCauseInLogs = La traza completa de la causa de este error
se encuentra en los archivos de diario de {0}.
+errorReportValve.rootCauseInLogs = La traza completa de la causa de este error
se encuentra en los archivos de diario del servidor.
+
remoteIpValve.syntax = Se han suministrado expresiones regulares [{0}] no
v\u00E1lidas.
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el
puerto en cabecera HTTP [{1}]
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear
un objeto java.security.cert.X509Certificate
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto
asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden
procesar los datos del certificado.
stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" (id={6})
ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo
requerimiento para {4} y puede estar atascado (el umbral configurado para este
StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son
monitorizados por esta V\u00E1lvula y pueden estar atascados.
stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}" (id={3}),
que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo
por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2}
hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
+
# HTTP status reports
-http.100 = El cliente puede continuar.
-http.101 = El servidor est\u00E1 conmutando protocolos con arreglo a la
cabecera "Upgrade".
-http.201 = El requerimiento tuvo \u00E9xito y un nuevo recurso ha sido creado
en el servidor.
-http.202 = Este requerimiento ha sido aceptado para ser procesado, pero no ha
sido completado.
-http.203 = La informaci\u00F3n meta presentada por el cliente no se
origin\u00F3 desde el servidor.
-http.204 = El requerimiento tuvo \u00E9xito pero no hay informaci\u00F3n que
devolver.
-http.205 = El cliente no deber\u00EDa de limpiar la vista del documento que
caus\u00F3 que este requerimiento fuera enviado.
-http.206 = El servidor ha rellenado paci\u00E1lmente un requerimiento GET para
este recurso.
-http.207 = Se han devuelto valores m\u00FAltiples de estado.
-http.300 = El recurso requerido corresponde a una cualquiera de un conjunto de
representaciones, cada una con su propia localizaci\u00F3n espec\u00EDfica.
-http.301 = El recurso requerido ha sido movido perman\u00E9ntemente a una
nueva localizaci\u00F3n.
-http.302 = El recurso requerido ha sido movido tempor\u00E1lmente a una nueva
localizaci\u00F3n.
-http.303 = La respuesta a este requerimiento se puede hallar bajo una URI
diferente.
-http.304 = El recurso requerido est\u00E1 disponible y no ha sido modificado.
-http.305 = El recurso requerido debe de ser accedido a trav\u00E9s del
apoderado (proxy) dado mediante la cabecera "Location".
-http.400 = El requerimiento enviado por el cliente era sint\u00E1cticamente
incorrecto.
-http.401 = Este requerimiento requiere autenticaci\u00F3n HTTP.
-http.402 = Se requiere pago para acceder a este recurso.
-http.403 = El acceso al recurso especificado ha sido prohibido.
-http.404 = El recurso requerido no est\u00E1 disponible.
-http.405 = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el
recurso requerido.
-http.406 = El recurso identificado por este requerimiento s\u00F3lo es capaz
de generar respuestas con caracter\u00EDsticas no aceptables con arreglo a las
cabeceras "accept" de requerimiento.
-http.407 = El cliente debe de ser primero autenticado en el apoderado.
-http.408 = El cliente no produjo un requerimiento dentro de
svn commit: r1831355 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ test/org/apache/catalina/valves/ webapps/docs/
Author: markt Date: Thu May 10 16:23:35 2018 New Revision: 1831355 URL: http://svn.apache.org/viewvc?rev=1831355&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60490 Format improvements to ErrorReportValve Patch by Michael Osipov Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 10 16:23:35 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-180099
[Bug 60490] Several improvements to the ErrorReportValve
https://bz.apache.org/bugzilla/show_bug.cgi?id=60490 --- Comment #9 from Mark Thomas --- Further back-ported to: - 8.0.x for 8.0.53 onwards - 7.0.x for 7.0.89 onwards -- 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 failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1087 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1831352 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - 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.88
2018-05-07 15:06 GMT+03:00 Violeta Georgieva : > The proposed Apache Tomcat 7.0.88 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.88/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1184/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_88/ > > The proposed 7.0.88 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 7.0.88 Stable Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 17 mins 24 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-BIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.exclude=**/TestFlushableGZIPOutputStream.java -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/pub lic/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtest.reports=output/logs-BIO -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20180511.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/websocket-api.jar:/
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 18 mins 16 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-NIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.exclude=**/TestFlushableGZIPOutputStream.java -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/pub lic/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtest.reports=output/logs-NIO -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20180511.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/websocket-api.jar:/
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 20 mins 21 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.exclude=**/TestFlushableGZIPOutputStream.java -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/pub lic/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dtest.reports=output/logs-APR -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20180511/lib -Dtest.relaxTiming=true -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20180511.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.ja
Re: [VOTE] Release Apache Tomcat 7.0.88
Am 7. Mai 2018 14:06:35 MESZ schrieb Violeta Georgieva : >The proposed Apache Tomcat 7.0.88 release is now available for voting. > >It can be obtained from: >https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.88/ >The Maven staging repo is: >https://repository.apache.org/content/repositories/orgapachetomcat-1184/ >The svn tag is: >http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_88/ > >The proposed 7.0.88 release is: >[ ] Broken - do not release >[x] Stable - go ahead and release as 7.0.88 Stable Regards, Felix > >Regards, >Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1831386 - in /tomcat/tc7.0.x/trunk/test: org/apache/naming/TestEnvEntry.java webapp-3.0-fragments/WEB-INF/web.xml
Author: markt
Date: Fri May 11 06:33:48 2018
New Revision: 1831386
URL: http://svn.apache.org/viewvc?rev=1831386&view=rev
Log:
Follow-up to r1831352
Add additions to web.xml missed in original backport
Correct web-app path for 7.0.x
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java
tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
Modified: tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java?rev=1831386&r1=1831385&r2=1831386&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/naming/TestEnvEntry.java Fri May 11
06:33:48 2018
@@ -93,7 +93,7 @@ public class TestEnvEntry extends Tomcat
private void doTestJndiLookup(String jndiName, String expected) throws
Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File("test/webapp-fragments");
+File appDir = new File("test/webapp-3.0-fragments");
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.enableNaming();
@@ -114,7 +114,7 @@ public class TestEnvEntry extends Tomcat
private void doTestJndiInjection(String injectionName, String expected)
throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File("test/webapp-fragments");
+File appDir = new File("test/webapp-3.0-fragments");
Context context = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
Tomcat.addServlet(context, "InjectionServlet",
"org.apache.naming.TesterInjectionServlet");
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1831386&r1=1831385&r2=1831386&view=diff
==
--- tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Fri May 11
06:33:48 2018
@@ -86,4 +86,94 @@
java.lang.Integer
66
+
+
+injection
+org.apache.naming.TesterInjectionServlet
+
+
+injection
+/injection
+
+
+
+env-entry/basic
+java.lang.String
+basic-value
+
+
+
+env-entry/valid
+org.apache.naming.TesterEnvEntry
+valid
+
+
+
+env-entry/invalid
+org.apache.naming.TesterEnvEntry
+invalid
+
+
+
+env-entry/injectField
+java.lang.String
+inject-value-1
+
+
org.apache.naming.TesterInjectionServlet
+ property1
+
+
+
+
+env-entry/injectProperty
+java.lang.String
+inject-value-2
+
+
org.apache.naming.TesterInjectionServlet
+ property2
+
+
+
+
+env-entry/injectFieldNoType
+inject-value-3
+
+
org.apache.naming.TesterInjectionServlet
+ property3
+
+
+
+
+env-entry/injectNoValue
+java.lang.String
+
+
org.apache.naming.TesterInjectionServlet
+ property4
+
+
+
+
+env-entry/lookup
+java.lang.String
+java:comp/env/env-entry/basic
+
+
+
+env-entry/circular1
+java.lang.String
+java:comp/env/env-entry/circular2
+
+
+
+env-entry/circular2
+java.lang.String
+java:comp/env/env-entry/circular1
+
+
+
+env-entry/lookup-invalid
+java.lang.Integer
+java:comp/env/env-entry/basic
+
+
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
