svn commit: r470746 - in /tomcat/tc6.0.x/trunk: build.properties.default build.xml

2006-11-03 Thread remm 
Author: remm
Date: Fri Nov  3 02:13:00 2006
New Revision: 470746

URL: http://svn.apache.org/viewvc?view=rev&rev=470746
Log:
- Add back jsvc in the build. I don't think commons-daemon needs any package 
renaming.

Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?view=diff&rev=470746&r1=470745&r2=470746
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Fri Nov  3 02:13:00 2006
@@ -61,3 +61,10 @@
 nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-2.18-setup.exe
+
+# - Commons Daemon, version 1.0-Alpha or later -
+commons-daemon.home=${base.path}/commons-daemon-1.0.1
+commons-daemon.lib=${commons-daemon.home}
+commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
+commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diff&rev=470746&r1=470745&r2=470746
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri Nov  3 02:13:00 2006
@@ -70,7 +70,10 @@
 
 
 
-
+
+
+
+   
 
 
 
@@ -440,6 +443,9 @@
 
 
+
+
+

 
   
@@ -530,6 +536,11 @@
   
   
   
+
+
+
+  
+  
 
 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Locale difference with Console and Windows Service

2006-11-03 Thread maxt 

G'day

I am using Windows XP, Tomcat 5.5.17, JRE 1.5.0_08. I am in Australia. For
testing localization, my Windows Region is set to English, US.

When using the Console, tomcat5.exe, my localization files work correctly,
returning the Locale, en_US.

When using Windows Services, the Locale returned is en.AU with the same code
and Region still set to English, US.

In the Services I am using a Classpath command:
C:\Program Files\BMJ\Tomcat\bin\bootstrap.jar
and Java Options:
-Dcatalina.base=C:\Program Files\BMJ\Tomcat
-Dcatalina.home=C:\Program Files\BMJ\Tomcat

Any help explaining how to configure the correct Locale using Services would
be appreciated.

Thanks 
Max


-- 
View this message in context: 
http://www.nabble.com/Locale-difference-with-Console-and-Windows-Service-tf2567110.html#a7155099
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r470756 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: connector/Connector.java connector/Request.java connector/Response.java valves/ErrorReportValve.java

2006-11-03 Thread remm 
Author: remm
Date: Fri Nov  3 02:56:25 2006
New Revision: 470756

URL: http://svn.apache.org/viewvc?view=rev&rev=470756
Log:
- Remove an extra throwable.
- Add a specific flag for recycling facades (when security is on, recycling 
will always be done, obviously).

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?view=diff&rev=470756&r1=470755&r2=470756
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Fri 
Nov  3 02:56:25 2006
@@ -59,6 +59,13 @@
 private static Log log = LogFactory.getLog(Connector.class);
 
 
+/**
+ * Alternate flag to enable recycling of facades.
+ */
+public static final boolean RECYCLE_FACADES =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
 "false")).booleanValue();
+
+
 //  Constructor
 
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java?view=diff&rev=470756&r1=470755&r2=470756
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java Fri 
Nov  3 02:56:25 2006
@@ -423,7 +423,7 @@
 requestedSessionId = null;
 requestedSessionURL = false;
 
