[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) 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-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-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-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 13 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-28052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-28052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org
svn commit: r1343153 - in /tomcat/trunk/java/org/apache/catalina: Host.java core/StandardHost.java startup/ContextConfig.java startup/HostConfig.java
Author: kfujino
Date: Mon May 28 07:11:43 2012
New Revision: 1343153
URL: http://svn.apache.org/viewvc?rev=1343153view=rev
Log:
fix for Konstantin's review.
Add new calculation method of host's default config path to Host(StanderdHost).
Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=1343153r1=1343152r2=1343153view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Mon May 28 07:11:43 2012
@@ -86,6 +86,12 @@ public interface Host extends Container
public void setXmlBase(String xmlBase);
/**
+ * Return a default configuration path of this Host. The file will be
+ * canonical if possible.
+ */
+public File getConfigBaseFile();
+
+/**
* Return the application root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1343153r1=1343152r2=1343153view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon May 28
07:11:43 2012
@@ -30,6 +30,7 @@ import javax.management.ObjectName;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.JmxEnabled;
import org.apache.catalina.Lifecycle;
@@ -92,6 +93,11 @@ public class StandardHost extends Contai
private String xmlBase = null;
/**
+ * host's default config path
+ */
+private volatile File hostConfigBase = null;
+
+/**
* The auto deploy flag for this Host.
*/
private boolean autoDeploy = true;
@@ -270,6 +276,40 @@ public class StandardHost extends Contai
/**
+ * ({@inheritDoc}
+ */
+@Override
+public File getConfigBaseFile() {
+if (hostConfigBase != null) {
+return hostConfigBase;
+}
+String path = null;
+if (getXmlBase()!=null) {
+path = getXmlBase();
+} else {
+StringBuilder xmlDir = new StringBuilder(conf);
+Container parent = getParent();
+if (parent instanceof Engine) {
+xmlDir.append('/');
+xmlDir.append(parent.getName());
+}
+xmlDir.append('/');
+xmlDir.append(getName());
+path = xmlDir.toString();
+}
+File file = new File(path);
+if (!file.isAbsolute())
+file = new File(getCatalinaBase(), path);
+try {
+file = file.getCanonicalFile();
+} catch (IOException e) {// ignore
+}
+this.hostConfigBase = file;
+return file;
+}
+
+
+/**
* Returns true if the Host will attempt to create directories for appBase
and xmlBase
* unless they already exist.
*/
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1343153r1=1343152r2=1343153view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon May 28
07:11:43 2012
@@ -1106,38 +1106,10 @@ public class ContextConfig implements Li
protected File getHostConfigBase() {
File file = null;
-Container container = context;
-Host host = null;
-Engine engine = null;
-while (container != null) {
-if (container instanceof Host) {
-host = (Host)container;
-}
-if (container instanceof Engine) {
-engine = (Engine)container;
-}
-container = container.getParent();
-}
-if (host != null host.getXmlBase()!=null) {
-String xmlBase = host.getXmlBase();
-file = new File(xmlBase);
-if (!file.isAbsolute())
-file = new File(context.getCatalinaBase(), xmlBase);
-} else {
-StringBuilder result = new StringBuilder();
-if (engine != null) {
-result.append(engine.getName()).append('/');
-}
Re: svn commit: r1341370 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Thanks for the review.
I fixed it.
I implemented the calculation method of host's default config path to
Host(StanderdHost).
just like a Host#getAppBaseFile().
This fix is applied only to trunk.
If there is a different implementation idea, feel free to re-fix.
2012/5/25 Konstantin Kolinko knst.koli...@gmail.com:
2012/5/22 kfuj...@apache.org:
Author: kfujino
Date: Tue May 22 09:27:00 2012
New Revision: 1341370
URL: http://svn.apache.org/viewvc?rev=1341370view=rev
Log:
Enable host's xmlBase attribute in ContextConfig.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1341370r1=1341369r2=1341370view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Tue May 22 09:27:00 2012
@@ -559,9 +559,8 @@ public class ContextConfig implements Li
contextConfig.badUrl, defaultContextFile), e);
}
}
-
- File hostContextFile = new File(getConfigBase(),
- getHostConfigPath(Constants.HostContextXml));
+
+ File hostContextFile = new File(getHostConfigBase(),
Constants.HostContextXml);
if (hostContextFile.exists()) {
try {
URL hostContextUrl = hostContextFile.toURI().toURL();
@@ -1152,30 +1151,43 @@ public class ContextConfig implements Li
return configBase;
}
-
- protected String getHostConfigPath(String resourceName) {
- StringBuilder result = new StringBuilder();
+ protected File getHostConfigBase() {
+ File file = null;
Container container = context;
- Container host = null;
- Container engine = null;
+ Host host = null;
+ Engine engine = null;
while (container != null) {
- if (container instanceof Host)
- host = container;
- if (container instanceof Engine)
- engine = container;
+ if (container instanceof Host) {
+ host = (Host)container;
+ }
+ if (container instanceof Engine) {
+ engine = (Engine)container;
+ }
container = container.getParent();
}
- if (engine != null) {
- result.append(engine.getName()).append('/');
+ if (host != null host.getXmlBase()!=null) {
+ String xmlBase = host.getXmlBase();
+ file = new File(xmlBase);
+ if (!file.isAbsolute())
+ file = new File(new
File(System.getProperty(Globals.CATALINA_BASE_PROP)),
+ xmlBase);
BTW, ContextConfig could call its own ContextConfig.getBaseDir() here
instead of direct look up of the system property.
The same in 3 other its methods (antiLocking(), fixDocBase(),
getConfigBase()).
+ } else {
+ StringBuilder result = new StringBuilder();
+ if (engine != null) {
+ result.append(engine.getName()).append('/');
+ }
+ if (host != null) {
+ result.append(host.getName()).append('/');
+ }
+ file = new File (getConfigBase(), result.toString());
}
- if (host != null) {
- result.append(host.getName()).append('/');
+ try {
+ return file.getCanonicalFile();
+ } catch (IOException e) {
+ return file;
}
- result.append(resourceName);
- return result.toString();
}
-
/**
* Scan the web.xml files that apply to the web application and merge
them
* using the rules defined in the spec. For the global web.xml files,
@@ -1686,22 +1698,15 @@ public class ContextConfig implements Li
* it.
*/
protected InputSource getHostWebXmlSource() {
- String resourceName = getHostConfigPath(Constants.HostWebXml);
-
- // In an embedded environment, configBase might not be set
- File configBase = getConfigBase();
- if (configBase == null)
- return null;
-
The above return null case disappears without replacement.
String basePath = null;
try {
- basePath = configBase.getCanonicalPath();
+ basePath = getHostConfigBase().getCanonicalPath();
getCanonicalFile() is already called inside of getHostConfigBase(), so
there is double work here.
} catch (IOException e) {
log.error(sm.getString(contextConfig.baseError), e);
return null;
Re: svn commit: r1343079 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_status.c
2012/5/27 mt...@apache.org:
Author: mturk
Date: Sun May 27 19:05:26 2012
New Revision: 1343079
URL: http://svn.apache.org/viewvc?rev=1343079view=rev
Log:
Fix 0.0.0.0:0 address bug for workers. Make sure we force pull and address
resolve
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_status.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1343079r1=1343078r2=1343079view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Sun May 27 19:05:26 2012
@@ -1130,10 +1130,11 @@ void jk_ajp_push(ajp_worker_t * aw, int
++aw-s-h.sequence;
aw-sequence = aw-s-h.sequence;
if (aw-s-addr_sequence != aw-addr_sequence) {
+ ++aw-s-addr_sequence;
address_change = JK_TRUE;
strncpy(aw-s-host, aw-host, JK_SHM_STR_SIZ);
aw-s-port = aw-port;
- aw-s-addr_sequence = aw-addr_sequence;
+ aw-addr_sequence = aw-s-h.sequence;
The above line, was it supposed to be
aw-addr_sequence = aw-s-addr_sequence;
? (I do not really understand it. Just thinking of symmetry and
comparing it with the two lines just above the if(),
[[[
++aw-s-h.sequence;
aw-sequence = aw-s-h.sequence;
]]]
)
Best regards,
Konstantin Kolinko
}
if (locked == JK_FALSE)
jk_shm_unlock();
@@ -2682,16 +2683,13 @@ int ajp_validate(jk_worker_t *pThis,
host = undefined;
}
strncpy(p-host, jk_get_worker_host(props, p-name, host),
JK_SHM_STR_SIZ);
-
- if (JK_IS_DEBUG_LEVEL(l))
- jk_log(l, JK_LOG_DEBUG,
- worker %s contact is '%s:%d',
- p-name, p-host, p-port);
- /* Copy the contact to shm
- */
if (p-s-h.sequence == 0) {
/* Initial setup.
*/
+ if (JK_IS_DEBUG_LEVEL(l))
+ jk_log(l, JK_LOG_DEBUG,
+ worker %s contact is '%s:%d',
+ p-name, p-host, p-port);
if (p-port 0) {
if (!jk_resolve(p-host, p-port, p-worker_inet_addr,
we-pool, l)) {
jk_log(l, JK_LOG_ERROR,
@@ -2704,9 +2702,12 @@ int ajp_validate(jk_worker_t *pThis,
p-name);
}
}
+ p-addr_sequence = 0;
p-s-addr_sequence = 0;
p-s-last_maintain_time = time(NULL);
p-s-last_reset = p-s-last_maintain_time;
+ p-s-port = p-port;
+ strncpy(p-s-host, p-host, JK_SHM_STR_SIZ);
jk_ajp_push(p, JK_TRUE, l);
}
else {
@@ -2714,8 +2715,10 @@ int ajp_validate(jk_worker_t *pThis,
*/
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
- worker %s contact already configured (%u-%u,
- p-name, p-s-addr_sequence, p-addr_sequence);
+ worker %s contact '%s:%d' already configured
(%u-%u),
+ p-name, p-host, p-port, p-s-addr_sequence,
p-addr_sequence);
+ /* Force resolve */
+ p-addr_sequence = -1;
jk_ajp_pull(p, JK_TRUE, l);
}
JK_TRACE_EXIT(l);
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1343079r1=1343078r2=1343079view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Sun May 27 19:05:26 2012
@@ -4159,7 +4159,7 @@ static int update_worker(jk_ws_service_t
rv = 0;
rc = commit_member(s, p, lb, wr, aw, rv, l);
if (rv JK_STATUS_NEEDS_ADDR_PUSH) {
- aw-addr_sequence++;
+ aw-addr_sequence = -1;
}
if (rv (JK_STATUS_NEEDS_PUSH | JK_STATUS_NEEDS_ADDR_PUSH)) {
wr-sequence = -1;
@@ -4209,10 +4209,10 @@ static int update_worker(jk_ws_service_t
rv = 0;
rc = commit_member(s, p, NULL, NULL, aw, rv, l);
if (rv JK_STATUS_NEEDS_ADDR_PUSH) {
- aw-addr_sequence++;
+ aw-addr_sequence = -1;
}
if (rv (JK_STATUS_NEEDS_PUSH | JK_STATUS_NEEDS_ADDR_PUSH)) {
- aw-sequence = 0;
+ aw-sequence = -1;
jk_ajp_push(aw, JK_TRUE, l);
}
if (rc == JK_FALSE) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
svn commit: r1343207 - /tomcat/jk/trunk/native/common/jk_ajp_common.c
Author: mturk Date: Mon May 28 11:23:40 2012 New Revision: 1343207 URL: http://svn.apache.org/viewvc?rev=1343207view=rev Log: Fix typo Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1343207r1=1343206r2=1343207view=diff == --- tomcat/jk/trunk/native/common/jk_ajp_common.c (original) +++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon May 28 11:23:40 2012 @@ -1134,7 +1134,7 @@ void jk_ajp_push(ajp_worker_t * aw, int address_change = JK_TRUE; strncpy(aw-s-host, aw-host, JK_SHM_STR_SIZ); aw-s-port = aw-port; -aw-addr_sequence = aw-s-h.sequence; +aw-addr_sequence = aw-s-addr_sequence; } if (locked == JK_FALSE) jk_shm_unlock(); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1343079 - in /tomcat/jk/trunk/native/common: jk_ajp_common.c jk_status.c
On 05/28/2012 12:42 PM, Konstantin Kolinko wrote: 2012/5/27mt...@apache.org: -aw-s-addr_sequence = aw-addr_sequence; +aw-addr_sequence = aw-s-h.sequence; The above line, was it supposed to be aw-addr_sequence = aw-s-addr_sequence; Yeah. Fixed. Thanks :) Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53301] Servlet init method called twice with embedded Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- Don't understand why you claim it is a user error It is your responsibility to provide enough details to prove and reproduce the issue. Your report is lacking and there are several statements in it that appear to be based on false assumptions. You should ask for help on the users list to better diagnose your problem. Bugzilla is not a support forum. FYI: 1. tomcat7:run uses embedded Tomcat 2. init() can be called as many times as many instances of a Servlet are there -- 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
tagging connectors 1.2.37
Hi, We have regression in 1.2.36 which can cause core in case workers are mixed between balance_members and worker.list thus I plan to create a speedy release focusing on this issue. Hope that's fine with everyone. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343254 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: mturk Date: Mon May 28 13:45:45 2012 New Revision: 1343254 URL: http://svn.apache.org/viewvc?rev=1343254view=rev Log: Update changes Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1343254r1=1343253r2=1343254view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon May 28 13:45:45 2012 @@ -40,6 +40,21 @@ new documentation project for JK was started. /p /section +section name=Changes between 1.2.36 and 1.2.35 + br / + subsection name=Native +changelog + fix +Fix regression which can crash webserver in case worker is +defined both as member of load balancer and as standlaone worker. (mturk) + /fix + fix +Fix core if debug log level is specifed and there is no +session identifier present. (mturk) + /fix +/changelog + /subsection +/section section name=Changes between 1.2.35 and 1.2.36 br / subsection name=Native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343258 - in /tomcat/jk/trunk: native/common/jk_version.h native/iis/installer/isapi-redirector-win32-msi.ism tools/dist/README.html tools/dist/binaries/windows/README.html
Author: mturk Date: Mon May 28 13:49:25 2012 New Revision: 1343258 URL: http://svn.apache.org/viewvc?rev=1343258view=rev Log: Update versions to pending release Modified: tomcat/jk/trunk/native/common/jk_version.h tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism tomcat/jk/trunk/tools/dist/README.html tomcat/jk/trunk/tools/dist/binaries/windows/README.html Modified: tomcat/jk/trunk/native/common/jk_version.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1343258r1=1343257r2=1343258view=diff == --- tomcat/jk/trunk/native/common/jk_version.h (original) +++ tomcat/jk/trunk/native/common/jk_version.h Mon May 28 13:49:25 2012 @@ -29,7 +29,7 @@ #define JK_VERFIX 37 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 0 +#define JK_VERISRELEASE 1 /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING 0 Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1343258r1=1343257r2=1343258view=diff == --- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism (original) +++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Mon May 28 13:49:25 2012 @@ -3425,7 +3425,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA== rowtdProductID/tdtdnone/tdtd//row rowtdProductLanguage/tdtd1033/tdtd//row rowtdProductName/tdtdTomcat Isapi Redirector/tdtd//row - rowtdProductVersion/tdtd1.2.36/tdtd//row + rowtdProductVersion/tdtd1.2.37/tdtd//row rowtdProgressType0/tdtdinstall/tdtd//row rowtdProgressType1/tdtdInstalling/tdtd//row rowtdProgressType2/tdtdinstalled/tdtd//row Modified: tomcat/jk/trunk/tools/dist/README.html URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/dist/README.html?rev=1343258r1=1343257r2=1343258view=diff == --- tomcat/jk/trunk/tools/dist/README.html (original) +++ tomcat/jk/trunk/tools/dist/README.html Mon May 28 13:49:25 2012 @@ -47,13 +47,13 @@ nearest mirror site!/a/a/h2 pre % pgpk -a KEYS -% pgpv tomcat-connectors-1.2.36-src.tar.gz.asc +% pgpv tomcat-connectors-1.2.37-src.tar.gz.asc ior/i, % pgp -ka KEYS -% pgp tomcat-connectors-1.2.36-src.tar.gz.asc +% pgp tomcat-connectors-1.2.37-src.tar.gz.asc ior/i, % gpg --import KEYS -% gpg --verify tomcat-connectors-1.2.36-src.tar.gz.asc +% gpg --verify tomcat-connectors-1.2.37-src.tar.gz.asc /pre pWe offer MD5 and SHA1 hashes as an alternative to validate the integrity Modified: tomcat/jk/trunk/tools/dist/binaries/windows/README.html URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/dist/binaries/windows/README.html?rev=1343258r1=1343257r2=1343258view=diff == --- tomcat/jk/trunk/tools/dist/binaries/windows/README.html (original) +++ tomcat/jk/trunk/tools/dist/binaries/windows/README.html Mon May 28 13:49:25 2012 @@ -35,7 +35,7 @@ connector to fail. /p -h2a name=releasedThe current stable release is 1.2.36/a/h2 +h2a name=releasedThe current stable release is 1.2.37/a/h2 pSee the Apache Tomcat Connectors a href=http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html;changelog/a - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: A small question regarding connector.Request.getCoyoteRequest method
On 28/05/2012 14:07, N V Hari Krishna wrote: Hello all, I had few questions regarding org.apache.connector.Request.getCoyoteRequest() method. My questions are: Request.getCoyoteRequest() method's corresponding response method org.apache.catalina.connector.Response.getCoyoteResponse method is deprecated. I believe the intention behind that is to hide the coyote response object out of Tomcat. Is it correct? No. If yes, but the Request.getCoyoteRequest() method is not deprecated. Does the coyote.Request class is allowed out of Tomcat (i.e. in my valve)? Is it intended for external use? Can I use coyote.Request object directly in my valve? Not applicable. Premise of the questions is incorrect (see above). In other words: Why Response.getCoyoteResponse() method is deprecated and Request.getCoyoteRequest() is not deprecated? The answer may be found in the svn logs. Look in tomact/tc7.0.x/trunk to see why the method was deprecated. Follow-up questions belong on the users mailing list. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343301 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon May 28 15:53:09 2012
New Revision: 1343301
URL: http://svn.apache.org/viewvc?rev=1343301view=rev
Log:
[MTOMCAT-155] allow exec-war war run dependencies that are generated in current
mvn execution, but not yet installed to maven repo
Submitted by Peter Lynch.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1343301r1=1343300r2=1343301view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Mon May 28 15:53:09 2012
@@ -66,8 +66,6 @@ import java.util.jar.JarFile;
public abstract class AbstractExecWarMojo
extends AbstractTomcat7Mojo
{
-
-
/**
* @parameter default-value=${project.artifact}
* @required
@@ -96,6 +94,13 @@ public abstract class AbstractExecWarMoj
private File buildDirectory;
/**
+ * Path under {@link #buildDirectory} where this mojo may do temporary
work.
+ *
+ * @parameter default-value=tomcat7-maven-plugin-exec
+ */
+private String pluginWorkDirectory;
+
+/**
* @parameter default-value=src/main/tomcatconf
expression=${maven.tomcat.exec.war.tomcatConf}
*/
private File tomcatConfigurationFilesDirectory;
@@ -105,7 +110,6 @@ public abstract class AbstractExecWarMoj
*/
private File serverXml;
-
/**
* Name of the generated exec JAR.
*
@@ -324,15 +328,17 @@ public abstract class AbstractExecWarMoj
dependency.getClassifier() );
artifactResolver.resolve( artifact, this.remoteRepos,
this.local );
-File warFile = new File( buildDirectory,
artifact.getFile().getName() );
-String warFileName = artifact.getFile().getName();
-FileUtils.copyFile( artifact.getFile(), warFile );
+
+File warFileToBundle = new File(
resolvePluginWorkDir(), artifact.getFile().getName() );
+FileUtils.copyFile( artifact.getFile(),
warFileToBundle );
+
if ( warRunDependency.contextXml != null )
{
-warFile = addContextXmlToWar(
warRunDependency.contextXml, warFile );
+warFileToBundle = addContextXmlToWar(
warRunDependency.contextXml, warFileToBundle );
}
+final String warFileName =
artifact.getFile().getName();
os.putArchiveEntry( new JarArchiveEntry( warFileName )
);
-IOUtils.copy( new FileInputStream( warFile ), os );
+IOUtils.copy( new FileInputStream( warFileToBundle ),
os );
os.closeArchiveEntry();
String propertyWarValue = properties.getProperty(
Tomcat7Runner.WARS_KEY );
String contextPath =
@@ -498,6 +504,21 @@ public abstract class AbstractExecWarMoj
}
}
+/**
+ * Resolves the plugin work dir as a sub directory of {@link
#buildDirectory}, creating it if it does not exist.
+ *
+ * @return File representing the resolved plugin work dir
+ * @throws MojoExecutionException if the plugin work dir cannot be created
+ */
+protected File resolvePluginWorkDir() throws MojoExecutionException {
+File workDir = new File(buildDirectory, pluginWorkDirectory);
+if(!workDir.exists() !workDir.mkdirs()){
+throw new MojoExecutionException(Could not create plugin work
directory at + workDir.getAbsolutePath());
+};
+return workDir;
+
+}
+
private String[] toStringArray( List list )
{
if ( list == null || list.isEmpty() )
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343302 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon May 28 15:53:23 2012
New Revision: 1343302
URL: http://svn.apache.org/viewvc?rev=1343302view=rev
Log:
cleanup a bit patch from previous commit
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1343302r1=1343301r2=1343302view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Mon May 28 15:53:23 2012
@@ -51,7 +51,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
@@ -97,6 +96,7 @@ public abstract class AbstractExecWarMoj
* Path under {@link #buildDirectory} where this mojo may do temporary
work.
*
* @parameter default-value=tomcat7-maven-plugin-exec
+ * @since 2.0
*/
private String pluginWorkDirectory;
@@ -298,7 +298,8 @@ public abstract class AbstractExecWarMoj
Properties properties = new Properties();
-properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY,
Long.toString( System.currentTimeMillis() ) );
+properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY,
+Long.toString( System.currentTimeMillis() ) );
properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString(
enableNaming ) );
properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY,
accessLogValveFormat );
properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY,
connectorHttpProtocol );
@@ -322,10 +323,11 @@ public abstract class AbstractExecWarMoj
if ( warRunDependency.dependency != null )
{
Dependency dependency = warRunDependency.dependency;
-Artifact artifact =
-artifactFactory.createArtifactWithClassifier(
dependency.getGroupId(), dependency.getArtifactId(),
-
dependency.getVersion(), dependency.getType(),
-
dependency.getClassifier() );
+Artifact artifact =
artifactFactory.createArtifactWithClassifier( dependency.getGroupId(),
+
dependency.getArtifactId(),
+
dependency.getVersion(),
+
dependency.getType(),
+
dependency.getClassifier() );
artifactResolver.resolve( artifact, this.remoteRepos,
this.local );
@@ -510,11 +512,16 @@ public abstract class AbstractExecWarMoj
* @return File representing the resolved plugin work dir
* @throws MojoExecutionException if the plugin work dir cannot be created
*/
-protected File resolvePluginWorkDir() throws MojoExecutionException {
-File workDir = new File(buildDirectory, pluginWorkDirectory);
-if(!workDir.exists() !workDir.mkdirs()){
-throw new MojoExecutionException(Could not create plugin work
directory at + workDir.getAbsolutePath());
-};
+protected File resolvePluginWorkDir()
+throws MojoExecutionException
+{
+File workDir = new File( buildDirectory, pluginWorkDirectory );
+if ( !workDir.exists() !workDir.mkdirs() )
+{
+throw new MojoExecutionException(
+Could not create plugin work directory at +
workDir.getAbsolutePath() );
+}
+
return workDir;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Closed] (MTOMCAT-155) allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo
[ https://issues.apache.org/jira/browse/MTOMCAT-155?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-155. -- Resolution: Fixed Fix Version/s: 2.0 Assignee: Olivier Lamy (*$^¨%`£) applied. Thanks! allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo Key: MTOMCAT-155 URL: https://issues.apache.org/jira/browse/MTOMCAT-155 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Affects Versions: 2.0 Reporter: Peter lynch Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.0 Attachments: warRunDependency-in-current-execution.patch If a war run dependency ( used in exec-war) was generated as part of current mvn execution maven module as executing tomcat plugin, then artifact file will be in target dir and not yet installed into maven repo yet ( since install phase has not been run) - so copy from ./target to ./target/(pluginWorkDirectory) to allow modifying war run dependency to avoid potential attempt of current code to overrite existing target dir exec-war. See attached patch file fo fix. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) 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-trunk-validate 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-trunk-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 29 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/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-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/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-28052012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-28052012.jar:/srv/gump/public/workspace/junit/dist/junit-28052012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-28052012.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-12.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-28052012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-28052012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-28052012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-28052012-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2268 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup/HostConfig.java:47:8: Unused import - org.apache.catalina.Engine. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:458: Got 1 errors and 0 warnings. Total time: 29 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 05001228052012, vmgump.apache.org:vmgump:05001228052012 Gump E-mail Identifier (unique within run) #16. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343308 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: kkolinko Date: Mon May 28 16:11:03 2012 New Revision: 1343308 URL: http://svn.apache.org/viewvc?rev=1343308view=rev Log: Correct version number typo Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1343308r1=1343307r2=1343308view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon May 28 16:11:03 2012 @@ -40,7 +40,7 @@ new documentation project for JK was started. /p /section -section name=Changes between 1.2.36 and 1.2.35 +section name=Changes between 1.2.36 and 1.2.37 br / subsection name=Native changelog - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343313 - in /tomcat/jk/trunk: HOWTO-RELEASE.txt native/iis/README native/netscape/README
Author: kkolinko Date: Mon May 28 16:45:34 2012 New Revision: 1343313 URL: http://svn.apache.org/viewvc?rev=1343313view=rev Log: Followup to r1343258 Update version number in two other files mentioned in HOWTO-RELEASE.txt Update HOWTO-RELEASE.txt File native/common/portable.h.sample was removed in r1026209, so remove its name from HOWTO. Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt tomcat/jk/trunk/native/iis/README tomcat/jk/trunk/native/netscape/README Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=1343313r1=1343312r2=1343313view=diff == --- tomcat/jk/trunk/HOWTO-RELEASE.txt (original) +++ tomcat/jk/trunk/HOWTO-RELEASE.txt Mon May 28 16:45:34 2012 @@ -35,9 +35,23 @@ had to be updated: native/iis/README native/netscape/README -native/STATUS.txt xdocs/index.xml xdocs/news/THISYEAR0101.xml +tools/dist/README.html +tools/dist/binaries/windows/README.html + +Check version numbers in the files that are listed in the section +Update source for next version below: + +native/STATUS.txt +native/configure.in +native/common/jk_version.h +native/iis/installer/isapi-redirector-win32-msi.ism +xdocs/miscellaneous/changelog.xml + +In native/STATUS.txt the current version stays labeled as in development +during release. It is updated with release date after release process is +completed. Update the JK_VERISRELEASE define in native/common/jk_version.h, here is a svn diff that shows what I changed: @@ -139,11 +153,11 @@ Make sure the group write bit is on for Update source for next version -- -native/STATUS.txt: Add status in development for new version. +native/STATUS.txt: Add release date for released version and + status in development for new version. native/configure.in: Update variable VERSION. native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERSTRING, and JK_VERISRELEASE. -native/common/portable.h.sample: Update VERSION define. native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion. xdocs/miscellaneous/changelog.xml: Start a new section for the new version. Modified: tomcat/jk/trunk/native/iis/README URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/README?rev=1343313r1=1343312r2=1343313view=diff == --- tomcat/jk/trunk/native/iis/README (original) +++ tomcat/jk/trunk/native/iis/README Mon May 28 16:45:34 2012 @@ -37,7 +37,7 @@ The steps that you need to take are: 1. Change directory to the isapi redirector plugins source directory. 2. Execute the following command: - nmake -f Makefile.x86 [SO_VERSION=-1.2.33] + nmake -f Makefile.x86 [SO_VERSION=-1.2.37] An alternative will be to open the isapi workspace file (isapi.dsw) in msdev and build it using the build menu. Modified: tomcat/jk/trunk/native/netscape/README URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/README?rev=1343313r1=1343312r2=1343313view=diff == --- tomcat/jk/trunk/native/netscape/README (original) +++ tomcat/jk/trunk/native/netscape/README Mon May 28 16:45:34 2012 @@ -25,7 +25,7 @@ The steps that you need to take are: directory or edit the nsapi.dsp and replace all $(IPLANET_HOME) occurrences with the real path 3. Execute the following command: - nmake -f Makefile.vc [SO_VERSION=-1.2.33] + nmake -f Makefile.vc [SO_VERSION=-1.2.37] An alternative will be to open the isapi workspace file (nsapi.dsw) in msdev and build it using the build menu. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (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 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 : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/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 commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -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/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 21 mins 51 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-28052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-28052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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-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.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/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/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-28052012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28052012.jar:/srv/gump/ public/workspace/junit/dist/junit-28052012.jar - [junit] at
Re: svn commit: r1343301 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
2012/5/28 ol...@apache.org:
Author: olamy
Date: Mon May 28 15:53:09 2012
New Revision: 1343301
URL: http://svn.apache.org/viewvc?rev=1343301view=rev
Log:
[MTOMCAT-155] allow exec-war war run dependencies that are generated in
current mvn execution, but not yet installed to maven repo
Submitted by Peter Lynch.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(...)
@@ -96,6 +94,13 @@ public abstract class AbstractExecWarMoj
private File buildDirectory;
/**
+ * Path under {@link #buildDirectory} where this mojo may do temporary
work.
+ *
+ * @parameter default-value=tomcat7-maven-plugin-exec
+ */
+ private String pluginWorkDirectory;
1. Would it be better to make it a File instead of a String, like
other fields there ?
2. It might be useful to allow absolute paths here.
E.g. if one wants to move it to the system temporary directory, or to
a RAM drive.
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]: Project tomcat-trunk-test (in module tomcat-trunk) 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-trunk-test 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-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-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-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 18 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-28052012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28052012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28052012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28052012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-28052012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org
[Bug 53139] Prevent showing keystore/truststore passwords via JMX in cleartext (with solution)
https://issues.apache.org/bugzilla/show_bug.cgi?id=53139 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #3 from Mark Thomas ma...@apache.org --- As I stated before, JMX is an administration interface and as such has access to all sorts of internal details. This particular internal detail is of use when remotely administering instances via JMX. Unfortunately, JMX does not support fine-grained access controls. You are limited to users having read access or read/write access to everything (as an aside, fine grained JMX access control could be an interesting project). The Tomcat code is not going to be changed to remove this attribute. The work-around you have adopted seems perfectly reasonable to me. -- 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: r1343333 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: kkolinko Date: Mon May 28 17:43:11 2012 New Revision: 134 URL: http://svn.apache.org/viewvc?rev=134view=rev Log: Fix unused import identified by Checkstyle Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=134r1=1343332r2=134view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon May 28 17:43:11 2012 @@ -44,7 +44,6 @@ import javax.management.ObjectName; import org.apache.catalina.Container; import org.apache.catalina.Context; -import org.apache.catalina.Engine; import org.apache.catalina.Host; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-155) allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo
[ https://issues.apache.org/jira/browse/MTOMCAT-155?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13284495#comment-13284495 ] Hudson commented on MTOMCAT-155: Integrated in TomcatMavenPlugin-mvn3.x #156 (See [https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/156/]) [MTOMCAT-155] allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo Submitted by Peter Lynch. (Revision 1343301) Result = FAILURE olamy : http://svn.apache.org/viewvc/?view=revrev=1343301 Files : * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java allow exec-war war run dependencies that are generated in current mvn execution, but not yet installed to maven repo Key: MTOMCAT-155 URL: https://issues.apache.org/jira/browse/MTOMCAT-155 Project: Apache Tomcat Maven Plugin Issue Type: Improvement Affects Versions: 2.0 Reporter: Peter lynch Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.0 Attachments: warRunDependency-in-current-execution.patch If a war run dependency ( used in exec-war) was generated as part of current mvn execution maven module as executing tomcat plugin, then artifact file will be in target dir and not yet installed into maven repo yet ( since install phase has not been run) - so copy from ./target to ./target/(pluginWorkDirectory) to allow modifying war run dependency to avoid potential attempt of current code to overrite existing target dir exec-war. See attached patch file fo fix. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343335 - in /tomcat/trunk/java/org/apache/catalina: core/StandardHost.java startup/HostConfig.java
Author: kkolinko Date: Mon May 28 17:47:35 2012 New Revision: 1343335 URL: http://svn.apache.org/viewvc?rev=1343335view=rev Log: Correct broken HTML in Javadoc comment. engine - lt;enginegt; Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1343335r1=1343334r2=1343335view=diff == --- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Mon May 28 17:47:35 2012 @@ -132,8 +132,9 @@ public class StandardHost extends Contai /** - * Should XML files be copied to $CATALINA_BASE/conf/engine/host by - * default when a web application is deployed? + * Should XML files be copied to + * $CATALINA_BASE/conf/lt;enginegt;/lt;hostgt; by default when + * a web application is deployed? */ private boolean copyXML = false; Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1343335r1=1343334r2=1343335view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon May 28 17:47:35 2012 @@ -114,8 +114,9 @@ public class HostConfig /** - * Should XML files be copied to $CATALINA_BASE/conf/engine/host by - * default when a web application is deployed? + * Should XML files be copied to + * $CATALINA_BASE/conf/lt;enginegt;/lt;hostgt; by default when + * a web application is deployed? */ protected boolean copyXML = false; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343337 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardHost.java java/org/apache/catalina/startup/HostConfig.java
Author: kkolinko Date: Mon May 28 17:50:14 2012 New Revision: 1343337 URL: http://svn.apache.org/viewvc?rev=1343337view=rev Log: Merged revision 1343335 from tomcat/trunk: Correct broken HTML in Javadoc comment. engine - lt;enginegt; Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1343335 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1343337r1=1343336r2=1343337view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Mon May 28 17:50:14 2012 @@ -124,8 +124,9 @@ public class StandardHost extends Contai /** - * Should XML files be copied to $CATALINA_BASE/conf/engine/host by - * default when a web application is deployed? + * Should XML files be copied to + * $CATALINA_BASE/conf/lt;enginegt;/lt;hostgt; by default when + * a web application is deployed? */ private boolean copyXML = false; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1343337r1=1343336r2=1343337view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon May 28 17:50:14 2012 @@ -129,8 +129,9 @@ public class HostConfig /** - * Should XML files be copied to $CATALINA_BASE/conf/engine/host by - * default when a web application is deployed? + * Should XML files be copied to + * $CATALINA_BASE/conf/lt;enginegt;/lt;hostgt; by default when + * a web application is deployed? */ protected boolean copyXML = false; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343352 - /tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
Author: kkolinko
Date: Mon May 28 18:25:46 2012
New Revision: 1343352
URL: http://svn.apache.org/viewvc?rev=1343352view=rev
Log:
CTR: whitespace
tabs - spaces. No functional change.
Modified:
tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1343352r1=1343351r2=1343352view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Mon May 28
18:25:46 2012
@@ -27,102 +27,102 @@ import java.util.ResourceBundle;
public class ResourceBundleELResolver extends ELResolver {
- public ResourceBundleELResolver() {
- super();
- }
-
- public Object getValue(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException,
ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base instanceof ResourceBundle) {
- if (property != null) {
- try {
- Object result = ((ResourceBundle)
base).getObject(property
- .toString());
- context.setPropertyResolved(true);
- return result;
- } catch (MissingResourceException mre) {
- return ??? + property.toString() +
???;
- }
- }
- }
-
- return null;
- }
-
- public Class? getType(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException,
ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base instanceof ResourceBundle) {
- context.setPropertyResolved(true);
- }
-
- return null;
- }
-
- public void setValue(ELContext context, Object base, Object property,
- Object value) throws NullPointerException,
- PropertyNotFoundException, PropertyNotWritableException,
- ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base instanceof ResourceBundle) {
- context.setPropertyResolved(true);
- throw new PropertyNotWritableException(message(context,
- resolverNotWriteable, new Object[] {
base.getClass()
- .getName() }));
- }
- }
-
- public boolean isReadOnly(ELContext context, Object base, Object
property)
- throws NullPointerException, PropertyNotFoundException,
ELException {
- if (context == null) {
- throw new NullPointerException();
- }
-
- if (base instanceof ResourceBundle) {
- context.setPropertyResolved(true);
- }
-
- return true;
- }
-
- public Iterator getFeatureDescriptors(ELContext context, Object base) {
- if (base instanceof ResourceBundle) {
- ListFeatureDescriptor feats = new
ArrayListFeatureDescriptor();
- Enumeration e = ((ResourceBundle) base).getKeys();
- FeatureDescriptor feat;
- String key;
- while (e.hasMoreElements()) {
- key = (String) e.nextElement();
- feat = new FeatureDescriptor();
- feat.setDisplayName(key);
- feat.setExpert(false);
- feat.setHidden(false);
- feat.setName(key);
- feat.setPreferred(true);
- feat.setValue(RESOLVABLE_AT_DESIGN_TIME,
Boolean.TRUE);
- feat.setValue(TYPE, String.class);
- feats.add(feat);
- }
- return feats.iterator();
- }
- return null;
- }
-
- public Class? getCommonPropertyType(ELContext context, Object base) {
- if (base
svn commit: r1343356 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/javax/el/ResourceBundleELResolver.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon May 28 18:44:19 2012
New Revision: 1343356
URL: http://svn.apache.org/viewvc?rev=1343356view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53001
Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
(r769336)
since the use case described in bug 46915 is invalid as it breaks the EL
specification.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1343356r1=1343355r2=1343356view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 28 18:44:19 2012
@@ -166,15 +166,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, kfujino
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53001
- Revert the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
- since the use case described in bug 46915 is invalid as it breaks the EL
- specification.
-http://svn.apache.org/viewvc?rev=1307511view=rev
-(The revision to revert in 6.0.x is r769336)
- +1: markt, kkolinko, kfujino
- -1:
-
* Fix several trivial HTML markup errors in example servlets
e.g. duplicate body tag preceding head and tr following /table
http://people.apache.org/~kkolinko/patches/2012-05-13_tc6_sampleservlets.patch
Modified: tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java?rev=1343356r1=1343355r2=1343356view=diff
==
--- tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/ResourceBundleELResolver.java Mon May 28
18:44:19 2012
@@ -38,12 +38,12 @@ public class ResourceBundleELResolver ex
}
if (base instanceof ResourceBundle) {
+context.setPropertyResolved(true);
+
if (property != null) {
try {
-Object result = ((ResourceBundle) base).getObject(property
+return ((ResourceBundle) base).getObject(property
.toString());
-context.setPropertyResolved(true);
-return result;
} catch (MissingResourceException mre) {
return ??? + property.toString() + ???;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1343356r1=1343355r2=1343356view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 28 18:44:19 2012
@@ -146,6 +146,11 @@
bug52666/bug: Correct coercion order in EL when processing the
equality and inequality operators. (markt)
/fix
+ fix
+bug53001/bug: Revert the fix for bug46915/bug since the use
case
+described in the bug is invalid since it breaks the EL specification.
+(markt)
+ /fix
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53001] Behaviour of ResourceBundleELResolver
https://issues.apache.org/bugzilla/show_bug.cgi?id=53001 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in 6.0 with r1343356 and will be in 6.0.36 -- 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: r1343361 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon May 28 19:22:32 2012 New Revision: 1343361 URL: http://svn.apache.org/viewvc?rev=1343361view=rev Log: Webapps - Web applications, like it is in Tomcat 7 changelog file. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1343361r1=1343360r2=1343361view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 28 19:22:32 2012 @@ -41,7 +41,7 @@ body !-- Section names: - General, Catalina, Coyote, Jasper, Cluster, Webapps, Other + General, Catalina, Coyote, Jasper, Cluster, Web applications, Other -- section name=Tomcat 6.0.36 (jfclere) rtext= subsection name=Catalina @@ -160,7 +160,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug52243/bug: Improve windows service documentation to clarify how @@ -411,7 +411,7 @@ /add /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix Correct the documentation for the connectionLinger attribute of the HTTP @@ -728,7 +728,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug41498/bug: Add the allRolesMode attribute to the Realm @@ -1316,7 +1316,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug49585/bug: Update JSVC documentation to reflect new packaging @@ -1478,7 +1478,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug49213/bug: Grant permissions required by manager application when @@ -1710,7 +1710,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog add Use underscores instead of spaces in anchor names in Tomcat @@ -1814,7 +1814,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog add Make changelog.xml be directly rendered as HTML by certain browsers. @@ -1982,7 +1982,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog add Add new Find leaks command to the Manager application. It allows to @@ -2112,7 +2112,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog add bug48530/bug: Add information on the Manager Server Status page to @@ -2743,7 +2743,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug41564/bug: Add some documentation on installing Tomcat as a @@ -2995,7 +2995,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug46509/bug: Use correct link on error page in JSP security @@ -3512,7 +3512,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug45940/bug: Correct name of username attribute for JDBC resources @@ -3630,7 +3630,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog update bug45323/bug: Add note that context.xml files can only contain a @@ -3968,7 +3968,7 @@ /add /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog update Update documentation to use correct version number, correct file paths @@ -4242,7 +4242,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix bug43173/bug: Fix typo in logging documentation regarding location @@ -4441,7 +4441,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix Fix WebDAV Servlet so it works correctly with MS clients. (markt) @@ -4579,7 +4579,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix Don't write error on System.out, use log() instead. (rjung) @@ -4659,7 +4659,7 @@ /fix /changelog /subsection - subsection name=Webapps + subsection name=Web applications changelog fix Some examples webapp fixes.
[Bug 53301] Servlet init method called twice with embedded Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #4 from Jeff MAURY jeffma...@jeffmaury.com --- Sorry, but the intent was not to get support but rather to signal the Tomcat community of the problem. I agree I should have given more materials about the problem: so you should find now a sample Maven project that demonstrate the problem. Just run 'mvn test' and you should get the error. This has been tested against 7.0.27, 7.0.26 and 7.0.25 (using the tomcatVersion property) -- 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 53301] Servlet init method called twice with embedded Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #5 from Jeff MAURY jeffma...@jeffmaury.com --- Created attachment 28844 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28844action=edit Sample Maven project with a test -- 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: r1343369 - in /tomcat/tc6.0.x/trunk/webapps: docs/changelog.xml host-manager/401.jsp host-manager/403.jsp manager/401.jsp manager/403.jsp
Author: kkolinko Date: Mon May 28 19:30:41 2012 New Revision: 1343369 URL: http://svn.apache.org/viewvc?rev=1343369view=rev Log: Backport http://svn.apache.org/viewvc?view=revisionrevision=1084103 Remove unnecessary code that makes switching to other authentication methods difficult. Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp tomcat/tc6.0.x/trunk/webapps/manager/401.jsp tomcat/tc6.0.x/trunk/webapps/manager/403.jsp Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1343369r1=1343368r2=1343369view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 28 19:30:41 2012 @@ -176,6 +176,10 @@ documentation page. (rjung) /fix fix +bug52983/bug: Remove unnecessary code that makes switching to +other authentication methods difficult. (markt) + /fix + fix bug53158/bug: Fix documented defaults for DBCP. Patch provided by ph.dezanneau at gmail.com. (rjung) /fix Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp?rev=1343369r1=1343368r2=1343369view=diff == --- tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp Mon May 28 19:30:41 2012 @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --% -% - response.setHeader(WWW-Authenticate, Basic realm=\Tomcat Host Manager Application\); -% !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01//EN http://www.w3.org/TR/html4/strict.dtd; html head Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp?rev=1343369r1=1343368r2=1343369view=diff == --- tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp Mon May 28 19:30:41 2012 @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --% -% - response.setHeader(WWW-Authenticate, Basic realm=\Tomcat Host Manager Application\); -% !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01//EN http://www.w3.org/TR/html4/strict.dtd; html head Modified: tomcat/tc6.0.x/trunk/webapps/manager/401.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/401.jsp?rev=1343369r1=1343368r2=1343369view=diff == --- tomcat/tc6.0.x/trunk/webapps/manager/401.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/manager/401.jsp Mon May 28 19:30:41 2012 @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --% -% - response.setHeader(WWW-Authenticate, Basic realm=\Tomcat Manager Application\); -% !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01//EN http://www.w3.org/TR/html4/strict.dtd; html head Modified: tomcat/tc6.0.x/trunk/webapps/manager/403.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/403.jsp?rev=1343369r1=1343368r2=1343369view=diff == --- tomcat/tc6.0.x/trunk/webapps/manager/403.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/manager/403.jsp Mon May 28 19:30:41 2012 @@ -14,9 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. --% -% - response.setHeader(WWW-Authenticate, Basic realm=\Tomcat Manager Application\); -% !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01//EN http://www.w3.org/TR/html4/strict.dtd; html head - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1343301 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
2012/5/28 Konstantin Kolinko knst.koli...@gmail.com:
2012/5/28 ol...@apache.org:
Author: olamy
Date: Mon May 28 15:53:09 2012
New Revision: 1343301
URL: http://svn.apache.org/viewvc?rev=1343301view=rev
Log:
[MTOMCAT-155] allow exec-war war run dependencies that are generated in
current mvn execution, but not yet installed to maven repo
Submitted by Peter Lynch.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(...)
@@ -96,6 +94,13 @@ public abstract class AbstractExecWarMoj
private File buildDirectory;
/**
+ * Path under {@link #buildDirectory} where this mojo may do temporary
work.
+ *
+ * @parameter default-value=tomcat7-maven-plugin-exec
+ */
+ private String pluginWorkDirectory;
1. Would it be better to make it a File instead of a String, like
other fields there ?
2. It might be useful to allow absolute paths here.
E.g. if one wants to move it to the system temporary directory, or to
a RAM drive.
sounds good idea.
I will change that.
Thanks for the review!
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343375 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: olamy
Date: Mon May 28 19:41:03 2012
New Revision: 1343375
URL: http://svn.apache.org/viewvc?rev=1343375view=rev
Log:
use File rather than String
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1343375r1=1343374r2=1343375view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Mon May 28 19:41:03 2012
@@ -95,10 +95,10 @@ public abstract class AbstractExecWarMoj
/**
* Path under {@link #buildDirectory} where this mojo may do temporary
work.
*
- * @parameter default-value=tomcat7-maven-plugin-exec
+ * @parameter
default-value=${project.build.directory}/tomcat7-maven-plugin-exec
* @since 2.0
*/
-private String pluginWorkDirectory;
+private File pluginWorkDirectory;
/**
* @parameter default-value=src/main/tomcatconf
expression=${maven.tomcat.exec.war.tomcatConf}
@@ -515,14 +515,18 @@ public abstract class AbstractExecWarMoj
protected File resolvePluginWorkDir()
throws MojoExecutionException
{
-File workDir = new File( buildDirectory, pluginWorkDirectory );
-if ( !workDir.exists() !workDir.mkdirs() )
+if ( pluginWorkDirectory.exists() )
+{
+return pluginWorkDirectory;
+}
+
+if ( !pluginWorkDirectory.exists() !pluginWorkDirectory.mkdirs() )
{
throw new MojoExecutionException(
-Could not create plugin work directory at +
workDir.getAbsolutePath() );
+Could not create plugin work directory at +
pluginWorkDirectory.getAbsolutePath() );
}
-return workDir;
+return pluginWorkDirectory;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343379 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Author: kkolinko
Date: Mon May 28 19:52:11 2012
New Revision: 1343379
URL: http://svn.apache.org/viewvc?rev=1343379view=rev
Log:
Re r1343375 : simplify code. No functional change.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1343379r1=1343378r2=1343379view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Mon May 28 19:52:11 2012
@@ -515,11 +515,6 @@ public abstract class AbstractExecWarMoj
protected File resolvePluginWorkDir()
throws MojoExecutionException
{
-if ( pluginWorkDirectory.exists() )
-{
-return pluginWorkDirectory;
-}
-
if ( !pluginWorkDirectory.exists() !pluginWorkDirectory.mkdirs() )
{
throw new MojoExecutionException(
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53301] Servlet init method called twice with embedded Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301
Konstantin Kolinko knst.koli...@gmail.com changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|INVALID |---
Severity|major |normal
--- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com ---
Ok. Reproducible.
I modified your SampleServlet to print stacktrace when init() is called, like
this:
[[[
@Override
public void init( ServletConfig config )
throws ServletException
{
log.info( Init called, config=+config, new Throwable() );
super.init( config );
...
]]]
I'll attach full source later. There are two calls to init() in a row and stack
traces are the following:
[[[
00:58:32.187 [main] INFO init - Tomcat started on port:4396
00:58:32.609 [http-bio-auto-1-exec-1] INFO init - Init called,
config=org.apache.catalina.core.StandardWrapperFacade@15e2075
java.lang.Throwable: null
at org.apache.tomcat.tomcat53301.SampleServlet.init(SampleServlet.java:43)
[classes/:na]
at
org.apache.catalina.startup.Tomcat$ExistingStandardWrapper.loadServlet(Tomcat.java:854)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at org.apache.catalina.core.StandardWrapper.allocate(StandardWrapper.java:857)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:136)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:169)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:472)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:168)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:98)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:407)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:999)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:565)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:307)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
[na:1.6.0_32]
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
[na:1.6.0_32]
at java.lang.Thread.run(Thread.java:662) [na:1.6.0_32]
00:58:32.625 [http-bio-auto-1-exec-1] INFO init - Init called,
config=org.apache.catalina.core.StandardWrapperFacade@15e2075
java.lang.Throwable: null
at org.apache.tomcat.tomcat53301.SampleServlet.init(SampleServlet.java:43)
[classes/:na]
at
org.apache.catalina.core.StandardWrapper.initServlet(StandardWrapper.java:1266)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at org.apache.catalina.core.StandardWrapper.allocate(StandardWrapper.java:877)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:136)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:169)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:472)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:168)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:98)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:407)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:999)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:565)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:307)
[tomcat-embed-core-7.0.27.jar:7.0.27]
at
java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
[na:1.6.0_32]
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
[na:1.6.0_32]
at java.lang.Thread.run(Thread.java:662) [na:1.6.0_32]
]]]
Essentially it is the same single call to
[Bug 53301] Servlet init method called twice with embedded Tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=53301 --- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 28845 -- https://issues.apache.org/bugzilla/attachment.cgi?id=28845action=edit SampleServlet.java SampleServlet.java update. Added stackstace printing in init(). Overwrote destroy(). -- 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: r1343394 - /tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt
Date: Mon May 28 21:16:29 2012
New Revision: 1343394
URL: http://svn.apache.org/viewvc?rev=1343394view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53090
Include superclasses when considering injection targets
Patch provided by Borislav Kapukaranov
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1343394r1=1343393r2=1343394view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon
May 28 21:16:29 2012
@@ -30,6 +30,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -142,7 +143,7 @@ public class DefaultInstanceManager impl
private Object newInstance(Object instance, Class? clazz) throws
IllegalAccessException, InvocationTargetException, NamingException {
if (!ignoreAnnotations) {
-MapString, String injections = injectionMap.get(clazz.getName());
+MapString, String injections =
assembleInjectionsFromClassHierarchy(clazz);
populateAnnotationsCache(clazz, injections);
processAnnotations(instance, injections);
postConstruct(instance, clazz);
@@ -150,6 +151,19 @@ public class DefaultInstanceManager impl
return instance;
}
+private MapString, String assembleInjectionsFromClassHierarchy(Class?
clazz) {
+MapString, String injections = new HashMapString, String();
+MapString, String currentInjections = null;
+while (clazz != null) {
+currentInjections = this.injectionMap.get(clazz.getName());
+if (currentInjections != null) {
+injections.putAll(currentInjections);
+}
+clazz = clazz.getSuperclass();
+}
+return injections;
+}
+
@Override
public void destroyInstance(Object instance) throws
IllegalAccessException, InvocationTargetException {
if (!ignoreAnnotations) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343396 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 28 21:22:47 2012
New Revision: 1343396
URL: http://svn.apache.org/viewvc?rev=1343396view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53090
Include superclasses when considering injection targets
Patch provided by Borislav Kapukaranov
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1343394
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1343396r1=1343395r2=1343396view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Mon May 28 21:22:47 2012
@@ -30,6 +30,7 @@ import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -142,7 +143,7 @@ public class DefaultInstanceManager impl
private Object newInstance(Object instance, Class? clazz) throws
IllegalAccessException, InvocationTargetException, NamingException {
if (!ignoreAnnotations) {
-MapString, String injections = injectionMap.get(clazz.getName());
+MapString, String injections =
assembleInjectionsFromClassHierarchy(clazz);
populateAnnotationsCache(clazz, injections);
processAnnotations(instance, injections);
postConstruct(instance, clazz);
@@ -150,6 +151,19 @@ public class DefaultInstanceManager impl
return instance;
}
+private MapString, String assembleInjectionsFromClassHierarchy(Class?
clazz) {
+MapString, String injections = new HashMapString, String();
+MapString, String currentInjections = null;
+while (clazz != null) {
+currentInjections = this.injectionMap.get(clazz.getName());
+if (currentInjections != null) {
+injections.putAll(currentInjections);
+}
+clazz = clazz.getSuperclass();
+}
+return injections;
+}
+
@Override
public void destroyInstance(Object instance) throws
IllegalAccessException, InvocationTargetException {
if (!ignoreAnnotations) {
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=1343396r1=1343395r2=1343396view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 28 21:22:47 2012
@@ -119,6 +119,10 @@
fix
Enable host's xmlBase attribute in ContextConfig. (kfujino)
/fix
+ fix
+bug53090/bug: Include superclasses when considering injection
+targets. Patch provided by Borislav Kapukaranov. (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53090] Servlet superclass injection targets are ignored
https://issues.apache.org/bugzilla/show_bug.cgi?id=53090 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Thanks for the patch. It has been applied to trunk and 7.0.x and will be included in 7.0.28 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
svn commit: r1343400 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Mon May 28 21:43:31 2012
New Revision: 1343400
URL: http://svn.apache.org/viewvc?rev=1343400view=rev
Log:
Better error message if a ClassFormatException is encountered during
annotation scanning and do not fail to start the web app in that case.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1343400r1=1343399r2=1343400view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon May 28
21:43:31 2012
@@ -1854,6 +1854,9 @@ public class ContextConfig implements Li
} catch (IOException e) {
log.error(sm.getString(contextConfig.inputStreamJar,
entryName, url),e);
+} catch (ClassFormatException e) {
+log.error(sm.getString(contextConfig.inputStreamJar,
+entryName, url),e);
} finally {
if (is != null) {
try {
@@ -1910,6 +1913,9 @@ public class ContextConfig implements Li
} catch (IOException e) {
log.error(sm.getString(contextConfig.inputStreamJndi,
url),e);
+} catch (ClassFormatException e) {
+log.error(sm.getString(contextConfig.inputStreamJndi,
+url),e);
} finally {
if (is != null) {
try {
@@ -1942,6 +1948,9 @@ public class ContextConfig implements Li
} catch (IOException e) {
log.error(sm.getString(contextConfig.inputStreamFile,
file.getAbsolutePath()),e);
+} catch (ClassFormatException e) {
+log.error(sm.getString(contextConfig.inputStreamFile,
+file.getAbsolutePath()),e);
} finally {
if (fis != null) {
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343401 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Author: markt
Date: Mon May 28 21:46:11 2012
New Revision: 1343401
URL: http://svn.apache.org/viewvc?rev=1343401view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53161
Better error message if a ClassFormatException is encountered during
annotation scanning and do not fail to start the web app in that case.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1343400
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1343401r1=1343400r2=1343401view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon May 28 21:46:11 2012
@@ -1923,6 +1923,9 @@ public class ContextConfig implements Li
} catch (IOException e) {
log.error(sm.getString(contextConfig.inputStreamJar,
entryName, url),e);
+} catch (ClassFormatException e) {
+log.error(sm.getString(contextConfig.inputStreamJar,
+entryName, url),e);
} finally {
if (is != null) {
try {
@@ -1979,6 +1982,9 @@ public class ContextConfig implements Li
} catch (IOException e) {
log.error(sm.getString(contextConfig.inputStreamJndi,
url),e);
+} catch (ClassFormatException e) {
+log.error(sm.getString(contextConfig.inputStreamJndi,
+url),e);
} finally {
if (is != null) {
try {
@@ -2011,6 +2017,9 @@ public class ContextConfig implements Li
} catch (IOException e) {
log.error(sm.getString(contextConfig.inputStreamFile,
file.getAbsolutePath()),e);
+} catch (ClassFormatException e) {
+log.error(sm.getString(contextConfig.inputStreamFile,
+file.getAbsolutePath()),e);
} finally {
if (fis != null) {
try {
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=1343401r1=1343400r2=1343401view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 28 21:46:11 2012
@@ -123,6 +123,11 @@
bug53090/bug: Include superclasses when considering injection
targets. Patch provided by Borislav Kapukaranov. (markt)
/fix
+ fix
+bug53161/bug: Provide a better error message if a
+codeClassFormatException/code occurs during annotation scanning and
+do not prevent the web application from starting in this case. (markt)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53161] Need better error message for annotation scanning errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=53161 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas ma...@apache.org --- Fixed in trunk and 7.0.x and will be included in 7.0.28 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
svn commit: r1343405 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/ webapps/host-manager/ webapps/host-manager/WEB-INF/ webapps/host-manager/WEB-INF/jsp/ webapps/manager/ webapps/manager/WEB-INF/ webapp
Author: kkolinko Date: Mon May 28 22:03:49 2012 New Revision: 1343405 URL: http://svn.apache.org/viewvc?rev=1343405view=rev Log: Part 2 of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 Prevent the custom error pages for the Manager and Host Manager applications from being accessed directly. It is backport of r1084109 CTR: There was an error in host-manager's web.xml that 401.jsp and 403.jsp were not configured in it. It is r826294 in trunk and should have been ported to 6.0 in r1030547. I added error-page configuration for those files. Added: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp - copied unchanged from r1343399, tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp - copied unchanged from r1343399, tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/401.jsp - copied unchanged from r1343399, tomcat/tc6.0.x/trunk/webapps/manager/401.jsp tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp - copied unchanged from r1343399, tomcat/tc6.0.x/trunk/webapps/manager/403.jsp Removed: tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp tomcat/tc6.0.x/trunk/webapps/manager/401.jsp tomcat/tc6.0.x/trunk/webapps/manager/403.jsp Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1343405r1=1343404r2=1343405view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 28 22:03:49 2012 @@ -157,15 +157,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 - Remove unnecessary code that makes switching to other authentication methods - difficult. Also prevent the custom error pages for the Manager and Host - Manager applications from being accessed directly. - http://svn.apache.org/viewvc?view=revisionrevision=1084103 - http://svn.apache.org/viewvc?view=revisionrevision=1084109 - +1: markt, kkolinko, kfujino - -1: - * Fix several trivial HTML markup errors in example servlets e.g. duplicate body tag preceding head and tr following /table http://people.apache.org/~kkolinko/patches/2012-05-13_tc6_sampleservlets.patch Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1343405r1=1343404r2=1343405view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 28 22:03:49 2012 @@ -193,6 +193,12 @@ uses DataSource.getConnection(username, password) method. Not all data source implementations support it. (kkolinko) /update + fix +Prevent the custom error pages for the Manager and Host Manager +applications from being accessed directly. Configure custom +pages for error codes 401 and 403 in Host Manager application. +(markt/kkolinko) + /fix /changelog /subsection subsection name=Other Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml?rev=1343405r1=1343404r2=1343405view=diff == --- tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/web.xml Mon May 28 22:03:49 2012 @@ -151,4 +151,13 @@ role-nameadmin/role-name /security-role + error-page +error-code401/error-code +location/WEB-INF/jsp/401.jsp/location + /error-page + error-page +error-code403/error-code +location/WEB-INF/jsp/403.jsp/location + /error-page + /web-app Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?rev=1343405r1=1343404r2=1343405view=diff == --- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Mon May 28 22:03:49 2012 @@ -286,11 +286,11 @@ error-page error-code401/error-code -location/401.jsp/location +location/WEB-INF/jsp/401.jsp/location /error-page error-page error-code403/error-code -
svn commit: r1343406 - in /tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp: 401.jsp 403.jsp
Author: kkolinko Date: Mon May 28 22:13:14 2012 New Revision: 1343406 URL: http://svn.apache.org/viewvc?rev=1343406view=rev Log: Correct typos in host-manager error pages. These are already fixed in trunk by r1060486 Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp?rev=1343406r1=1343405r2=1343406view=diff == --- tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/401.jsp Mon May 28 22:13:14 2012 @@ -62,7 +62,7 @@ liThe deprecated ttadmin/tt role should not be assigned to any user./li liUsers with the ttadmin-gui/tt role should not be granted the - ttmanager-script/tt role./li + ttadmin-script/tt role./li liIf the text interface is accessed through a browser (e.g. for testing since this interface is intended for tools not humans) then the browser must be closed afterwards to terminate the session./li Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp?rev=1343406r1=1343405r2=1343406view=diff == --- tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/host-manager/WEB-INF/jsp/403.jsp Mon May 28 22:13:14 2012 @@ -77,7 +77,7 @@ liThe deprecated ttadmin/tt role should not be assigned to any user./li liUsers with the ttadmin-gui/tt role should not be granted the - ttmanager-script/tt role./li + ttadmin-script/tt role./li liIf the text interface is accessed through a browser (e.g. for testing since this interface is intended for tools not humans) then the browser must be closed afterwards to terminate the session./li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1343410 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/deployer-howto.xml
Author: kkolinko Date: Mon May 28 22:25:48 2012 New Revision: 1343410 URL: http://svn.apache.org/viewvc?rev=1343410view=rev Log: Documentation: s/manager/manager-script/ in deployer-howto.xml All other changes from r1060486 have already been applied to 6.0 so mark it as merged. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1060486 Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1343410r1=1343409r2=1343410view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Mon May 28 22:25:48 2012 @@ -324,7 +324,7 @@ /li li codeusername/code: Tomcat Manager username (user should have a role of -manager) +manager-script) /li licodepassword/code: Tomcat Manager password./li /ul - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52983] DIGEST auth broken on 6.0.x manager app because of redundant WWW-Authenticate header in 401.jsp
https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- Fixed in 6.0 by r1343369 and r1343405 and will be in 6.0.36 In 7.0 it is already fixed by r1084103 which is included in 7.0.12. -- 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: r1343411 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon May 28 22:39:41 2012 New Revision: 1343411 URL: http://svn.apache.org/viewvc?rev=1343411view=rev Log: Formally propose additional patch, that was mentioned in the vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1343411r1=1343410r2=1343411view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 28 22:39:41 2012 @@ -110,6 +110,11 @@ PATCHES PROPOSED TO BACKPORT: (explained in https://issues.apache.org/bugzilla/show_bug.cgi?id=52830#c6 ) -1: + Additional patch: + http://svn.apache.org/viewvc?rev=1304468view=rev + +1: kkolinko + -1: + * https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 Fix parsing of Content-Type http://svn.apache.org/viewvc?rev=1300154view=rev (new HTTP header parser) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1343400 - svn:log
Author: kkolinko Revision: 1343400 Modified property: svn:log Modified: svn:log at Mon May 28 22:46:20 2012 -- --- svn:log (original) +++ svn:log Mon May 28 22:46:20 2012 @@ -1,2 +1,3 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53161 Better error message if a ClassFormatException is encountered during annotation scanning and do not fail to start the web app in that case. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53090] Servlet superclass injection targets are ignored
https://issues.apache.org/bugzilla/show_bug.cgi?id=53090 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- Re r1343396 : I wonder whether interfaces should be scanned as well. Can injection-target-class be an interface? -- 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: r1343431 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon May 28 23:42:00 2012 New Revision: 1343431 URL: http://svn.apache.org/viewvc?rev=1343431view=rev Log: Propose backport of r1342795 Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1343431r1=1343430r2=1343431view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 28 23:42:00 2012 @@ -36,3 +36,11 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -0: markt (see https://issues.apache.org/bugzilla/show_bug.cgi?id=52579#c8) -1: + +* https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14 + Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is + recycled. + http://svn.apache.org/viewvc?rev=1342795view=rev + (r1342797 in Tomcat 7) + +1: kkolinko + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1343431r1=1343430r2=1343431view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 28 23:42:00 2012 @@ -169,6 +169,14 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, rjung -1: +* https://issues.apache.org/bugzilla/show_bug.cgi?id=52055#c14 + Correctly reset ChunkedInputFilter.needCRLFParse flag when the filter is + recycled. + http://svn.apache.org/viewvc?rev=1342795view=rev + (r1342797 in Tomcat 7) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
