date:20090602

DO NOT REPLY [Bug 47298] New: enabled emptysessionpath not checking if route replacement is needed

2009-06-02 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=47298

   Summary: enabled emptysessionpath not checking if route
replacement is needed
   Product: Tomcat 6
   Version: 6.0.18
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: james.hoa...@ntlworld.com


Hi, our app currently relies on using the attribute emptysessionpath=true on
the ajp connector due to having most of our 
urls not containing the context path of our web app. 

We are having trouble with the jvmroute switching as the Tomcat code doesn't
appear to 
check if the jvmroute is valid for that node? I noticed in the 
org.apache.catalina.session.ManagerBase there is some code that is 
commented out, which would fix the route replacement.


Is it possible to uncomment the route replacement check below in ManagerBase?


code from ManagerBase:

if (sessionId == null) {
sessionId = generateSessionId();
// FIXME WHy we need no duplication check?
/*
 synchronized (sessions) {
while (sessions.get(sessionId) != null) { // Guarantee
// uniqueness
duplicates++;
sessionId = generateSessionId();
}
}
*/

// FIXME: Code to be used in case route replacement is needed
/*
} else {
String jvmRoute = getJvmRoute();
if (getJvmRoute() != null) {
String requestJvmRoute = null;
int index = sessionId.indexOf(".");
if (index > 0) {
requestJvmRoute = sessionId
.substring(index + 1, sessionId.length());
}
if (requestJvmRoute != null && 
!requestJvmRoute.equals(jvmRoute)) {
sessionId = sessionId.substring(0, index) + "." + 
jvmRoute;
}
}
*/
}

-- 
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

svn commit: r781036 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/config/

2009-06-02 Thread fhanik

Author: fhanik
Date: Tue Jun  2 14:04:42 2009
New Revision: 781036

URL: http://svn.apache.org/viewvc?rev=781036&view=rev
Log:
Consolidate directory creation from doing it in multiple places with no 
indication of failure and only for xmlBase to create directories during the 
startup phase for both appBase and xmlBase



Modified:
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/config/host.xml

Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=781036&r1=781035&r2=781036&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Tue Jun  2 14:04:42 2009
@@ -232,5 +232,16 @@
  */
 public void removeAlias(String alias);
 
+/**
+ * Returns true if the Host will attempt to create directories for appBase 
and xmlBase
+ * unless they already exist.
+ * @return
+ */
+public boolean getCreateDirs();
+/**
+ * Set to true if the Host should attempt to create directories for 
xmlBase and appBase upon startup
+ * @param createDirs
+ */
+public void setCreateDirs(boolean createDirs);
 
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=781036&r1=781035&r2=781036&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Tue Jun  2 
14:04:42 2009
@@ -161,7 +161,11 @@
  * Attribute value used to turn on/off XML namespace awarenes.
  */
  private boolean xmlNamespaceAware = false;
-
+ 
+/**
+ * Should we create directories upon startup for appBase and xmlBase
+ */
+ private boolean createDirs = true;
 
 // - Properties
 
@@ -216,6 +220,22 @@
 
 }
 
