Re: Who wants my Cassandra session manager for Tomcat?
On 4 Apr 2012, at 17:19, Morten Jorgensen morten.jorgen...@openjawtech.com wrote: Thanks again for your comments. More replies below: That's interesting. Can you share some details about how it works? Sure. It is quite simple. Cassandra is effectively a multi-level distributed hash-map, so it lends itself very well do storing session attributes. The session manager maintains two column families (like tables), one to hold session meta-data such as the last access timestamp, etc. and one column family to hold session attributes. Storing or reading a session attribute is simply a matter of writing it using the session ID as the row ID, and the session attribute name as the column name, and the session attribute value as the column value. Session attributes are read and written independently, so the entire web session does not have to be loaded into memory - only the session attributes that are actually required to service a request are read. This greatly reduces the memory footprint of the web applications that I am developing for my employer. I'd be concerned about how chatty that was. Devil's advocate question: why store data in the session if it's not needed? Good question. For large web applications, and particularly web-based UIs with multiple user screens, you would have certain data in your session for the various screens/pages. Not if I could avoid it, I wouldn't. I might have user data or refs that I need for each page, but everything else goes in request scope. Not all pages need _all_ data in your session, and since the session manager loads session attributes only when the web app code asks for it, only the data that is required for the current page is loaded from Cassandra. For improved performance I have added a write-through and a write-back cache, implemented as servlet filters. The cache is flushed or written back once the current request has finished processing. I am sure there is room for improvement here, as multiple concurrent requests for the same session should be served using the same cache instance. But... (more devil's advocating, sorry) while this should address the chattiness* problem, doesn't it mean that your solution is invasive and can't be really deployed without modifying an app? The session manager works without this cache, but is slow. The cache is configured as a filter configured in web.xml. The code of a web app won't have to be changed, but you need to update your web.xml to use the session manager effectively. Adding a Filter means modifying the app. /pedant * is that even a word? Yes it is, according to dictionary.com The Manager does not maintain any references to Session instances at all, allowing them to be garbage collected at any time. This makes things very simple, as Cassandra holds all session state, and the session managers in my Tomcat nodes only act as a cache in front of Cassandra. The nature of Cassandra and the Tomcat's implementation of web sessions go together extremely well. I am surprised that nothing like this exists already. It is a square hole, square peg sort of scenario. I'm not entirely sure I agree. Cassandra trades off consistency for availability and partition tolerance, whereas I'd suggest a session management solution would want to trade partition tolerance for consistency and availability. I'm also not sure that the comparison between column store and session attribute map stands up beyond the initial/apparent similarity between data type. Cassandra is write-optimised and hits disk (on at least two nodes for HA) for every write AFAIK. Cassandra allows you choose your consistency level. I use a quorum write, which writes to (N/2)+1 Cassandra nodes, where the Cassandra ring contains N nodes. But as you say, you've discovered why this is slow for a webapp, and you have to add a cache to each request to fix it. I'd suggest you'd be better off just loading data into the request scope directly, rather than indirectly. I think this makes sense for web session data, and my current implementation has this consistency-level hard-coded. I think it would probably make sense to allow this to be configured. I also have an implementation of the Map interface that stores the values of each entry as a session attribute. The way many developers write web applications is to have a session bean (a session attribute) that contains a Map that maintains the actual session attributes. This is OK if the entire session is persisted as a whole, but it won't perform very well with the Cassandra session manager (or the Delta Session Manager from what I understand). A developer can replace their session bean's HashMap with the SessionMap utility, and the session attributes will be treated as proper session attributes by the session manager. Is there not a way to do this internally therefore transparently to the developer? Otherwise you're introducing more
[jira] [Created] (MTOMCAT-135) tomcat7:run does not load HandlesTypes in application classes
tomcat7:run does not load HandlesTypes in application classes
-
Key: MTOMCAT-135
URL: https://issues.apache.org/jira/browse/MTOMCAT-135
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Mac OS X, Apple JDK 1.6
Reporter: Gildas Cuisinier
Assignee: Olivier Lamy (*$^¨%`£)
Spring 3.1 brings a SpringServletContainerInitializer, that has annotation
@HandlesTypes(WebApplicationInitializer.class).
In my application, I have a WebApplicationInitializer directly in my war. This
one is compiled and put in WEB-INF/classes.
When launching with tomcat7:run-war, my WebApplicationInitializer is correctly
found by tomcat and provided to SpringServletContainerInitializer.
But with tomcat7:run, I've this line in logs :
INFO: No Spring WebApplicationInitializer types detected on classpath
It seems that the problems come from the ContextConfig classe (from tomcat
source), in method webConfig that specificly search a WEB-INF/classes :
// Step 4. Process /WEB-INF/classes for annotations
// This will add any matching classes to the typeInitializerMap
if (ok) {
// Hack required by Eclipse's serve modules without
// publishing feature since this backs WEB-INF/classes by
// multiple locations rather than one.
NamingEnumerationBinding listBindings = null;
try {
try {
listBindings = context.getResources().listBindings(
/WEB-INF/classes);
} catch (NameNotFoundException ignore) {
// Safe to ignore
}
--
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: r1309734 - in /tomcat/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/config/listeners.xml
Author: kfujino
Date: Thu Apr 5 10:08:38 2012
New Revision: 1309734
URL: http://svn.apache.org/viewvc?rev=1309734view=rev
Log:
Add new attributes of enabled and disabled to UserConfig.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1309734r1=1309733r2=1309734view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Thu Apr 5
10:08:38 2012
@@ -25,6 +25,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.regex.Pattern;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
@@ -99,6 +100,15 @@ public final class UserConfig
private String userClass =
org.apache.catalina.startup.PasswdUserDatabase;
+/**
+ * A regular expression defining user who deployment is allowed.
+ */
+protected Pattern enabled = null;
+
+/**
+ * A regular expression defining user who deployment is denied.
+ */
+protected Pattern disabled = null;
// - Properties
@@ -210,6 +220,50 @@ public final class UserConfig
}
+/**
+ * Return the regular expression used to test for user who deployment is
allowed.
+ */
+public String getEnabled() {
+if (enabled == null) return null;
+return enabled.toString();
+}
+
+
+/**
+ * Set the regular expression used to test for user who deployment is
allowed.
+ *
+ * @param enabled The new enabled expression
+ */
+public void setEnabled(String enabled) {
+if (enabled == null || enabled.length() == 0) {
+this.enabled = null;
+} else {
+this.enabled = Pattern.compile(enabled);
+}
+}
+
+
+/**
+ * Return the regular expression used to test for user who deployment is
denied.
+ */
+public String getDisabled() {
+if (disabled == null) return null;
+return disabled.toString();
+}
+
+
+/**
+ * Set the regular expression used to test for user who deployment is
denied.
+ *
+ * @param disabled The new disabled expression
+ */
+public void setDisabled(String disabled) {
+if (disabled == null || disabled.length() == 0) {
+this.disabled = null;
+} else {
+this.disabled = Pattern.compile(disabled);
+}
+}
// - Public Methods
@@ -270,6 +324,7 @@ public final class UserConfig
while (users.hasMoreElements()) {
String user = users.nextElement();
String home = database.getHome(user);
+if (!isDeployEnabled(user)) continue;
results.add(executor.submit(new DeployUserDirectory(this, user,
home)));
}
@@ -348,6 +403,26 @@ public final class UserConfig
}
+/**
+ * Test enabled and disabled rules for the provided user.
+ *
+ * @return codetrue/code if this user is allowed to deploy,
+ * codefalse/code otherwise
+ */
+private boolean isDeployEnabled(String user) {
+if (disabled != null disabled.matcher(user).matches()) {
+return false;
+}
+if (enabled != null) {
+if (enabled.matcher(user).matches()) {
+return true;
+} else {
+return false;
+}
+}
+return true;
+}
+
private static class DeployUserDirectory implements Runnable {
private UserConfig config;
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1309734r1=1309733r2=1309734view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Thu Apr 5 10:08:38 2012
@@ -341,6 +341,60 @@
/subsection
+ subsection name=UserConfig - org.apache.catalina.startup.UserConfig
+
+pThe strongUserConfig/strong provides feature of User Web
Applications.
+User Web Applications map a request URI starting with a tilde character
(~)
+and a username to a directory (commonly named public_html) in that user's
+home directory on the server./p
+
+pSee the a href=host.html#User Web ApplicationsUser Web
Applications/a
+special feature on the strongHost/strong element for more
information./p
+
+pThe following additional attributes are
svn commit: r1309736 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml
Author: kfujino
Date: Thu Apr 5 10:18:56 2012
New Revision: 1309736
URL: http://svn.apache.org/viewvc?rev=1309736view=rev
Log:
Add new attributes of enabled and disabled to UserConfig.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1309736r1=1309735r2=1309736view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java Thu
Apr 5 10:18:56 2012
@@ -25,6 +25,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.regex.Pattern;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
@@ -99,6 +100,15 @@ public final class UserConfig
private String userClass =
org.apache.catalina.startup.PasswdUserDatabase;
+/**
+ * A regular expression defining user who deployment is allowed.
+ */
+protected Pattern enabled = null;
+
+/**
+ * A regular expression defining user who deployment is denied.
+ */
+protected Pattern disabled = null;
// - Properties
@@ -210,6 +220,50 @@ public final class UserConfig
}
+/**
+ * Return the regular expression used to test for user who deployment is
allowed.
+ */
+public String getEnabled() {
+if (enabled == null) return null;
+return enabled.toString();
+}
+
+
+/**
+ * Set the regular expression used to test for user who deployment is
allowed.
+ *
+ * @param enabled The new enabled expression
+ */
+public void setEnabled(String enabled) {
+if (enabled == null || enabled.length() == 0) {
+this.enabled = null;
+} else {
+this.enabled = Pattern.compile(enabled);
+}
+}
+
+
+/**
+ * Return the regular expression used to test for user who deployment is
denied.
+ */
+public String getDisabled() {
+if (disabled == null) return null;
+return disabled.toString();
+}
+
+
+/**
+ * Set the regular expression used to test for user who deployment is
denied.
+ *
+ * @param disabled The new disabled expression
+ */
+public void setDisabled(String disabled) {
+if (disabled == null || disabled.length() == 0) {
+this.disabled = null;
+} else {
+this.disabled = Pattern.compile(disabled);
+}
+}
// - Public Methods
@@ -270,6 +324,7 @@ public final class UserConfig
while (users.hasMoreElements()) {
String user = users.nextElement();
String home = database.getHome(user);
+if (!isDeployEnabled(user)) continue;
results.add(executor.submit(new DeployUserDirectory(this, user,
home)));
}
@@ -348,6 +403,26 @@ public final class UserConfig
}
+/**
+ * Test enabled and disabled rules for the provided user.
+ *
+ * @return codetrue/code if this user is allowed to deploy,
+ * codefalse/code otherwise
+ */
+private boolean isDeployEnabled(String user) {
+if (disabled != null disabled.matcher(user).matches()) {
+return false;
+}
+if (enabled != null) {
+if (enabled.matcher(user).matches()) {
+return true;
+} else {
+return false;
+}
+}
+return true;
+}
+
private static class DeployUserDirectory implements Runnable {
private UserConfig config;
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=1309736r1=1309735r2=1309736view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 5 10:18:56 2012
@@ -53,6 +53,15 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not pop up wrt. others).
--
+section name=Tomcat 7.0.28 (markt)
+ subsection name=Catalina
+changelog
+ add
+Add new attributes of enabled and disabled to UserConfig. (kfujino)
+ /add
+/changelog
+ /subsection
+/section
section name=Tomcat 7.0.27 (markt)
subsection name=Catalina
changelog
Modified:
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2922 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1309734 Blamelist: kfujino BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1309734 - in /tomcat/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/config/listeners.xml
2012/4/5 kfuj...@apache.org:
Author: kfujino
Date: Thu Apr 5 10:08:38 2012
New Revision: 1309734
URL: http://svn.apache.org/viewvc?rev=1309734view=rev
Log:
Add new attributes of enabled and disabled to UserConfig.
The name enabled is usually used for a boolean attribute that
disables a feature as a whole.
Maybe name the new attributes as enabledUser and disabledUser ?
Modified:
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1309734r1=1309733r2=1309734view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Thu Apr 5
10:08:38 2012
@@ -25,6 +25,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.regex.Pattern;
import org.apache.catalina.Context;
import org.apache.catalina.Host;
@@ -99,6 +100,15 @@ public final class UserConfig
private String userClass =
org.apache.catalina.startup.PasswdUserDatabase;
+ /**
+ * A regular expression defining user who deployment is allowed.
+ */
+ protected Pattern enabled = null;
+
+ /**
+ * A regular expression defining user who deployment is denied.
+ */
+ protected Pattern disabled = null;
// -
Properties
@@ -210,6 +220,50 @@ public final class UserConfig
}
+ /**
+ * Return the regular expression used to test for user who deployment is
allowed.
+ */
+ public String getEnabled() {
+ if (enabled == null) return null;
+ return enabled.toString();
+ }
+
+
+ /**
+ * Set the regular expression used to test for user who deployment is
allowed.
+ *
+ * @param enabled The new enabled expression
+ */
+ public void setEnabled(String enabled) {
+ if (enabled == null || enabled.length() == 0) {
+ this.enabled = null;
+ } else {
+ this.enabled = Pattern.compile(enabled);
+ }
+ }
+
+
+ /**
+ * Return the regular expression used to test for user who deployment is
denied.
+ */
+ public String getDisabled() {
+ if (disabled == null) return null;
+ return disabled.toString();
+ }
+
+
+ /**
+ * Set the regular expression used to test for user who deployment is
denied.
+ *
+ * @param disabled The new disabled expression
+ */
+ public void setDisabled(String disabled) {
+ if (disabled == null || disabled.length() == 0) {
+ this.disabled = null;
+ } else {
+ this.disabled = Pattern.compile(disabled);
+ }
+ }
// - Public
Methods
@@ -270,6 +324,7 @@ public final class UserConfig
while (users.hasMoreElements()) {
String user = users.nextElement();
String home = database.getHome(user);
+ if (!isDeployEnabled(user)) continue;
It can be moved up by one line.
The home value is not needed to call isDeployEnabled().
results.add(executor.submit(new DeployUserDirectory(this, user,
home)));
}
@@ -348,6 +403,26 @@ public final class UserConfig
}
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/523 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1309736 Blamelist: kfujino BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: svn commit: r1309734 - in /tomcat/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/config/listeners.xml
On 05/04/2012 11:46, Konstantin Kolinko wrote: 2012/4/5 kfuj...@apache.org: Author: kfujino Date: Thu Apr 5 10:08:38 2012 New Revision: 1309734 URL: http://svn.apache.org/viewvc?rev=1309734view=rev Log: Add new attributes of enabled and disabled to UserConfig. The name enabled is usually used for a boolean attribute that disables a feature as a whole. Maybe name the new attributes as enabledUser and disabledUser ? allow and deny would be consistent with other valves. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of Electronic cigarettes Nutritious Smoker's paradise by antonychris
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The Electronic cigarettes Nutritious Smoker's paradise page has been changed by antonychris: http://wiki.apache.org/tomcat/Electronic%20cigarettes%20Nutritious%20Smoker%27s%20paradise New page: Smokeless cigarettes are ambiance helpful and they are permissible particularly public facilities such as watering holes, dining places, and also air-ports and so on where tobacco cigarettes are generally forbidden.Electric cigarettes tend to be cheaper and more hassle-free as compared to conventional cigarettes. People who smoke can conserve around 80% an average of smoking cigarettes fees. Additionally many of us supply that in your entrance action, saving you the time along with cost of visiting the store. Hookah smoking cigarettes is among the most popular historic method of using tobacco turned through the Middle Far east and also Nigeria. The shisha is a device which holds tobacco, water, an electric heating supply and it is inhaled using a pipe-like hose. The trend regarding hookah smoking cigarettes is becoming common in watering holes in addition to coffee shops, bookstores currently especially in metropolitan areas. The stogie is a little roll of tobacco leaf. This manner involving smoking cigarettes can be classified as being a lot more classy in comparison to using tobacco standard cigarettes and also loved by professional classes. [[http://www.breathefreshecigs.com|electronic cigarette]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of LocalBadContent by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The LocalBadContent page has been changed by KonstantinKolinko: http://wiki.apache.org/tomcat/LocalBadContent?action=diffrev1=44rev2=45 Comment: Add spam address blog-city\.com bodybuilding bravepages\.com + breathefreshecigs\.com buchete\.ro buyyourall\.com buzzbacklinks\.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of PoweredBy by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The PoweredBy page has been changed by KonstantinKolinko:
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=404rev2=405
Comment:
Remove edit conflict markers. Move wac hosting according to alphabetic order.
[[http://www.a2hosting.com/|A2 Hosting]] -
[[http://www.a2hosting.com/server-software/tomcat-hosting|Tomcat Hosting]] is
available on CentOS, Debian, Fedora or Ubuntu VPS packages. Install Tomcat in
moments with A2 Hosting's exclusive Quickinstaller tool.
=== AcuGIS Hosting ===
-
- /!\ '''Edit conflict - other version:'''
-
-
-
-
- /!\ '''Edit conflict - your version:'''
-
-
-
-
- /!\ '''End of edit conflict'''
-
-
-
-
- /!\ '''Edit conflict - other version:'''
-
-
-
-
- /!\ '''Edit conflict - your version:'''
-
-
-
- === AcuGIS Hosting ===
-
- /!\ '''End of edit conflict'''
-
-
{{http://www.acugis.com/images/logo.png}}
[[http://www.acugis.com/|AcuGIS]] Tomcat hosting solutions with emphasis on
GIS (GeoServer and PostGIS). Tomcat 6 and 7 options with private JVM. High
performance hosting with SAS 15k disks and 1 Gb public/private network on all
hosting plans.
+
+ === björn hahnefeld IT TC_Framework ===
+ {{http://www.hahnefeld.de/images/archive/logo.png}} björn hahnefeld IT
TC_Framework [[http://www.hahnefeld.de|björn hahnefeld IT]] runs on Tomcat. It
is a Framework for the ATOSS employee portal with runs on Tomcat too.
Hosting-Plans for the björn hahnefeld IT TC_Framework can be booked under
[[http://www.hahnefeld.de/internet-services_server.html|Tomcat Co-Location and
Serverhousing]]. The björn hahnefeld IT TC_Framework for project and time
control is live in action in seven companies at the moment:
[[http://www.schoen-alarm.at|Dallmeier]], Shop for
[[http://www.video-security-solutions.eu/recorder/hybrid-recorder-videonetbox|VideoNetBox]]
/ [[http://www.video-security-solutions.eu|Dallmeier]],
[[http://www.schmuckmuschel.de|Design Schmuck]],
[[http://www.brot-und-wein.eu|Wein Shop]],
[[http://www.video-security-solutions.at|EverFocus]],
[[http://www.more-passion.com|Potenzmittel]] and
[[http://www.bdsm-passion.com|Orgasmuskontrolle]].
+
+ === Bodhost.com ===
+ [[http://www.bodhost.com/|BODHost]] - Proud to be Apache Tomcat Hosting
Provider
+
+ === DreamShared ===
+ {{http://www.dreamshared.com/site/images/v2/logo_no_bg.png}}
[[http://www.dreamshared.com/|DreamShared]] uses Tomcat to help people design
and host unique, stylish, custom business websites and wedding websites.
+
+ === eApps Hosting ===
+ {{http://www.eapps.com/images/header_logo.jpg}}
http://www.eapps.com/applications/tomcat-hosting.php eApps Hosting has provided
hosting for Java applications using Tomcat since 2000 and now offers Tomcat
hosting in a reliable, economical VPS container with 24/7 support by in-house
staff.
+
+ === Enciva ===
+ {{http://www.enciva.com/images/logo.gif}}
+
+ [[http://www.enciva.com/|Enciva Solutions Ltd.]] offers premium U.S. and U.K
based Tomcat hosting solutions. MySQL, Oracle, and PostgreSQL database options.
Tomcat 5, 6, and 7. All plans feature private JVM and 1Gbps network speed. VPS
and dedicated solutions also available.
+
+ === Energized Hosting ===
+ [[http://www.energizedhosting.com|Energized Hosting]] uses Tomcat for its
[[http://www.energizedhosting.com/hosting_jsp.html|Servlet/JSP hosting]] needs.
+
+ === Gecko 26 ===
+
[[http://www.gecko26.com|{{http://www.gecko26.com/images/logo.jpg|http://www.gecko26.com}}]]
+
+ [[http://www.gecko26.com.au|Gecko 26]] use Tomcat to provide Servlet/JSP
virtual hosting.
+
+ === HomeHost ===
+ {{http://www.homehost.com.br/images/logo_peq_homehost.gif}}
[[http://www.homehost.com.br/|HomeHost - Hospedagem de Sites]] provides
webhosting with support to JSP/Servlets by using Tomcat.
+
+ === Hosting Habitat ===
+ {{http://statictwo.hostinghabitat.net/images/logo.png}}
[[http://hostinghabitat.com/vps-hosting.html|Hosting Habitat - VPS Hosting]]
Hosting Habitat is a company based in South Africa offering support for Apache
Tomcat on all VPS hosting plans.
+
+ === Hosting Planet Limited ===
+ {{http://www.planet-hosting.net/design/site/jhosting/image/logo.gif}}
http://www.planet-hosting.net Hosting Planet Limited is hosting company
offering Java hosting using private JVM. All hosting plans including Tomcat as
JSP/Servlet container.
+
+ === InnoShare ===
+ {{http://webmail.innoshare.com/images/innoshare_logo_small.jpg}}
[[http://www.innoshare.com/|InnoShare]] - A full-service
[[http://www.innoshare.com/services/atlanta-website-design|web design]],
[[http://www.innoshare.com/services/atlanta-email-newsletters|email
newsletter]],
[[http://www.innoshare.com/services/atlanta-business-web-hosting|web hosting]]
and
[[http://www.innoshare.com/services/atlanta-search-engine-optimization|search
engine optimization]]
[jira] [Created] (MTOMCAT-136) Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader fails with run goal
Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader fails with run
goal
---
Key: MTOMCAT-136
URL: https://issues.apache.org/jira/browse/MTOMCAT-136
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0-beta-1
Environment: Java 1.6.0_26, Maven 3.0.4, OS X 10.7.3
Reporter: Leigh Anderson
Assignee: Olivier Lamy (*$^¨%`£)
Priority: Minor
I'm trying to start a web application with 'mvn tomcat7:run'. It seems
that with the configuration below it fails with the following error:
[INFO]
[ERROR] Failed to execute goal
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-beta-1:run (default-cli) on
project mantis-test-web-app: No such archiver: 'jar'. - [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with
the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
I have also tried
* 'mvn tomcat:run-war', which seems to get past this point, but then
the application will not start because the 'additionalClasspathDir' property is
not supported by the 'run-war' goal.
* removing 'useSeparateTomcatClassLoader' which then doesn't load the
Spring instrumenting class loader required to use AspectJ LTW, specified in
context.xml. I have confirmed that I get the same 'no such archiver' error if I
remove the context.xml, so I don't believe this to be the cause.
Plugin configuration:
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
systemProperties
log4j.defaultInitOverridetrue/log4j.defaultInitOverride
HOSTNAMElocalhost/HOSTNAME
port.http9090/port.http
port.https8443/port.https
/systemProperties
port9090/port
httpsPort8443/httpsPort
path//path
useTestClasspathfalse/useTestClasspath
additionalClasspathDirs
additionalClasspathDir${project.basedir}/config/additionalClasspathDir
/additionalClasspathDirs
useSeparateTomcatClassLoadertrue/useSeparateTomcatClassLoader
/configuration
dependencies
dependency
groupIdorg.springframework/groupId
artifactIdspring-instrument-tomcat/artifactId
version${spring.version}/version
/dependency
/dependencies
/plugin
--
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
[Tomcat Wiki] Update of FAQ/Developing by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The FAQ/Developing page has been changed by ChristopherSchultz: http://wiki.apache.org/tomcat/FAQ/Developing?action=diffrev1=13rev2=14 Comment: Added links to Tomcat's Building with Eclipse user guide section. }}} If you look in (project root)/res/ide-support/eclipse/java-compiler-errors-warnings.txt, you'll see a set of compiler warnings and import organization rules that you will have to set up manually in your project. If you set those up properly, you are more likely to submit cleaner patches. + + A full explanation for Tomcat in Eclipse can be found here: + Tomcat 7.0.x: http://tomcat.apache.org/tomcat-7.0-doc/building.html#Building_with_Eclipse + Tomcat 6.0.x: http://tomcat.apache.org/tomcat-6.0-doc/building.html#Building_with_Eclipse === Debugging === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of FAQ/Developing by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The FAQ/Developing page has been changed by ChristopherSchultz: http://wiki.apache.org/tomcat/FAQ/Developing?action=diffrev1=14rev2=15 If you look in (project root)/res/ide-support/eclipse/java-compiler-errors-warnings.txt, you'll see a set of compiler warnings and import organization rules that you will have to set up manually in your project. If you set those up properly, you are more likely to submit cleaner patches. A full explanation for Tomcat in Eclipse can be found here: - Tomcat 7.0.x: http://tomcat.apache.org/tomcat-7.0-doc/building.html#Building_with_Eclipse + * Tomcat 7.0.x: http://tomcat.apache.org/tomcat-7.0-doc/building.html#Building_with_Eclipse - Tomcat 6.0.x: http://tomcat.apache.org/tomcat-6.0-doc/building.html#Building_with_Eclipse + * Tomcat 6.0.x: http://tomcat.apache.org/tomcat-6.0-doc/building.html#Building_with_Eclipse === Debugging === - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1309869 - in /tomcat/site/trunk: docs/ xdocs/
Author: markt Date: Thu Apr 5 14:14:48 2012 New Revision: 1309869 URL: http://svn.apache.org/viewvc?rev=1309869view=rev Log: Updates (excluding docs) for 7.0.27 release Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-7.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1309869r1=1309868r2=1309869view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Apr 5 14:14:48 2012 @@ -55,8 +55,8 @@ release Version nameLatest Stable 7.0.x Release/name -created2012-02-21/created -revision7.0.26/revision +created2012-04-05/created +revision7.0.27/revision /Version /release release Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1309869r1=1309868r2=1309869view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Thu Apr 5 14:14:48 2012 @@ -218,8 +218,8 @@ blockquote a href=http://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a | -a href=#7.0.267.0.26/a | -a href=[preferred]tomcat/tomcat-7/v7.0.26 rel=nofollowBrowse/a | +a href=#7.0.277.0.27/a | +a href=[preferred]tomcat/tomcat-7/v7.0.27 rel=nofollowBrowse/a | a href=http://archive.apache.org/dist/tomcat/tomcat-7;Archives/a /blockquote @@ -305,7 +305,7 @@ /table table border=0 cellspacing=0 cellpadding=2 width=100% tr -td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa name=7.0.26strong7.0.26/strong/a/font/td +td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa name=7.0.27strong7.0.27/strong/a/font/td /tr tr td @@ -314,8 +314,8 @@ p -a name=7.0.26Please/a see the - a href=[preferred]tomcat/tomcat-7/v7.0.26/README.html rel=nofollowREADME/a +a name=7.0.27Please/a see the + a href=[preferred]tomcat/tomcat-7/v7.0.27/README.html rel=nofollowREADME/a file for packaging information. It explains what every distribution contains. /p @@ -336,44 +336,44 @@ li -a href=[preferred]tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.zip rel=nofollowzip/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.zip.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.zip rel=nofollowzip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.tar.gz rel=nofollowtar.gz/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.tar.gz.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26.tar.gz.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.tar.gz rel=nofollowtar.gz/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.tar.gz.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.tar.gz.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26-windows-x86.zip rel=nofollow32-bit Windows zip/a -(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26-windows-x86.zip.asc;pgp/a, -a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.26/bin/apache-tomcat-7.0.26-windows-x86.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27-windows-x86.zip rel=nofollow32-bit Windows zip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27-windows-x86.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27-windows-x86.zip.md5;md5/a)
svn commit: r1309870 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default
Author: markt Date: Thu Apr 5 14:15:21 2012 New Revision: 1309870 URL: http://svn.apache.org/viewvc?rev=1309870view=rev Log: Prep for next release Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1309870r1=1309869r2=1309870view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Thu Apr 5 14:15:21 2012 @@ -27,7 +27,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=27 +version.build=28 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1309870r1=1309869r2=1309870view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu Apr 5 14:15:21 2012 @@ -35,12 +35,12 @@ maven.snapshot.repo.repositoryId=apache. #Maven release properties for Tomcat staging maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository maven.release.repo.repositoryId=tomcat-staging -maven.release.deploy.version=7.0.27 +maven.release.deploy.version=7.0.28 #Maven release properties for the main ASF repo (staging in nexus) maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2 maven.asf.release.repo.repositoryId=apache.releases -maven.asf.release.deploy.version=7.0.27 +maven.asf.release.deploy.version=7.0.28 #Where do we load the libraries from - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Updated] (MTOMCAT-136) Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader fails with run goal
[
https://issues.apache.org/jira/browse/MTOMCAT-136?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) updated MTOMCAT-136:
---
Priority: Major (was: Minor)
Fix Version/s: 2.0
Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader fails with
run goal
---
Key: MTOMCAT-136
URL: https://issues.apache.org/jira/browse/MTOMCAT-136
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0-beta-1
Environment: Java 1.6.0_26, Maven 3.0.4, OS X 10.7.3
Reporter: Leigh Anderson
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
I'm trying to start a web application with 'mvn tomcat7:run'. It seems
that with the configuration below it fails with the following error:
[INFO]
[ERROR] Failed to execute goal
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-beta-1:run (default-cli) on
project mantis-test-web-app: No such archiver: 'jar'. - [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with
the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
I have also tried
* 'mvn tomcat:run-war', which seems to get past this point, but then
the application will not start because the 'additionalClasspathDir' property
is not supported by the 'run-war' goal.
* removing 'useSeparateTomcatClassLoader' which then doesn't load the
Spring instrumenting class loader required to use AspectJ LTW, specified in
context.xml. I have confirmed that I get the same 'no such archiver' error if
I remove the context.xml, so I don't believe this to be the cause.
Plugin configuration:
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
systemProperties
log4j.defaultInitOverridetrue/log4j.defaultInitOverride
HOSTNAMElocalhost/HOSTNAME
port.http9090/port.http
port.https8443/port.https
/systemProperties
port9090/port
httpsPort8443/httpsPort
path//path
useTestClasspathfalse/useTestClasspath
additionalClasspathDirs
additionalClasspathDir${project.basedir}/config/additionalClasspathDir
/additionalClasspathDirs
useSeparateTomcatClassLoadertrue/useSeparateTomcatClassLoader
/configuration
dependencies
dependency
groupIdorg.springframework/groupId
artifactIdspring-instrument-tomcat/artifactId
version${spring.version}/version
/dependency
/dependencies
/plugin
--
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: r1309877 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Apr 5 14:20:03 2012 New Revision: 1309877 URL: http://svn.apache.org/viewvc?rev=1309877view=rev Log: Add the release date Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1309877r1=1309876r2=1309877view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Apr 5 14:20:03 2012 @@ -62,7 +62,7 @@ /changelog /subsection /section -section name=Tomcat 7.0.27 (markt) +section name=Tomcat 7.0.27 (markt) rtext=released 2012-04-05 subsection name=Catalina changelog update - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1309881 - in /tomcat/site/trunk: ./ docs/tomcat-7.0-doc/ docs/tomcat-7.0-doc/api/ docs/tomcat-7.0-doc/api/org/apache/catalina/ docs/tomcat-7.0-doc/api/org/apache/catalina/ant/ docs/tomcat
Author: markt Date: Thu Apr 5 14:27:20 2012 New Revision: 1309881 URL: http://svn.apache.org/viewvc?rev=1309881view=rev Log: Update docs for 7.0.27 [This commit notification would consist of 63 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1309885 - in /tomcat/site/trunk: docs/index.html docs/migration-7.html xdocs/index.xml xdocs/migration-7.xml
Author: kkolinko Date: Thu Apr 5 14:37:35 2012 New Revision: 1309885 URL: http://svn.apache.org/viewvc?rev=1309885view=rev Log: Correct a pair of version number typos Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-7.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1309885r1=1309884r2=1309885view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Apr 5 14:37:35 2012 @@ -244,7 +244,7 @@ project logo are trademarks of the Apach p The Apache Tomcat Project is proud to announce the release of version 7.0.27 of Apache Tomcat. This release is includes significant new features as well as a -number of bug fixes compared to version 7.0.25. The notable changes include: +number of bug fixes compared to version 7.0.26. The notable changes include: ul liSupport for the WebSocket protocol (RFC6455). Both streaming and message Modified: tomcat/site/trunk/docs/migration-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1309885r1=1309884r2=1309885view=diff == --- tomcat/site/trunk/docs/migration-7.html (original) +++ tomcat/site/trunk/docs/migration-7.html Thu Apr 5 14:37:35 2012 @@ -1068,7 +1068,7 @@ of Apache Tomcat./p option value=7.0.227.0.22/option option value=7.0.237.0.23/option option value=7.0.257.0.25/option -option value=7.0.26 selected7.0.27/option +option value=7.0.26 selected7.0.26/option option value=7.0.277.0.27/option /select, new version: select name=r2 @@ -1113,8 +1113,8 @@ of Apache Tomcat./p pYou can also use Subversion command similar to the following (all on one line):/p pre svn diff - --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/conf/ - --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_26/conf/ + --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_26/conf/ + --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_27/conf/ /pre /blockquote Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1309885r1=1309884r2=1309885view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu Apr 5 14:37:35 2012 @@ -41,7 +41,7 @@ project logo are trademarks of the Apach p The Apache Tomcat Project is proud to announce the release of version 7.0.27 of Apache Tomcat. This release is includes significant new features as well as a -number of bug fixes compared to version 7.0.25. The notable changes include: +number of bug fixes compared to version 7.0.26. The notable changes include: ul liSupport for the WebSocket protocol (RFC6455). Both streaming and message based APIs are provided and the implementation currently fully passes the Modified: tomcat/site/trunk/xdocs/migration-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1309885r1=1309884r2=1309885view=diff == --- tomcat/site/trunk/xdocs/migration-7.xml (original) +++ tomcat/site/trunk/xdocs/migration-7.xml Thu Apr 5 14:37:35 2012 @@ -413,7 +413,7 @@ of Apache Tomcat./p option value=7.0.227.0.22/option option value=7.0.237.0.23/option option value=7.0.257.0.25/option -option value=7.0.26 selected=selected7.0.27/option +option value=7.0.26 selected=selected7.0.26/option option value=7.0.277.0.27/option /select, new version: select name=r2 @@ -451,8 +451,8 @@ of Apache Tomcat./p /form pYou can also use Subversion command similar to the following (all on one line):/p pre svn diff - --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_25/conf/ - --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_26/conf/ + --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_26/conf/ + --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_27/conf/ /pre /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-136) Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader fails with run goal
[
https://issues.apache.org/jira/browse/MTOMCAT-136?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13247266#comment-13247266
]
Olivier Lamy (*$^¨%`£) commented on MTOMCAT-136:
can you paste running mvn -e ?
Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader fails with
run goal
---
Key: MTOMCAT-136
URL: https://issues.apache.org/jira/browse/MTOMCAT-136
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0-beta-1
Environment: Java 1.6.0_26, Maven 3.0.4, OS X 10.7.3
Reporter: Leigh Anderson
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
I'm trying to start a web application with 'mvn tomcat7:run'. It seems
that with the configuration below it fails with the following error:
[INFO]
[ERROR] Failed to execute goal
org.apache.tomcat.maven:tomcat7-maven-plugin:2.0-beta-1:run (default-cli) on
project mantis-test-web-app: No such archiver: 'jar'. - [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with
the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
I have also tried
* 'mvn tomcat:run-war', which seems to get past this point, but then
the application will not start because the 'additionalClasspathDir' property
is not supported by the 'run-war' goal.
* removing 'useSeparateTomcatClassLoader' which then doesn't load the
Spring instrumenting class loader required to use AspectJ LTW, specified in
context.xml. I have confirmed that I get the same 'no such archiver' error if
I remove the context.xml, so I don't believe this to be the cause.
Plugin configuration:
plugin
groupIdorg.apache.tomcat.maven/groupId
artifactIdtomcat7-maven-plugin/artifactId
version2.0-beta-1/version
configuration
systemProperties
log4j.defaultInitOverridetrue/log4j.defaultInitOverride
HOSTNAMElocalhost/HOSTNAME
port.http9090/port.http
port.https8443/port.https
/systemProperties
port9090/port
httpsPort8443/httpsPort
path//path
useTestClasspathfalse/useTestClasspath
additionalClasspathDirs
additionalClasspathDir${project.basedir}/config/additionalClasspathDir
/additionalClasspathDirs
useSeparateTomcatClassLoadertrue/useSeparateTomcatClassLoader
/configuration
dependencies
dependency
groupIdorg.springframework/groupId
artifactIdspring-instrument-tomcat/artifactId
version${spring.version}/version
/dependency
/dependencies
/plugin
--
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
[jira] [Updated] (MTOMCAT-135) tomcat7:run does not load HandlesTypes in application classes
[
https://issues.apache.org/jira/browse/MTOMCAT-135?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) updated MTOMCAT-135:
---
Fix Version/s: 2.0
tomcat7:run does not load HandlesTypes in application classes
-
Key: MTOMCAT-135
URL: https://issues.apache.org/jira/browse/MTOMCAT-135
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Mac OS X, Apple JDK 1.6
Reporter: Gildas Cuisinier
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
Spring 3.1 brings a SpringServletContainerInitializer, that has annotation
@HandlesTypes(WebApplicationInitializer.class).
In my application, I have a WebApplicationInitializer directly in my war.
This one is compiled and put in WEB-INF/classes.
When launching with tomcat7:run-war, my WebApplicationInitializer is
correctly found by tomcat and provided to SpringServletContainerInitializer.
But with tomcat7:run, I've this line in logs :
INFO: No Spring WebApplicationInitializer types detected on classpath
It seems that the problems come from the ContextConfig classe (from tomcat
source), in method webConfig that specificly search a WEB-INF/classes :
// Step 4. Process /WEB-INF/classes for annotations
// This will add any matching classes to the
typeInitializerMap
if (ok) {
// Hack required by Eclipse's serve modules without
// publishing feature since this backs WEB-INF/classes by
// multiple locations rather than one.
NamingEnumerationBinding listBindings = null;
try {
try {
listBindings =
context.getResources().listBindings(
/WEB-INF/classes);
} catch (NameNotFoundException ignore) {
// Safe to ignore
}
--
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: r1309940 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: markt Date: Thu Apr 5 16:58:19 2012 New Revision: 1309940 URL: http://svn.apache.org/viewvc?rev=1309940view=rev Log: Fix typo Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1309940r1=1309939r2=1309940view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Apr 5 16:58:19 2012 @@ -266,7 +266,7 @@ Full details of these changes, and all t p align=center a href=download-70.cgiDownload/a | -a href=tomcat-7.0-doc/changelog.htmlChangeLog for 7.0.26/a +a href=tomcat-7.0-doc/changelog.htmlChangeLog for 7.0.27/a /p Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1309940r1=1309939r2=1309940view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Thu Apr 5 16:58:19 2012 @@ -57,7 +57,7 @@ Full details of these changes, and all t p align=center a href=download-70.cgiDownload/a | -a href=tomcat-7.0-doc/changelog.htmlChangeLog for 7.0.26/a +a href=tomcat-7.0-doc/changelog.htmlChangeLog for 7.0.27/a /p /section - 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: 22 mins 7 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-05042012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-05042012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-05042012-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-05042012.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-05042012.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/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.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.
DO NOT REPLY [Bug 50864] Reconfigure pool on the fly using JMX
https://issues.apache.org/bugzilla/show_bug.cgi?id=50864 --- Comment #3 from Filip Hanik fha...@apache.org 2012-04-05 17:57:15 UTC --- you got it, changes are underway -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 7.0.27 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.27 This release is includes significant new features as well as a number of bug fixes compared to version 7.0.26. The notable changes include: * Support for the WebSocket protocol (RFC6455). Both streaming and message based APIs are provided and the implementation currently fully passes the Autobahn test suite. Also included are several examples. * A number of fixes to the HTTP NIO connector, particularly when using Comet. * Improve the memory leak prevention and detection code so that it works well with JVMs from IBM. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html Note that this version has 4 zip binaries: a generic one and three bundled with Tomcat native binaries for Windows operating systems running on different CPU architectures. Downloads: http://tomcat.apache.org/download-70.cgi Migration guides from Apache Tomcat 5.5.x and 6.0.x: http://tomcat.apache.org/migration.html Thank you, -- The Apache Tomcat Team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1307093 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
-Original Message- From: Konstantin Kolinko [mailto:knst.koli...@gmail.com] Sent: Wednesday, April 04, 2012 2:34 PM To: Tomcat Developers List Subject: Re: svn commit: r1307093 - /tomcat/trunk/modules/jdbc- pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacad e.java 2012/4/4 Filip Hanik Mailing Lists devli...@hanik.com: I know of two places where long lines cause problems: 1. Commit e-mails. Long lines are wrapped and it impacts readability. 2. Side-by-side comparison in viewvc when you do colored comparison here I see a challenge, since so many of our commits, are not code commits, but like a line wrap commit like this, this pollutes our diffs and why I'm not a big fan of changing it for changing it. I do not remember many line-wrap commits. [Filip Hanik] You're looking at the reply of one. There are ending whitespace commits, because sometimes people forget to run checkstyle and we would be nagged if someone does not fix the code. Therefore I would like to stick to the current convention of 80 chars. It is not a hard convention (we do not enforce it through checkstyle), but something to follow. The convention is something fairly new. For most of the time of Tomcat's life time, it was the committers preference, but fairly recently is when we started modifying style for style's sake. So the archives you refer to, can't go that far back. The only convention we've had through the history of Tomcat, is spaces, not tabs, not line length etc. a. I might be not very careful in selecting English words. Please excuse me. b. I do not see much difference between convention and preference. [Filip Hanik] Convention = mutually agreed upon standard Preference = Individual standard, like I like 120, markt likes 80 If it is a preference of many then it has to be respected as a convention. Isn't it? [Filip Hanik] Not really, only if it is mutually agreed upon Previous discussion (December 2010): http://markmail.org/thread/alo77qd4yiduvqvz [Filip Hanik] Opinions in this thread as I read it is - 80 is a bit outdated - 80 is not enforced We also have this description of our coding style: http://tomcat.apache.org/getinvolved.html#Coding_Conventions [Filip Hanik] Again, I'm only bringing this up for the following reasons - I think we can modernize our preferences/conventions/standards - If we are gonna enforce something like that, let's automate it a bit more Now, since only three people have chimed in, you, me and Mark, and both you and Mark believe that 80 is good for now, then we should aim for it, but as the thread points out, not enforced. I'll bring it up in another year or so, when monitors are even better :) Filip Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310082 [1/2] - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/resources/conf/web.xml
Author: olamy Date: Thu Apr 5 21:40:19 2012 New Revision: 1310082 URL: http://svn.apache.org/viewvc?rev=1310082view=rev Log: use default web.xml for tomcat7 Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/resources/conf/web.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310083 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Thu Apr 5 21:40:37 2012
New Revision: 1310083
URL: http://svn.apache.org/viewvc?rev=1310083view=rev
Log:
[MTOMCAT-135] tomcat7:run does not load HandlesTypes in application classes
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1310083r1=1310082r2=1310083view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Thu Apr 5 21:40:37 2012
@@ -32,6 +32,8 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
+import org.apache.naming.NamingEntry;
+import org.apache.naming.resources.FileDirContext;
import org.apache.tomcat.maven.common.run.EmbeddedRegistry;
import
org.apache.tomcat.maven.common.run.ExternalRepositoriesReloadableWebappLoader;
import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo;
@@ -49,6 +51,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
+import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -60,6 +63,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -254,14 +258,15 @@ public abstract class AbstractRunMojo
* @since 1.1
*/
private String keystorePass;
-
+
/**
* Override the type of keystore file to be used for the server
certificate. If not specified, the default value is JKS.
+ *
* @parameter default-value=JKS
* @since 2.0.1
*/
private String keystoreType;
-
+
/**
* p
* Enables or disables naming support for the embedded Tomcat server.
@@ -388,6 +393,10 @@ public abstract class AbstractRunMojo
{
throw new MojoExecutionException( e.getMessage(), e );
}
+catch ( NamingException e )
+{
+throw new MojoExecutionException( e.getMessage(), e );
+}
finally
{
if ( useSeparateTomcatClassLoader )
@@ -420,10 +429,15 @@ public abstract class AbstractRunMojo
* @throws MojoExecutionException in case of an error creating the context
*/
protected Context createContext( Tomcat container )
-throws IOException, MojoExecutionException, ServletException
+throws IOException, MojoExecutionException, ServletException,
NamingException
{
String contextPath = getPath();
+
Context context = container.addWebapp( contextPath,
getDocBase().getAbsolutePath() );
+
+context.setResources(
+new MyDirContext( new File(
project.getBuild().getOutputDirectory() ).getAbsolutePath() ) );
+
//Tomcat.initWebappDefaults( context );
if ( useSeparateTomcatClassLoader )
@@ -437,10 +451,41 @@ public abstract class AbstractRunMojo
{
context.setConfigFile( getContextFile().toURI().toURL() );
}
+
return context;
}
+private static class MyDirContext
+extends FileDirContext
+{
+String buildOutputDirectory;
+
+MyDirContext( String buildOutputDirectory )
+{
+this.buildOutputDirectory = buildOutputDirectory;
+}
+
+@Override
+protected ListNamingEntry doListBindings( String name )
+throws NamingException
+{
+if ( /WEB-INF/classes.equals( name ) )
+{
+if ( !new File( buildOutputDirectory ).exists() )
+{
+return Collections.emptyList();
+}
+FileDirContext fileDirContext = new FileDirContext();
+fileDirContext.setDocBase( buildOutputDirectory );
+NamingEntry namingEntry = new NamingEntry( /WEB-INF/classes,
fileDirContext, -1 );
+return Collections.singletonList( namingEntry );
+}
+
+return null;
+}
+}
+
/**
* Gets the webapp loader to run this web application under.
*
@@ -659,7 +704,7 @@ public abstract class
[jira] [Closed] (MTOMCAT-135) tomcat7:run does not load HandlesTypes in application classes
[
https://issues.apache.org/jira/browse/MTOMCAT-135?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Olivier Lamy (*$^¨%`£) closed MTOMCAT-135.
--
Resolution: Fixed
tomcat7:run does not load HandlesTypes in application classes
-
Key: MTOMCAT-135
URL: https://issues.apache.org/jira/browse/MTOMCAT-135
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Mac OS X, Apple JDK 1.6
Reporter: Gildas Cuisinier
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
Spring 3.1 brings a SpringServletContainerInitializer, that has annotation
@HandlesTypes(WebApplicationInitializer.class).
In my application, I have a WebApplicationInitializer directly in my war.
This one is compiled and put in WEB-INF/classes.
When launching with tomcat7:run-war, my WebApplicationInitializer is
correctly found by tomcat and provided to SpringServletContainerInitializer.
But with tomcat7:run, I've this line in logs :
INFO: No Spring WebApplicationInitializer types detected on classpath
It seems that the problems come from the ContextConfig classe (from tomcat
source), in method webConfig that specificly search a WEB-INF/classes :
// Step 4. Process /WEB-INF/classes for annotations
// This will add any matching classes to the
typeInitializerMap
if (ok) {
// Hack required by Eclipse's serve modules without
// publishing feature since this backs WEB-INF/classes by
// multiple locations rather than one.
NamingEnumerationBinding listBindings = null;
try {
try {
listBindings =
context.getResources().listBindings(
/WEB-INF/classes);
} catch (NameNotFoundException ignore) {
// Safe to ignore
}
--
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: r1310112 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Thu Apr 5 22:35:10 2012
New Revision: 1310112
URL: http://svn.apache.org/viewvc?rev=1310112view=rev
Log:
NamingException not throw
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1310112r1=1310111r2=1310112view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Thu Apr 5 22:35:10 2012
@@ -393,10 +393,6 @@ public abstract class AbstractRunMojo
{
throw new MojoExecutionException( e.getMessage(), e );
}
-catch ( NamingException e )
-{
-throw new MojoExecutionException( e.getMessage(), e );
-}
finally
{
if ( useSeparateTomcatClassLoader )
@@ -429,7 +425,7 @@ public abstract class AbstractRunMojo
* @throws MojoExecutionException in case of an error creating the context
*/
protected Context createContext( Tomcat container )
-throws IOException, MojoExecutionException, ServletException,
NamingException
+throws IOException, MojoExecutionException, ServletException
{
String contextPath = getPath();
@@ -704,7 +700,7 @@ public abstract class AbstractRunMojo
* @throws MojoExecutionException if the server could not be configured
*/
private void startContainer()
-throws IOException, LifecycleException, MojoExecutionException,
ServletException, NamingException
+throws IOException, LifecycleException, MojoExecutionException,
ServletException
{
String previousCatalinaBase = System.getProperty( catalina.base );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310113 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Thu Apr 5 22:35:27 2012
New Revision: 1310113
URL: http://svn.apache.org/viewvc?rev=1310113view=rev
Log:
[MTOMCAT-133] Servlet mapping to / does not work
use the defaut web.xml
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1310113r1=1310112r2=1310113view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Thu Apr 5 22:35:27 2012
@@ -19,12 +19,15 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.catalina.Context;
+import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Connector;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.startup.Catalina;
import org.apache.catalina.startup.CatalinaProperties;
+import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.maven.artifact.Artifact;
@@ -735,7 +738,33 @@ public abstract class AbstractRunMojo
// Trigger loading of catalina.properties
CatalinaProperties.getProperty( foo );
-Tomcat embeddedTomcat = new Tomcat();
+Tomcat embeddedTomcat = new Tomcat()
+{
+public Context addWebapp( Host host, String url, String
name, String path )
+{
+
+Context ctx = new StandardContext();
+ctx.setName( name );
+ctx.setPath( url );
+ctx.setDocBase( path );
+
+ContextConfig ctxCfg = new ContextConfig();
+ctx.addLifecycleListener( ctxCfg );
+
+ctxCfg.setDefaultWebXml( new File( configurationDir,
conf/web.xml ).getAbsolutePath() );
+
+if ( host == null )
+{
+getHost().addChild( ctx );
+}
+else
+{
+host.addChild( ctx );
+}
+
+return ctx;
+}
+};
Context ctx = createContext( embeddedTomcat );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310114 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Author: olamy
Date: Thu Apr 5 22:35:47 2012
New Revision: 1310114
URL: http://svn.apache.org/viewvc?rev=1310114view=rev
Log:
extract overriding of Tomcat to an external class rather than inline override
for readibility
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1310114r1=1310113r2=1310114view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Thu Apr 5 22:35:47 2012
@@ -19,15 +19,12 @@ package org.apache.tomcat.maven.plugin.t
*/
import org.apache.catalina.Context;
-import org.apache.catalina.Host;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.StandardContext;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.realm.MemoryRealm;
import org.apache.catalina.startup.Catalina;
import org.apache.catalina.startup.CatalinaProperties;
-import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.maven.artifact.Artifact;
@@ -738,33 +735,7 @@ public abstract class AbstractRunMojo
// Trigger loading of catalina.properties
CatalinaProperties.getProperty( foo );
-Tomcat embeddedTomcat = new Tomcat()
-{
-public Context addWebapp( Host host, String url, String
name, String path )
-{
-
-Context ctx = new StandardContext();
-ctx.setName( name );
-ctx.setPath( url );
-ctx.setDocBase( path );
-
-ContextConfig ctxCfg = new ContextConfig();
-ctx.addLifecycleListener( ctxCfg );
-
-ctxCfg.setDefaultWebXml( new File( configurationDir,
conf/web.xml ).getAbsolutePath() );
-
-if ( host == null )
-{
-getHost().addChild( ctx );
-}
-else
-{
-host.addChild( ctx );
-}
-
-return ctx;
-}
-};
+Tomcat embeddedTomcat = new ExtendedTomcat( configurationDir );
Context ctx = createContext( embeddedTomcat );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310116 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
Author: olamy
Date: Thu Apr 5 22:36:06 2012
New Revision: 1310116
URL: http://svn.apache.org/viewvc?rev=1310116view=rev
Log:
oups missed to add the new class
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
(with props)
Added:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java?rev=1310116view=auto
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
(added)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
Thu Apr 5 22:36:06 2012
@@ -0,0 +1,69 @@
+package org.apache.tomcat.maven.plugin.tomcat7.run;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.ContextConfig;
+import org.apache.catalina.startup.Tomcat;
+
+import java.io.File;
+
+/**
+ * @author Olivier Lamy
+ * @since 2.0
+ */
+public class ExtendedTomcat
+extends Tomcat
+{
+
+private File configurationDir;
+
+public ExtendedTomcat( File configurationDir )
+{
+super();
+this.configurationDir = configurationDir;
+}
+
+public Context addWebapp( Host host, String url, String name, String path )
+{
+
+Context ctx = new StandardContext();
+ctx.setName( name );
+ctx.setPath( url );
+ctx.setDocBase( path );
+
+ContextConfig ctxCfg = new ContextConfig();
+ctx.addLifecycleListener( ctxCfg );
+
+ctxCfg.setDefaultWebXml( new File( configurationDir, conf/web.xml
).getAbsolutePath() );
+
+if ( host == null )
+{
+getHost().addChild( ctx );
+}
+else
+{
+host.addChild( ctx );
+}
+
+return ctx;
+}
+}
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
--
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/ExtendedTomcat.java
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-135) tomcat7:run does not load HandlesTypes in application classes
[
https://issues.apache.org/jira/browse/MTOMCAT-135?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13247781#comment-13247781
]
Hudson commented on MTOMCAT-135:
Integrated in TomcatMavenPlugin-mvn3.x #122 (See
[https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/122/])
[MTOMCAT-135] tomcat7:run does not load HandlesTypes in application classes
(Revision 1310083)
Result = SUCCESS
olamy : http://svn.apache.org/viewvc/?view=revrev=1310083
Files :
*
/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat7:run does not load HandlesTypes in application classes
-
Key: MTOMCAT-135
URL: https://issues.apache.org/jira/browse/MTOMCAT-135
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Mac OS X, Apple JDK 1.6
Reporter: Gildas Cuisinier
Assignee: Olivier Lamy (*$^¨%`£)
Fix For: 2.0
Spring 3.1 brings a SpringServletContainerInitializer, that has annotation
@HandlesTypes(WebApplicationInitializer.class).
In my application, I have a WebApplicationInitializer directly in my war.
This one is compiled and put in WEB-INF/classes.
When launching with tomcat7:run-war, my WebApplicationInitializer is
correctly found by tomcat and provided to SpringServletContainerInitializer.
But with tomcat7:run, I've this line in logs :
INFO: No Spring WebApplicationInitializer types detected on classpath
It seems that the problems come from the ContextConfig classe (from tomcat
source), in method webConfig that specificly search a WEB-INF/classes :
// Step 4. Process /WEB-INF/classes for annotations
// This will add any matching classes to the
typeInitializerMap
if (ok) {
// Hack required by Eclipse's serve modules without
// publishing feature since this backs WEB-INF/classes by
// multiple locations rather than one.
NamingEnumerationBinding listBindings = null;
try {
try {
listBindings =
context.getResources().listBindings(
/WEB-INF/classes);
} catch (NameNotFoundException ignore) {
// Safe to ignore
}
--
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
[jira] [Closed] (MTOMCAT-133) Servlet mapping to / does not work
[ https://issues.apache.org/jira/browse/MTOMCAT-133?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Olivier Lamy (*$^¨%`£) closed MTOMCAT-133. -- Resolution: Fixed Fix Version/s: 2.0 fixed. Servlet mapping to / does not work - Key: MTOMCAT-133 URL: https://issues.apache.org/jira/browse/MTOMCAT-133 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.0 Environment: Mac OS X, Apple JRE 1.6 Reporter: Gildas Cuisinier Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.0 Using the Servlet 3.0 possibilities to add and configure servlet (ServletContainerInitializer through Spring 3.1 WebApplicationInitializer), I try to map a servlet /, but is not working properly. The servlet is started correctly, but the mapping does not work. If I replace / by test/*, everything work perfectly. For information, the / mapping works well in a standalone tomcat 7.0.25. I put a sample project on github that reproduce the bug : https://github.com/hikage/tomcat7-bug -- 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: r1310130 - in /tomcat/site/trunk: README.txt build.xml
Author: kkolinko
Date: Thu Apr 5 23:23:51 2012
New Revision: 1310130
URL: http://svn.apache.org/viewvc?rev=1310130view=rev
Log:
Split release target into separate targets
Modified:
tomcat/site/trunk/README.txt
tomcat/site/trunk/build.xml
Modified: tomcat/site/trunk/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1310130r1=1310129r2=1310130view=diff
==
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Thu Apr 5 23:23:51 2012
@@ -26,14 +26,12 @@ This will build the documentation into t
will show you which files got re-generated.
If you would like to make modifications to the web site documents,
-you simply need to edit the files in the xdocs/ and/or xdocs-faq/ directory.
+you simply need to edit the files in the xdocs/ directory.
The files in xdocs/stylesheets are the global files for the site. If you make a
modification to project.xml, it will affect the left side navigation for the
web site and all of your .html files will be re-generated.
-The xdocs-faq directory has its own project.xml and tomcat-faq.xsl
-
Once you have built your documentation and confirmed that your changes are
ok, you can check your .xml and your .html files back into SVN.
@@ -45,27 +43,50 @@ to have the changes reflected on the Tom
-To update the documentation for Tomcat 5.5.x, Tomcat 6.0.x, Tomcat 7.0.x
+To update the documentation for Tomcat 5.5.x, Tomcat 6.0.x, Tomcat 7.0.x:
+==
1. Set the version numbers in build.properties.default
-2. cd into your tomcat-site directory and execute:
- ant release
-3. Check in the changes. Remember there may be deleted / missing files.
-4. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+2. cd into your tomcat-site directory and execute one of the following
+ commands:
+
+ ant release-5
+ ant release-6
+ ant release-7
+
+3. Check the changes with svn status command.
+
+ Remember there may be deleted / missing files (shown with '!')
+ and new files (shown with '?').
+
+ Apply svn delete and svn add on those files as needed.
+
+4. Commit the changes.
+
+5. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+
umask 002
svn up
-To update the documentation for Tomcat Native or the
-Merging connectors documentation
+To update the documentation for Tomcat Native or Tomcat Connectors:
+
1. Update the svn-external for tomcat-site to point to the correct revision.
This *must* match the tag for the latest released version.
2. cd into your tomcat-site directory and execute:
+
svn up
- ant release
-3. Check in the changes. Remember there may be deleted / missing files.
-4. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+ ant release-native
+ ant release-jk
+
+3. Check the changes with svn status command.
+
+ Remember there may be deleted / missing files or new files.
+
+4. Commit the changes.
+5. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+
umask 002
svn up
Modified: tomcat/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1310130r1=1310129r2=1310130view=diff
==
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Thu Apr 5 23:23:51 2012
@@ -86,66 +86,98 @@
/target
- target name=release
+ target name=release-5
depends=docs
- description=Used after a release to update the version specific
docs
+ description=Used after a release to update the docs for Tomcat 5.5
-!-- NOTE: This task only updates the docs for the currently supported
- versions. The older releases (3.2, 3.3, 4.0 4.1) will not
- be updated. --
-
-!-- Download the latest versions --
+!-- Download the latest version --
antcall target=downloadgz
param name=sourcefile value=${tomcat55.loc}/
param name=destfile
value=${tomcat55.home}/tomcat-5.5-doc/index.html/
param name=destdir value=${tomcat55.home}/
/antcall
-antcall target=downloadgz
- param name=sourcefile value=${tomcat60.loc}/
- param name=destfile
value=${tomcat60.home}/tomcat-6.0-doc/index.html/
- param name=destdir value=${tomcat60.home}/
-/antcall
-antcall target=downloadgz
- param name=sourcefile value=${tomcat70.loc}/
- param name=destfile
value=${tomcat70.home}/tomcat-7.0-doc/index.html/
- param name=destdir value=${tomcat70.home}/
-/antcall
-!-- Delete the old versions --
+!-- Delete the old version --
delete dir=${docs.dest}/tomcat-5.5-doc/
-delete dir=${docs.dest}/tomcat-6.0-doc/
-delete dir=${docs.dest}/tomcat-7.0-doc/
-delete
svn commit: r1310131 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java tomcat7-war-runner/src/main/java/org/apache
Author: olamy
Date: Thu Apr 5 23:23:55 2012
New Revision: 1310131
URL: http://svn.apache.org/viewvc?rev=1310131view=rev
Log:
[MTOMCAT-133] Servlet mapping to / does not work
apply same fix for the exec war feature.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.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=1310131r1=1310130r2=1310131view=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
Thu Apr 5 23:23:55 2012
@@ -306,6 +306,7 @@ public abstract class AbstractExecWarMoj
os.putArchiveEntry( new JarArchiveEntry(
StringUtils.removeStart( path, / ) + .war ) );
IOUtils.copy( new FileInputStream( projectArtifact.getFile()
), os );
os.closeArchiveEntry();
+
properties.put( Tomcat7Runner.WARS_KEY,
StringUtils.removeStart( path, / ) + .war| + path );
}
@@ -364,6 +365,11 @@ public abstract class AbstractExecWarMoj
properties.put( Tomcat7Runner.USE_SERVER_XML_KEY,
Boolean.FALSE.toString() );
}
+os.putArchiveEntry( new JarArchiveEntry( conf/web.xml ) );
+IOUtils.copy( getClass().getResourceAsStream( /conf/web.xml ),
os );
+os.closeArchiveEntry();
+
+
properties.store( tmpPropertiesFileOutputStream, created by
Apache Tomcat Maven plugin );
tmpPropertiesFileOutputStream.flush();
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1310131r1=1310130r2=1310131view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Thu Apr 5 23:23:55 2012
@@ -19,8 +19,11 @@ package org.apache.tomcat.maven.runner;
*/
import org.apache.catalina.Context;
+import org.apache.catalina.Host;
import org.apache.catalina.connector.Connector;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Catalina;
+import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.tomcat.util.http.fileupload.FileUtils;
@@ -163,7 +166,33 @@ public class Tomcat7Runner
}
else
{
-tomcat = new Tomcat();
+tomcat = new Tomcat()
+{
+public Context addWebapp( Host host, String url, String name,
String path )
+{
+
+Context ctx = new StandardContext();
+ctx.setName( name );
+ctx.setPath( url );
+ctx.setDocBase( path );
+
+ContextConfig ctxCfg = new ContextConfig();
+ctx.addLifecycleListener( ctxCfg );
+
+ctxCfg.setDefaultWebXml( new File( extractDirectory,
conf/web.xml ).getAbsolutePath() );
+
+if ( host == null )
+{
+getHost().addChild( ctx );
+}
+else
+{
+host.addChild( ctx );
+}
+
+return ctx;
+}
+};
if ( this.enableNaming() )
{
@@ -265,15 +294,18 @@ public class Tomcat7Runner
for ( Map.EntryString, String entry :
this.webappWarPerContext.entrySet() )
{
String baseDir = null;
+Context context = null;
if ( entry.getKey().equals( / ) )
{
baseDir = new File( extractDirectory, webapps/ROOT.war
).getAbsolutePath();
+context = tomcat.addWebapp( , baseDir );
}
else
{
baseDir = new File( extractDirectory, webapps/ +
svn commit: r1310136 - /tomcat/site/trunk/README.txt
Author: kkolinko
Date: Fri Apr 6 00:12:57 2012
New Revision: 1310136
URL: http://svn.apache.org/viewvc?rev=1310136view=rev
Log:
Add note about base.path
Modified:
tomcat/site/trunk/README.txt
Modified: tomcat/site/trunk/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1310136r1=1310135r2=1310136view=diff
==
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Fri Apr 6 00:12:57 2012
@@ -46,24 +46,33 @@ to have the changes reflected on the Tom
To update the documentation for Tomcat 5.5.x, Tomcat 6.0.x, Tomcat 7.0.x:
==
-1. Set the version numbers in build.properties.default
-2. cd into your tomcat-site directory and execute one of the following
+1. Create build.properties file if you have not done so yet and set
+ base.path property in it. E.g.
+
+ base.path=..
+
+ The documentation bundles will be downloaded and untarred into
+ ${base.path}/tomcat-site-docs/
+
+2. Set the version numbers in build.properties.default
+
+3. cd into your tomcat-site directory and execute one of the following
commands:
ant release-5
ant release-6
ant release-7
-3. Check the changes with svn status command.
+4. Check the changes with svn status command.
Remember there may be deleted / missing files (shown with '!')
and new files (shown with '?').
Apply svn delete and svn add on those files as needed.
-4. Commit the changes.
+5. Commit the changes.
-5. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+6. In the /www/tomcat.apache.org/ directory on people.a.o execute:
umask 002
svn up
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-133) Servlet mapping to / does not work
[ https://issues.apache.org/jira/browse/MTOMCAT-133?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13247939#comment-13247939 ] Hudson commented on MTOMCAT-133: Integrated in TomcatMavenPlugin-mvn3.x #123 (See [https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/123/]) [MTOMCAT-133] Servlet mapping to / does not work apply same fix for the exec war feature. (Revision 1310131) [MTOMCAT-133] Servlet mapping to / does not work use the defaut web.xml (Revision 1310113) Result = FAILURE olamy : http://svn.apache.org/viewvc/?view=revrev=1310131 Files : * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java * /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java olamy : http://svn.apache.org/viewvc/?view=revrev=1310113 Files : * /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java Servlet mapping to / does not work - Key: MTOMCAT-133 URL: https://issues.apache.org/jira/browse/MTOMCAT-133 Project: Apache Tomcat Maven Plugin Issue Type: Bug Components: tomcat7 Affects Versions: 2.0 Environment: Mac OS X, Apple JRE 1.6 Reporter: Gildas Cuisinier Assignee: Olivier Lamy (*$^¨%`£) Fix For: 2.0 Using the Servlet 3.0 possibilities to add and configure servlet (ServletContainerInitializer through Spring 3.1 WebApplicationInitializer), I try to map a servlet /, but is not working properly. The servlet is started correctly, but the mapping does not work. If I replace / by test/*, everything work perfectly. For information, the / mapping works well in a standalone tomcat 7.0.25. I put a sample project on github that reproduce the bug : https://github.com/hikage/tomcat7-bug -- 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-tc7.0.x-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. 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-validate : 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-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-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 1 sec 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-7.0.x] 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-06042012.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-06042012.jar:/srv/gump/public/workspace/junit/dist/junit-06042012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-06042012.jar:guava-gump-31032012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-06042012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-06042012.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-06042012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-06042012-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 - 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-7.0.x/output/res/checkstyle BUILD FAILED /srv/gump/public/workspace/tomcat-7.0.x/build.xml:447: Could not create type checkstyle due to java.lang.NoClassDefFoundError: com/google/common/collect/Lists at com.puppycrawl.tools.checkstyle.CheckStyleTask.init(CheckStyleTask.java:78) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:532) at org.apache.tools.ant.AntTypeDefinition.innerCreateAndSet(AntTypeDefinition.java:328) at org.apache.tools.ant.AntTypeDefinition.createAndSet(AntTypeDefinition.java:274) at org.apache.tools.ant.AntTypeDefinition.icreate(AntTypeDefinition.java:219) at org.apache.tools.ant.AntTypeDefinition.create(AntTypeDefinition.java:206) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:286) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:264) at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:417) at
[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, and has been outstanding for 5 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-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: 1 sec 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-06042012.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-06042012.jar:/srv/gump/public/workspace/junit/dist/junit-06042012.jar:/srv/gump /public/workspace/junit/dist/junit-dep-06042012.jar:guava-gump-31032012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-06042012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-06042012.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-06042012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-06042012-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 - 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 BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:458: Could not create type checkstyle due to java.lang.NoClassDefFoundError: com/google/common/collect/Lists at com.puppycrawl.tools.checkstyle.CheckStyleTask.init(CheckStyleTask.java:78) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:532) at org.apache.tools.ant.AntTypeDefinition.innerCreateAndSet(AntTypeDefinition.java:328) at org.apache.tools.ant.AntTypeDefinition.createAndSet(AntTypeDefinition.java:274) at org.apache.tools.ant.AntTypeDefinition.icreate(AntTypeDefinition.java:219) at org.apache.tools.ant.AntTypeDefinition.create(AntTypeDefinition.java:206) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:286) at org.apache.tools.ant.ComponentHelper.createComponent(ComponentHelper.java:264) at org.apache.tools.ant.UnknownElement.makeObject(UnknownElement.java:417) at
svn commit: r1310163 - in /tomcat/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/config/listeners.xml
Author: kfujino
Date: Fri Apr 6 04:23:04 2012
New Revision: 1310163
URL: http://svn.apache.org/viewvc?rev=1310163view=rev
Log:
Change of an attribute name.
enabled and disabled are changed into allow and deny.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1310163r1=1310162r2=1310163view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Fri Apr 6
04:23:04 2012
@@ -103,12 +103,12 @@ public final class UserConfig
/**
* A regular expression defining user who deployment is allowed.
*/
-protected Pattern enabled = null;
+protected Pattern allow = null;
/**
* A regular expression defining user who deployment is denied.
*/
-protected Pattern disabled = null;
+protected Pattern deny = null;
// - Properties
@@ -223,22 +223,22 @@ public final class UserConfig
/**
* Return the regular expression used to test for user who deployment is
allowed.
*/
-public String getEnabled() {
-if (enabled == null) return null;
-return enabled.toString();
+public String getAllow() {
+if (allow == null) return null;
+return allow.toString();
}
/**
* Set the regular expression used to test for user who deployment is
allowed.
*
- * @param enabled The new enabled expression
+ * @param allow The new allow expression
*/
-public void setEnabled(String enabled) {
-if (enabled == null || enabled.length() == 0) {
-this.enabled = null;
+public void setAllow(String allow) {
+if (allow == null || allow.length() == 0) {
+this.allow = null;
} else {
-this.enabled = Pattern.compile(enabled);
+this.allow = Pattern.compile(allow);
}
}
@@ -246,22 +246,22 @@ public final class UserConfig
/**
* Return the regular expression used to test for user who deployment is
denied.
*/
-public String getDisabled() {
-if (disabled == null) return null;
-return disabled.toString();
+public String getDeny() {
+if (deny == null) return null;
+return deny.toString();
}
/**
* Set the regular expression used to test for user who deployment is
denied.
*
- * @param disabled The new disabled expression
+ * @param deny The new deny expression
*/
-public void setDisabled(String disabled) {
-if (disabled == null || disabled.length() == 0) {
-this.disabled = null;
+public void setDeny(String deny) {
+if (deny == null || deny.length() == 0) {
+this.deny = null;
} else {
-this.disabled = Pattern.compile(disabled);
+this.deny = Pattern.compile(deny);
}
}
@@ -323,8 +323,8 @@ public final class UserConfig
EnumerationString users = database.getUsers();
while (users.hasMoreElements()) {
String user = users.nextElement();
+if (!isDeployAllowed(user)) continue;
String home = database.getHome(user);
-if (!isDeployEnabled(user)) continue;
results.add(executor.submit(new DeployUserDirectory(this, user,
home)));
}
@@ -404,17 +404,17 @@ public final class UserConfig
}
/**
- * Test enabled and disabled rules for the provided user.
+ * Test allow and deny rules for the provided user.
*
* @return codetrue/code if this user is allowed to deploy,
* codefalse/code otherwise
*/
-private boolean isDeployEnabled(String user) {
-if (disabled != null disabled.matcher(user).matches()) {
+private boolean isDeployAllowed(String user) {
+if (deny != null deny.matcher(user).matches()) {
return false;
}
-if (enabled != null) {
-if (enabled.matcher(user).matches()) {
+if (allow != null) {
+if (allow.matcher(user).matches()) {
return true;
} else {
return false;
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1310163r1=1310162r2=1310163view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Fri Apr 6 04:23:04 2012
@@ -377,18 +377,18 @@
used./p
Re: svn commit: r1309734 - in /tomcat/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/config/listeners.xml
Thanks comments. fixed in r1310163. 2012/4/5 Mark Thomas ma...@apache.org: On 05/04/2012 11:46, Konstantin Kolinko wrote: 2012/4/5 kfuj...@apache.org: Author: kfujino Date: Thu Apr 5 10:08:38 2012 New Revision: 1309734 URL: http://svn.apache.org/viewvc?rev=1309734view=rev Log: Add new attributes of enabled and disabled to UserConfig. The name enabled is usually used for a boolean attribute that disables a feature as a whole. Maybe name the new attributes as enabledUser and disabledUser ? allow and deny would be consistent with other valves. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Keiichi.Fujino - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1310164 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml
Author: kfujino
Date: Fri Apr 6 04:27:41 2012
New Revision: 1310164
URL: http://svn.apache.org/viewvc?rev=1310164view=rev
Log:
Change of an attribute name.
enabled and disabled are changed into allow and deny.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1310164r1=1310163r2=1310164view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java Fri
Apr 6 04:27:41 2012
@@ -103,12 +103,12 @@ public final class UserConfig
/**
* A regular expression defining user who deployment is allowed.
*/
-protected Pattern enabled = null;
+protected Pattern allow = null;
/**
* A regular expression defining user who deployment is denied.
*/
-protected Pattern disabled = null;
+protected Pattern deny = null;
// - Properties
@@ -223,22 +223,22 @@ public final class UserConfig
/**
* Return the regular expression used to test for user who deployment is
allowed.
*/
-public String getEnabled() {
-if (enabled == null) return null;
-return enabled.toString();
+public String getAllow() {
+if (allow == null) return null;
+return allow.toString();
}
/**
* Set the regular expression used to test for user who deployment is
allowed.
*
- * @param enabled The new enabled expression
+ * @param allow The new allow expression
*/
-public void setEnabled(String enabled) {
-if (enabled == null || enabled.length() == 0) {
-this.enabled = null;
+public void setAllow(String allow) {
+if (allow == null || allow.length() == 0) {
+this.allow = null;
} else {
-this.enabled = Pattern.compile(enabled);
+this.allow = Pattern.compile(allow);
}
}
@@ -246,22 +246,22 @@ public final class UserConfig
/**
* Return the regular expression used to test for user who deployment is
denied.
*/
-public String getDisabled() {
-if (disabled == null) return null;
-return disabled.toString();
+public String getDeny() {
+if (deny == null) return null;
+return deny.toString();
}
/**
* Set the regular expression used to test for user who deployment is
denied.
*
- * @param disabled The new disabled expression
+ * @param deny The new deny expression
*/
-public void setDisabled(String disabled) {
-if (disabled == null || disabled.length() == 0) {
-this.disabled = null;
+public void setDeny(String deny) {
+if (deny == null || deny.length() == 0) {
+this.deny = null;
} else {
-this.disabled = Pattern.compile(disabled);
+this.deny = Pattern.compile(deny);
}
}
@@ -323,8 +323,8 @@ public final class UserConfig
EnumerationString users = database.getUsers();
while (users.hasMoreElements()) {
String user = users.nextElement();
+if (!isDeployAllowed(user)) continue;
String home = database.getHome(user);
-if (!isDeployEnabled(user)) continue;
results.add(executor.submit(new DeployUserDirectory(this, user,
home)));
}
@@ -404,17 +404,17 @@ public final class UserConfig
}
/**
- * Test enabled and disabled rules for the provided user.
+ * Test allow and deny rules for the provided user.
*
* @return codetrue/code if this user is allowed to deploy,
* codefalse/code otherwise
*/
-private boolean isDeployEnabled(String user) {
-if (disabled != null disabled.matcher(user).matches()) {
+private boolean isDeployAllowed(String user) {
+if (deny != null deny.matcher(user).matches()) {
return false;
}
-if (enabled != null) {
-if (enabled.matcher(user).matches()) {
+if (allow != null) {
+if (allow.matcher(user).matches()) {
return true;
} else {
return false;
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=1310164r1=1310163r2=1310164view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++
[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, and has been outstanding for 2 runs. 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: 22 mins 21 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-06042012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-06042012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-06042012-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-06042012.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-06042012.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/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.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.
[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 8 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 47 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-06042012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-06042012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-06042012-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-06042012.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-06042012.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