-if (Constants.SECURITY) {
+if (Constants.SECURITY || Connector.RECYCLE_FACADES) {
 parameterMap = new ParameterMap();
 } else {
 parameterMap.setLocked(false);
@@ -432,7 +432,7 @@
 
 mappingData.recycle();
 
-if (Constants.SECURITY) {
+if (Constants.SECURITY || Connector.RECYCLE_FACADES) {
 if (facade != null) {
 facade.clear();
 facade = null;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java?view=diff&rev=470756&r1=470755&r2=470756
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Response.java Fri 
Nov  3 02:56:25 2006
@@ -268,7 +268,7 @@
 
 cookies.clear();
 
-if (Constants.SECURITY) {
+if (Constants.SECURITY || Connector.RECYCLE_FACADES) {
 if (facade != null) {
 facade.clear();
 facade = null;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?view=diff&rev=470756&r1=470755&r2=470756
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
Fri Nov  3 02:56:25 2006
@@ -153,8 +153,7 @@
  *  a root cause exception
  */
 protected void report(Request request, Response response,
-  Throwable throwable)
-throws IOException {
+  Throwable throwable) {
 
 // Do nothing on non-HTTP responses
 int statusCode = response.getStatus();



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40884] New: - New rules for docBase broke manager on multiple hosts

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40884

   Summary: New rules for docBase broke manager on multiple hosts
   Product: Tomcat 5
   Version: 5.5.20
  Platform: All
OS/Version: other
Status: NEW
  Severity: regression
  Priority: P1
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


According to the doc 
(http://tomcat.apache.org/tomcat-5.5-doc/manager-howto.html) 

There are two ways to configure the Manager web application Context:

* Install the manager.xml context configuration file in the
$CATALINA_HOME/conf/[enginename]/[hostname] folder.
* Configure the Manager Context within the Host configuration in your Tomcat
server.xml configuration. Here is an example:

  
  


The first way works only in 5.5.9 
The second way works both in 5.5.9 and 5.5.20

I have put an eye on the code, the problem is here 
container/catalina/src/share/org/apache/catalina/startup/HostConfig.java:602:
{
  log.warn(sm.getString("hostConfig.deployDescriptor.localDocBaseSpecified",
  docBase));
  // Ignore specified docBase
  context.setDocBase(null);
}

   When you copy the manager.xml, it needs a docBase, and it is specified in a
local way. 


There is 2 solutions to the problem :
1: Permits to set local doc Base and change the warning.
2: Update documentation to indicate there is no longer 2 ways to add manager on
multiple hosts

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40884] - New rules for docBase broke manager on multiple hosts

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40884


[EMAIL PROTECTED] changed:

   What|Removed |Added

 OS/Version|other   |All




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |NEEDINFO




--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:26 ---
The problem is caused by the interlan implementaion of tomcat's cluster
replciation  DeltaSession. The cluster works only with Principal object derived
from the "org.apache.catalina.realm.GenericPrincipal".

I use an one principal implementation, just as implementation of
java.security.Principal. This avoid any conatiner specific dependencies in the
web applications and works around serval problems with the out of the box
principals of tomcat.

To get rid of the bug, i changed the cluster.session code to get rid of the
SerializablePrincipal  class. To my readings this class is not very well 
designed. The optimised serilaisation can also be places in the implmenetion of
the principal interface ( read/write object) method of java serialisation.

As quick work around, find the changed classes in the attachment:
CHANGED: SimpleTcpReplicationManager
 DeltaSession
ADDED:   PrincipalIO



-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881





--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:28 ---
Created an attachment (id=19078)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19078&action=view)
DeltaSession  patched (5.5.20) 

use plain java serialisation

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881





--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:29 ---
Created an attachment (id=19079)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19079&action=view)
DeltaRequest (5.5.20)

use java serialisation

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881





--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:30 ---
Created an attachment (id=19080)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19080&action=view)
added

added util class for java serialisation. old code is still as comment availbale

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881





--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:30 ---
Created an attachment (id=19081)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19081&action=view)
SimpleTcpReplicationManager  (5.5.20)

use java serilaisation

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881





--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:32 ---
Created an attachment (id=19082)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=19082&action=view)
binary of the cluster  module sources

- binary of the cluster  module sources
- complied Win XP, JDK 1.5.0_05
- including the 4 patches found as sources


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40884] - New rules for docBase broke manager on multiple hosts

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40884


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 05:35 ---
Oups sorry, it was caused by an invalid appBase.
In my server.xml, there was appbase="..." instead of appBase="..."



-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881





--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 11:26 ---
Please produce a really patch and don't send complete patch files.

Then it is easier to help you,

Peter

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 11:34 ---
I have deeper looked at your patch. Arrg!
Not every Principal that we used implements the java.io.Serializable. Which 
realm you used?

Peter



-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40881] - Unable to receive message through TCP channel -> Nullpointer

2006-11-03 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40881


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




--- Additional Comments From [EMAIL PROTECTED]  2006-11-03 11:35 ---
Hups, I need info and bug is not closed.
Sorry!


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Locale difference with Console and Windows Service

2006-11-03 Thread maxt 

Further to the below, the same situation applies to the use of the Robot
class - keystrokes appear correctly when using the Console, but nothing
happens when using the Service.

Max


maxt wrote:
> 
> G'day
> 
> I am using Windows XP, Tomcat 5.5.17, JRE 1.5.0_08. I am in Australia. For
> testing localization, my Windows Region is set to English, US.
> 
> When using the Console, tomcat5.exe, my localization files work correctly,
> returning the Locale, en_US.
> 
> When using Windows Services, the Locale returned is en.AU with the same
> code and Region still set to English, US.
> 
> In the Services I am using a Classpath command:
> C:\Program Files\BMJ\Tomcat\bin\bootstrap.jar
> and Java Options:
> -Dcatalina.base=C:\Program Files\BMJ\Tomcat
> -Dcatalina.home=C:\Program Files\BMJ\Tomcat
> 
> Any help explaining how to configure the correct Locale using Services
> would be appreciated.
> 
> Thanks 
> Max
> 
> 
> 

-- 
View this message in context: 
http://www.nabble.com/Locale-difference-with-Console-and-Windows-Service-tf2567110.html#a7166737
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Locale difference with Console and Windows Service

2006-11-03 Thread Mark Thomas 
maxt wrote:
> Further to the below, the same situation applies to the use of the Robot
> class - keystrokes appear correctly when using the Console, but nothing
> happens when using the Service.
> 
> Max

Both your questions belong on the users list as per
http://tomcat.apache.org/lists.html

Please re-post.

Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

New 6.0.x build

2006-11-03 Thread Remy Maucherat 

Hi,

After all my Jasper fixes (and the other connector fixes), I would like 
to plan a new 6.0.1 tag for Tuesday. I will also add stuff in the build 
scripts to prepackage the Maven uploads.


Comments ?

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r471096 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler: ELNode.java ELParser.java Validator.java

2006-11-03 Thread remm 
Author: remm
Date: Fri Nov  3 18:11:17 2006
New Revision: 471096

URL: http://svn.apache.org/viewvc?view=rev&rev=471096
Log:
- Expose the EL type through the Root node to be able to determine the EL type 
for JspAttribute.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELNode.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELNode.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELNode.java?view=diff&rev=471096&r1=471095&r2=471096
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELNode.java Fri Nov  3 
18:11:17 2006
@@ -45,9 +45,11 @@
 public static class Root extends ELNode {
 
private ELNode.Nodes expr;
+private char type;
 
-   Root(ELNode.Nodes expr) {
+   Root(ELNode.Nodes expr, char type) {
this.expr = expr;
+this.type = type;
}
 
public void accept(Visitor v) throws JasperException {
@@ -57,6 +59,10 @@
public ELNode.Nodes getExpression() {
return expr;
}
+
+public char getType() {
+return type;
+}
 }
 
 /**
@@ -195,7 +201,7 @@
}
}
 
-   public Iterator iterator() {
+   public Iterator iterator() {
return list.iterator();
}
 
@@ -224,6 +230,7 @@
public String getMapName() {
return mapName;
}
+
 }
 
 /*

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?view=diff&rev=471096&r1=471095&r2=471096
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Fri Nov  
3 18:11:17 2006
@@ -71,7 +71,7 @@
 }
 ELNode.Nodes elexpr = parser.parseEL();
 if (!elexpr.isEmpty()) {
-parser.expr.add(new ELNode.Root(elexpr));
+parser.expr.add(new ELNode.Root(elexpr, parser.type));
 }
 }
 return parser.expr;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diff&rev=471096&r1=471095&r2=471096
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Fri Nov 
 3 18:11:17 2006
@@ -39,7 +39,6 @@
 import org.apache.el.lang.ELSupport;
 import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
-import org.apache.jasper.JspCompilationContext;
 import org.apache.jasper.el.ELContextImpl;
 import org.xml.sax.Attributes;
 
@@ -91,7 +90,6 @@
 DirectiveVisitor(Compiler compiler) throws JasperException {
 this.pageInfo = compiler.getPageInfo();
 this.err = compiler.getErrorDispatcher();
-JspCompilationContext ctxt = compiler.getCompilationContext();
 }
 
 public void visit(Node.IncludeDirective n) throws JasperException {
@@ -582,7 +580,6 @@
 
 public void visit(Node.SetProperty n) throws JasperException {
 JspUtil.checkAttributes("SetProperty", n, setPropertyAttrs, err);
-String name = n.getTextAttribute("name");
 String property = n.getTextAttribute("property");
 String param = n.getTextAttribute("param");
 String value = n.getAttributeValue("value");
@@ -816,7 +813,7 @@
 if (jspAttrsSize > 0) {
 jspAttrs = new Node.JspAttribute[jspAttrsSize];
 }
-Hashtable tagDataAttrs = new Hashtable(attrsSize);
+Hashtable tagDataAttrs = new Hashtable(attrsSize);
 
 checkXmlAttributes(n, jspAttrs, tagDataAttrs);
 checkNamedAttributes(n, jspAttrs, attrsSize, tagDataAttrs);
@@ -1010,7 +1007,7 @@
  * considered a dynamic attribute.
  */
 private void checkXmlAttributes(Node.CustomTag n,
-Node.JspAttribute[] jspAttrs, Hashtable tagDataAttrs)
+Node.JspAttribute[] jspAttrs, Hashtable 
tagDataAttrs)
 throws JasperException {
 
 TagInfo tagInfo = n.getTagInfo();
@@ -1166,7 +1163,8 @@
  * attributes
  */
 private void checkNamedAttributes(Node.CustomTag n,
-Node.JspAttribute[] jspAttrs, int start, Hashtable 
tagDataAttrs)