+/**
+ * Returns true if the Host will attempt to create directories for appBase 
and xmlBase
+ * unless they already exist.
+ * @return
+ */
+public boolean getCreateDirs() {
+return createDirs;
+}
+
+/**
+ * Set to true if the Host should attempt to create directories for 
xmlBase and appBase upon startup
+ * @param createDirs
+ */
+public void setCreateDirs(boolean createDirs) {
+this.createDirs = createDirs;
+}
 
 /**
  * Return the value of the auto deploy flag.  If true, it indicates that 
@@ -680,8 +700,7 @@
 return (sb.toString());
 
 }
-
-
+
 /**
  * Start this host.
  *

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=781036&r1=781035&r2=781036&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Jun  2 
14:04:42 2009
@@ -762,8 +762,6 @@
 if (entry != null) {
 istream = jar.getInputStream(entry);
 
-configBase().mkdirs();
-
 ostream =
 new BufferedOutputStream
 (new FileOutputStream(xml), 1024);
@@ -956,7 +954,6 @@
 digester.reset();
 }
 }
-configBase().mkdirs();
 File xmlCopy = new File(configBase(), file + ".xml");
 InputStream is = null;
 OutputStream os = null;
@@ -1212,6 +1209,15 @@
 } catch (Exception e) {
 log.error(sm.getString("hostConfig.jmx.register", oname), e);
 }
+
+if (host.getCreateDirs()) {
+File[] dirs = new File[] {appBase(),configBase()};
+for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=781036&r1=781035&r2=781036&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue 
Jun  2 14:04:42 2009
@@ -97,3 +97,4 @@
 userConfig.start=UserConfig: Processing START
 userConfig.stop=UserConfig: Processing STOP
 catalina.stopServer=No shutd

DO NOT REPLY [Bug 47299] New: Cannot override StandardContext in embedding case because of StandardSession.fireContainerEvent

2009-06-02 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=47299

   Summary: Cannot override StandardContext in embedding case
because of StandardSession.fireContainerEvent
   Product: Tomcat 6
   Version: 6.0.18
  Platform: PC
OS/Version: Mac OS X 10.4
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: rob.har...@springsource.com


StandardSession.fireContainerEvent checks for the String class name! Why not
just use an instanceof check here?

-- 
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

DO NOT REPLY [Bug 47299] Cannot override StandardContext in embedding case because of StandardSession.fireContainerEvent

2009-06-02 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=47299





--- Comment #1 from Mark Thomas   2009-06-02 08:09:14 PST ---
This is the original reason:
http://svn.apache.org/viewvc?view=rev&revision=287710

Don't think that applies these days.

-- 
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

svn commit: r781067 - in /tomcat/container/tc5.5.x/tester: src/bin/ web/ web/golden/

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Tue Jun  2 15:36:39 2009
New Revision: 781067

URL: http://svn.apache.org/viewvc?rev=781067&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47263
Fix license headers in TC 5.5 tester module where they caused the tests to fail

Added:
tomcat/container/tc5.5.x/tester/web/golden/ErrorPage06html.txt
  - copied unchanged from r779992, 
tomcat/container/tc5.5.x/tester/web/ErrorPage06.html
Modified:
tomcat/container/tc5.5.x/tester/src/bin/tester.xml
tomcat/container/tc5.5.x/tester/web/Authentication04.jsp
tomcat/container/tc5.5.x/tester/web/Encoding01.jsp
tomcat/container/tc5.5.x/tester/web/Encoding02.jsp
tomcat/container/tc5.5.x/tester/web/Encoding03.jsp
tomcat/container/tc5.5.x/tester/web/ErrorPage06.jsp
tomcat/container/tc5.5.x/tester/web/ErrorPage08.jsp
tomcat/container/tc5.5.x/tester/web/ErrorPage10.jsp
tomcat/container/tc5.5.x/tester/web/FilterResponse02.jsp
tomcat/container/tc5.5.x/tester/web/Forward00b.jsp
tomcat/container/tc5.5.x/tester/web/Forward00c.jsp
tomcat/container/tc5.5.x/tester/web/Forward00e.jsp
tomcat/container/tc5.5.x/tester/web/Forward03b.jsp
tomcat/container/tc5.5.x/tester/web/Forward04b.jsp
tomcat/container/tc5.5.x/tester/web/Forward05b.jsp
tomcat/container/tc5.5.x/tester/web/Forward06b.jsp
tomcat/container/tc5.5.x/tester/web/Include00b.jsp
tomcat/container/tc5.5.x/tester/web/Include00c.jsp
tomcat/container/tc5.5.x/tester/web/Include00e.jsp
tomcat/container/tc5.5.x/tester/web/Include03c.jsp
tomcat/container/tc5.5.x/tester/web/Include05b.jsp
tomcat/container/tc5.5.x/tester/web/Include06.jsp
tomcat/container/tc5.5.x/tester/web/Include06b.jsp
tomcat/container/tc5.5.x/tester/web/JspBeans01.jsp
tomcat/container/tc5.5.x/tester/web/JspBeans02.jsp
tomcat/container/tc5.5.x/tester/web/JspBeans03.jsp
tomcat/container/tc5.5.x/tester/web/JspDoc01.jsp
tomcat/container/tc5.5.x/tester/web/JspDoc02.jsp
tomcat/container/tc5.5.x/tester/web/JspForward01a.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude01.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude01a.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude02.jsp
tomcat/container/tc5.5.x/tester/web/JspInclude02a.jsp
tomcat/container/tc5.5.x/tester/web/Property01.jsp
tomcat/container/tc5.5.x/tester/web/Redirect02a.jsp
tomcat/container/tc5.5.x/tester/web/Redirect03a.jsp
tomcat/container/tc5.5.x/tester/web/ResponseWrap01b.jsp
tomcat/container/tc5.5.x/tester/web/ResponseWrap01d.jsp
tomcat/container/tc5.5.x/tester/web/Session07b.jsp
tomcat/container/tc5.5.x/tester/web/WrappedFilterResponse02.jsp
tomcat/container/tc5.5.x/tester/web/Xerces02.jsp

Modified: tomcat/container/tc5.5.x/tester/src/bin/tester.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/src/bin/tester.xml?rev=781067&r1=781066&r2=781067&view=diff
==
--- tomcat/container/tc5.5.x/tester/src/bin/tester.xml (original)
+++ tomcat/container/tc5.5.x/tester/src/bin/tester.xml Tue Jun  2 15:36:39 2009
@@ -289,13 +289,13 @@
  request="${context.path}/ErrorPage05?type=Number"
debug="${debug}"
   status="500"
-  outContent="ErrorPage06 PASSED - HTML"/>
+  golden="${golden.path}/ErrorPage06html.txt"/>
 
 
+  golden="${golden.path}/ErrorPage06html.txt"/>
 
 
 
@@ -340,13 +340,13 @@
  request="${context.path}/ErrorPage08?type=Number"
debug="${debug}"
   status="500"
-  outContent="ErrorPage06 PASSED - HTML"/>
+  golden="${golden.path}/ErrorPage06html.txt"/>
 
 
+  golden="${golden.path}/ErrorPage06html.txt"/>
 
 
 

Modified: tomcat/container/tc5.5.x/tester/web/Authentication04.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Authentication04.jsp?rev=781067&r1=781066&r2=781067&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/Authentication04.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Authentication04.jsp Tue Jun  2 
15:36:39 2009
@@ -1,4 +1,4 @@
-
-<%@ page contentType="text/plain" %><%
+
+--%><%@ page contentType="text/plain" %><%
   StringBuffer results = new StringBuffer();
   String remoteUser = request.getRemoteUser();
   if (remoteUser == null) {

Modified: tomcat/container/tc5.5.x/tester/web/Encoding01.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/Encoding01.jsp?rev=781067&r1=781066&r2=781067&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/Encoding01.jsp (original)
+++ tomcat/container/tc5.5.x/tester/web/Encoding01.jsp Tue Jun  2 15:36:39 2009
@@ -1,4 +1,4 @@
-
 
+--%>
 <%@ page contentType="text/html;charset=SJIS" %>
 
 Test Character

Modified: tomcat/container/tc5.

Re: [VOTE] Release build 6.0.20

2009-06-02 Thread Martin Dubuc

What is going to happen to the 6.0.20 load? Will it be officially released?
If it will, when and will it be identical to the load found at:
http://people.apache.org/~remm/tomcat-6/v6.0.20/?

Martin

On Wed, May 13, 2009 at 7:33 PM, Remy Maucherat  wrote:

> The candidates binaries are available here:
> http://people.apache.org/~remm/tomcat-6/v6.0.20/
>
> According to the release process, the 6.0.20 tag is:
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [ ] Stable
>
> Rémy
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release build 6.0.20

2009-06-02 Thread Remy Maucherat

On Tue, 2009-06-02 at 13:22 -0400, Martin Dubuc wrote:
> What is going to happen to the 6.0.20 load? Will it be officially released?
> If it will, when and will it be identical to the load found at:
> http://people.apache.org/~remm/tomcat-6/v6.0.20/?

I've been in "lazy" mode ...

It has been mirrored, so only the last step remains (updating the
website).

Rémy



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release build 6.0.20

2009-06-02 Thread Filip Hanik - Dev Lists


Martin Dubuc wrote:

What is going to happen to the 6.0.20 load? Will it be officially released?
  
that is based on the voting results, which passed, so yes, it will be 
released.



If it will, when and will it be identical to the load found at:
http://people.apache.org/~remm/tomcat-6/v6.0.20/?
  
releases are source based, so only the sources would have to be 
identical, but my guess is that everything will be.


Filip

Martin

On Wed, May 13, 2009 at 7:33 PM, Remy Maucherat  wrote:

  

The candidates binaries are available here:
http://people.apache.org/~remm/tomcat-6/v6.0.20/

According to the release process, the 6.0.20 tag is:
[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable

Rémy



-
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

Re: [VOTE] Release build 6.0.20

2009-06-02 Thread sebb

On 02/06/2009, Filip Hanik - Dev Lists  wrote:
> Martin Dubuc wrote:
>
> > What is going to happen to the 6.0.20 load? Will it be officially
> released?
> >
> >
>  that is based on the voting results, which passed, so yes, it will be
> released.

I've not seen the [VOTE][RESULT] e-mail ?

>
> > If it will, when and will it be identical to the load found at:
> >
> http://people.apache.org/~remm/tomcat-6/v6.0.20/?
> >
> >
>  releases are source based, so only the sources would have to be identical,
> but my guess is that everything will be.
>
>  Filip
>
>
> > Martin
> >
> > On Wed, May 13, 2009 at 7:33 PM, Remy Maucherat  wrote:
> >
> >
> >
> > > The candidates binaries are available here:
> > >
> http://people.apache.org/~remm/tomcat-6/v6.0.20/
> > >
> > > According to the release process, the 6.0.20 tag is:
> > > [ ] Broken
> > > [ ] Alpha
> > > [ ] Beta
> > > [ ] Stable
> > >
> > > Rémy
> > >
> > >
> > >
> > >
> -
> > > 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
>
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r781140 - /tomcat/container/tc5.5.x/tester/web/golden/

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Tue Jun  2 19:53:01 2009
New Revision: 781140

URL: http://svn.apache.org/viewvc?rev=781140&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47263
Fix license headers for SSI tests in TC 5.5 tester module
For SSI tests I cannot hide them from output, thus I update the expected test 
results.

Modified:
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional01.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional02.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional03.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional04.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional05.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional06.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional07.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConditional08.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConfig01.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIConfig03.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIExecCGI.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIFsize02.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIInclude01.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIInclude02.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIInclude03.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIVarSub01.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIVarSub02.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIVarSub03.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIVarSub04.txt
tomcat/container/tc5.5.x/tester/web/golden/SSIVarSub05.txt

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional01.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional01.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditional01.txt (original)
+++ tomcat/container/tc5.5.x/tester/web/golden/SSIConditional01.txt Tue Jun  2 
19:53:01 2009
@@ -1,3 +1,19 @@
+
 Before if block.
 
 

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional02.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional02.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditional02.txt (original)
+++ tomcat/container/tc5.5.x/tester/web/golden/SSIConditional02.txt Tue Jun  2 
19:53:01 2009
@@ -1,3 +1,19 @@
+
 Before if block.
 
 

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional03.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional03.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditional03.txt (original)
+++ tomcat/container/tc5.5.x/tester/web/golden/SSIConditional03.txt Tue Jun  2 
19:53:01 2009
@@ -1,3 +1,19 @@
+
 Before if block.
 
 

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional04.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional04.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditional04.txt (original)
+++ tomcat/container/tc5.5.x/tester/web/golden/SSIConditional04.txt Tue Jun  2 
19:53:01 2009
@@ -1,3 +1,19 @@
+
 
 
 

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional05.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional05.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditional05.txt (original)
+++ tomcat/container/tc5.5.x/tester/web/golden/SSIConditional05.txt Tue Jun  2 
19:53:01 2009
@@ -1,3 +1,19 @@
+
 
 
 

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional06.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional06.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditional06.txt (original)
+++ tomcat/container/tc5.5.x/tester/web/golden/SSIConditional06.txt Tue Jun  2 
19:53:01 2009
@@ -1,3 +1,19 @@
+
 
 
 

Modified: tomcat/container/tc5.5.x/tester/web/golden/SSIConditional07.txt
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/web/golden/SSIConditional07.txt?rev=781140&r1=781139&r2=781140&view=diff
==
--- tomcat/container/tc5.5.x/tester/web/golden/SSIConditi

svn commit: r781143 - /tomcat/container/tc5.5.x/tester/src/bin/tester.xml

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Tue Jun  2 20:03:42 2009
New Revision: 781143

URL: http://svn.apache.org/viewvc?rev=781143&view=rev
Log:
In TC 5.5 tester module:
Add SSIConditional* and SSIVarSub* tests to the testsuite file.
Note, that all SSITest tests there, including these ones, are disabled by 
default.

Modified:
tomcat/container/tc5.5.x/tester/src/bin/tester.xml

Modified: tomcat/container/tc5.5.x/tester/src/bin/tester.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/src/bin/tester.xml?rev=781143&r1=781142&r2=781143&view=diff
==
--- tomcat/container/tc5.5.x/tester/src/bin/tester.xml (original)
+++ tomcat/container/tc5.5.x/tester/src/bin/tester.xml Tue Jun  2 20:03:42 2009
@@ -1888,7 +1888,63 @@
  request="${context.path}/SSIFsize08.shtml" debug="${debug}"
   golden="${golden.path}/SSIFsize02.txt"/>
 
-  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 -->

DO NOT REPLY [Bug 47263] License headers in jsp files break TC 5.5 testsuite

2009-06-02 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=47263


Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #1 from Konstantin Kolinko   2009-06-02 
13:14:06 PST ---
Fixed. (r781067, r781140)

-- 
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

svn commit: r781171 - in /tomcat/site/trunk: docs/download-60.html docs/index.html xdocs/download-60.xml xdocs/index.xml

2009-06-02 Thread remm

Author: remm
Date: Tue Jun  2 21:12:03 2009
New Revision: 781171

URL: http://svn.apache.org/viewvc?rev=781171&view=rev
Log:
- Website update.

Modified:
tomcat/site/trunk/docs/download-60.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/download-60.xml
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/download-60.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=781171&r1=781170&r2=781171&view=diff
==
--- tomcat/site/trunk/docs/download-60.html (original)
+++ tomcat/site/trunk/docs/download-60.html Tue Jun  2 21:12:03 2009
@@ -3,17 +3,17 @@
 
 
 Apache Tomcat - Apache Tomcat 6 Downloads
-
-
+
+
 
-
-
+
+
 
 
 
 
 http://tomcat.apache.org/";>
-
+
 
 
 
@@ -24,28 +24,28 @@
 
 
 http://www.apache.org/";>
-http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache 
Logo" border="0"/>
+http://www.apache.org/images/asf-logo.gif"; />
 
 
 
 
 
-http://www.google.com/search"; method="get">
-
-
-
+http://www.google.com/search";>
+
+
+
 
 
-
+
 
 
 
-
+
 
 
 
 
-
+
 
 Apache Tomcat
 
@@ -174,11 +174,11 @@
 
 
 
-
-
+
+
 
 
-
+
 
 Tomcat 6 Downloads
 
@@ -199,14 +199,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 Quick Navigation
 
@@ -218,8 +218,8 @@
 
 
 http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS |
-6.0.18 |
-Browse |
+6.0.20 |
+Browse |
 http://archive.apache.org/dist/tomcat/tomcat-6";>Archives
   
 
@@ -227,14 +227,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 Release Integrity
 
@@ -258,14 +258,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
 Mirrors
 
@@ -281,8 +281,8 @@
encounter a problem with this mirror, please select another
mirror.  If all mirrors are failing, there are backup
mirrors (at the end of the mirrors list) that should be
-   available.[if-any logo]
-
+   available.[if-any logo]
+
 [end]
 
 
@@ -297,7 +297,7 @@
[for backup][backup] (backup)[end]
[end]
  
-
+
 
 
   
@@ -308,16 +308,16 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
-
-6.0.18
+
+
+6.0.20
 
 
 
@@ -327,15 +327,15 @@
 
 
   
-  Please see the 
-  README
+  Please see the 
+  README
   file for packaging information.  It explains what every distribution 
contains.
   
 
-  
+  
 
 
-
+
 
 Binary Distributions
 
@@ -349,33 +349,33 @@
 Core:
   
   
-zip 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.zip.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.zip.md5";>md5)
+zip 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.zip.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.zip.md5";>md5)
   
   
-tar.gz
 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.tar.gz.md5";>md5)
+tar.gz
 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.tar.gz.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.tar.gz.md5";>md5)
   
   
-Windows 
Service Installer 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.exe.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18.exe.md5";>md5)
+Windows 
Service Installer 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.exe.asc";>pgp,
 
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.exe.md5";>md5)
   
   
 
 Deployer:
   
   
-zip
 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.zip.asc";>pgp,
  
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.zip.md5";>md5)
+zip
 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20-deployer.zip.asc";>pgp,
  
+http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20-deployer.zip.md5";>md5)
   
   
-tar.gz
 
-(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.tar.gz.asc";>pgp,
 
-http://www.apache.org/dist/tomcat/tomcat-6/v6.0.18/bin/apache-tomcat-6.0.18-deployer.tar.gz.md5";>md5)
+tar.gz
 
+(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20-deployer.tar.gz.asc";>pgp,
 
+http://www.apache.org/dist/tom

svn commit: r781211 - /tomcat/current/tc5.5.x/STATUS.txt

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Tue Jun  2 23:31:56 2009
New Revision: 781211

URL: http://svn.apache.org/viewvc?rev=781211&view=rev
Log:
proposal

Modified:
tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=781211&r1=781210&r2=781211&view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jun  2 23:31:56 2009
@@ -276,7 +276,15 @@
   +1: kkolinko
   -1:
 
-* Make 64-bit binaries/installer avaialble for 5.5.x as well as 6.0.x
+* Make 64-bit binaries/installer available for 5.5.x as well as 6.0.x
   http://svn.apache.org/viewvc?rev=777624&view=rev 
   +1: markt
   -1: 
+
+* Fix download task for NSIS so that it installs what it downloads,
+  instead of just downloading an exe installer.
+  This is partial backport of 
http://svn.apache.org/viewvc?view=rev&revision=673614
+  Also, update to NSIS 2.44
+  
http://people.apache.org/~kkolinko/patches/2009-06-03_nsis-download-tc55.patch
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r781213 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.properties.default webapps/docs/changelog.xml

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Tue Jun  2 23:45:54 2009
New Revision: 781213

URL: http://svn.apache.org/viewvc?rev=781213&view=rev
Log:
Update to NSIS 2.44

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  2 23:45:54 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,777576
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,776924,777576

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=781213&r1=781212&r2=781213&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun  2 23:45:54 2009
@@ -107,11 +107,6 @@
   +1: kkolinko, markt, funkman
   -1:
 
-* Update to NSIS 2.44
-  http://svn.apache.org/viewvc?rev=776924&view=rev
-  +1: kkolinko, markt, funkman
-  -1:
-
 * Build files: Calculate current year automatically by using .
   http://svn.apache.org/viewvc?rev=776935&view=rev
   +1: kkolinko, markt,funkman

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=781213&r1=781212&r2=781213&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jun  2 23:45:54 2009
@@ -85,12 +85,12 @@
 
commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
 
 # - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.37
+nsis.home=${base.path}/nsis-2.44
 nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
 nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.37.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.44.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
 commons-daemon.home=${base.path}/commons-daemon-1.0.1

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=781213&r1=781212&r2=781213&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun  2 23:45:54 2009
@@ -28,6 +28,7 @@
 Filip Hanik
 Rainer Jung
 Peter Rossbach
+Konstantin Kolinko
 Changelog
   
 
@@ -76,6 +77,9 @@
 distributions. Update the Windows installer to automatically use the
 correct binary on 64-bit machines. (markt)
   
+  
+Update to NSIS 2.44 (kkolinko)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.ap

svn commit: r781215 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.xml dist.xml extras.xml

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Wed Jun  3 00:04:37 2009
New Revision: 781215

URL: http://svn.apache.org/viewvc?rev=781215&view=rev
Log:
Build files: Calculate current year automatically by using .

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  3 00:04:37 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,776924,777576
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,776924,776935,777576

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=781215&r1=781214&r2=781215&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun  3 00:04:37 2009
@@ -107,11 +107,6 @@
   +1: kkolinko, markt, funkman
   -1:
 
-* Build files: Calculate current year automatically by using .
-  http://svn.apache.org/viewvc?rev=776935&view=rev
-  +1: kkolinko, markt,funkman
-  -1:
-
 * In dist-javadoc target of dist.xml:
1) use © on the web page, instead of a symbol
   Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=47239

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=781215&r1=781214&r2=781215&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jun  3 00:04:37 2009
@@ -29,7 +29,9 @@
 
   
   
-  
+  
+
+  
   
   
   

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=781215&r1=781214&r2=781215&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jun  3 00:04:37 2009
@@ -29,7 +29,9 @@
 
   
   
-  
+  
+
+  
   
   
   

Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=781215&r1=781214&r2=781215&view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Jun  3 00:04:37 2009
@@ -29,7 +29,9 @@
 
   
   
-  
+  
+
+  
   
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r781220 - in /tomcat/tc6.0.x/trunk: ./ dist.xml

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Wed Jun  3 00:18:26 2009
New Revision: 781220

URL: http://svn.apache.org/viewvc?rev=781220&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47239
Use HTML entity for copyright symbol, and use value for the year.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/dist.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  3 00:18:26 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,776924,776935,777576
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,776924,776935,777576,777625

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=781220&r1=781219&r2=781220&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jun  3 00:18:26 2009
@@ -263,7 +263,7 @@
   author="true" version="true"
   windowtitle="Tomcat API Documentation"
   doctitle="Tomcat API"
-  bottom="Copyright © 2000-2008 Apache Software Foundation.  All 
Rights Reserved."
+  bottom="Copyright © 2000-${year} Apache Software Foundation.  
All Rights Reserved."
   additionalparam="-breakiterator"
   maxmemory="256m" >
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r781222 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-06-02 Thread kkolinko

Author: kkolinko
Date: Wed Jun  3 00:21:24 2009
New Revision: 781222

URL: http://svn.apache.org/viewvc?rev=781222&view=rev
Log:
followup for rev.781220
remove applied patch from STATUS

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=781222&r1=781221&r2=781222&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun  3 00:21:24 2009
@@ -107,28 +107,6 @@
   +1: kkolinko, markt, funkman
   -1:
 
-* In dist-javadoc target of dist.xml:
-   1) use © on the web page, instead of a symbol
-  Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=47239
-   2) use value of ${year}
-  Patch:
-Index: dist.xml
-===
 dist.xml   (revision 776003)
-+++ dist.xml   (working copy)
-@@ -260,7 +260,7 @@
-   author="true" version="true"
-   windowtitle="Tomcat API Documentation"
-   doctitle="Tomcat API"
--  bottom="Copyright © 2000-2008 Apache Software Foundation.  All 
Rights Reserved."
-+  bottom="Copyright © 2000-${year} Apache Software Foundation.  
All Rights Reserved."
-   additionalparam="-breakiterator"
-   maxmemory="256m" >
- 
-
-  +1: kkolinko, markt, funkman
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
   For zip/tgz distributives it was already fixed in 6.0.17, 5.5.27.
   Now, apply the same fix to exe distributive.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 47239] Fix Copyright sign in generated Javadoc

2009-06-02 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=47239


Konstantin Kolinko  changed:

   What|Removed |Added

  Component|Documentation   |Webapps:Documentation
Version|unspecified |Nightly Build
Product|Tomcat 6|Tomcat 5
   Target Milestone|default |---




--- Comment #2 from Konstantin Kolinko   2009-06-02 
17:52:18 PST ---
Fixed in 6.0.x (revision 781220 ( 
https://svn.apache.org/viewcvs.cgi?view=rev&rev=781220 )), will be in 6.0.21 
onwards.

-- 
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

DO NOT REPLY [Bug 47298] New: enabled emptysessionpath not checking if route replacement is needed

svn commit: r781036 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/config/

DO NOT REPLY [Bug 47299] New: Cannot override StandardContext in embedding case because of StandardSession.fireContainerEvent

DO NOT REPLY [Bug 47299] Cannot override StandardContext in embedding case because of StandardSession.fireContainerEvent

svn commit: r781067 - in /tomcat/container/tc5.5.x/tester: src/bin/ web/ web/golden/

Re: [VOTE] Release build 6.0.20

Re: [VOTE] Release build 6.0.20

Re: [VOTE] Release build 6.0.20

Re: [VOTE] Release build 6.0.20

svn commit: r781140 - /tomcat/container/tc5.5.x/tester/web/golden/

svn commit: r781143 - /tomcat/container/tc5.5.x/tester/src/bin/tester.xml

DO NOT REPLY [Bug 47263] License headers in jsp files break TC 5.5 testsuite

svn commit: r781171 - in /tomcat/site/trunk: docs/download-60.html docs/index.html xdocs/download-60.xml xdocs/index.xml

svn commit: r781211 - /tomcat/current/tc5.5.x/STATUS.txt

svn commit: r781213 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.properties.default webapps/docs/changelog.xml

svn commit: r781215 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.xml dist.xml extras.xml

svn commit: r781220 - in /tomcat/tc6.0.x/trunk: ./ dist.xml

svn commit: r781222 - /tomcat/tc6.0.x/trunk/STATUS.txt

DO NOT REPLY [Bug 47239] Fix Copyright sign in generated Javadoc

19 matches

Site Navigation

Mail list logo

Footer information