svn commit: r1037188 - in /tomcat/site/trunk: docs/images/tomcat.gif xdocs/images/tomcat.gif

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 12:17:59 2010
New Revision: 1037188

URL: http://svn.apache.org/viewvc?rev=1037188&view=rev
Log:
Use smaller tm graphics

Modified:
tomcat/site/trunk/docs/images/tomcat.gif
tomcat/site/trunk/xdocs/images/tomcat.gif

Modified: tomcat/site/trunk/docs/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/images/tomcat.gif?rev=1037188&r1=1037187&r2=1037188&view=diff
==
Binary files - no diff available.

Modified: tomcat/site/trunk/xdocs/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/images/tomcat.gif?rev=1037188&r1=1037187&r2=1037188&view=diff
==
Binary files - no diff available.



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

svn commit: r1037199 - /tomcat/trunk/res/side_left.bmp

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 12:45:02 2010
New Revision: 1037199

URL: http://svn.apache.org/viewvc?rev=1037199&view=rev
Log:
Add tm

Modified:
tomcat/trunk/res/side_left.bmp

Modified: tomcat/trunk/res/side_left.bmp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/side_left.bmp?rev=1037199&r1=1037198&r2=1037199&view=diff
==
Binary files - no diff available.



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

DO NOT REPLY [Bug 50308] New: Call to AsyncContext.dispatch() in the onTimeout callback throws exception

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50308

   Summary: Call to AsyncContext.dispatch() in the onTimeout
callback throws exception
   Product: Tomcat 7
   Version: 7.0.4
  Platform: PC
Status: NEW
  Severity: critical
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: juriy.b...@gmail.com


When dispatch() method is called inside the onTimeout() function of the
AsyncListener, the exception is thrown:

SEVERE: An exception or error occurred in the container during the request
processing
java.lang.IllegalStateException: Calling [dispatchAsync()] is not valid for a
request with Async state [TIMING_OUT]
at
org.apache.coyote.AsyncStateMachine.asyncDispatch(AsyncStateMachine.java:220)
at
org.apache.coyote.http11.Http11NioProcessor.actionInternal(Http11NioProcessor.java:672)
at
org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:937)
at org.apache.coyote.Request.action(Request.java:348)
at
org.apache.catalina.core.AsyncContextImpl.dispatch(AsyncContextImpl.java:173)
at
org.apache.catalina.core.AsyncContextImpl.dispatch(AsyncContextImpl.java:135)
at
org.apache.catalina.core.AsyncContextImpl.dispatch(AsyncContextImpl.java:130)
at com.juriy.snowball.SnowServlet$1.onTimeout(SnowServlet.java:23)
at
org.apache.catalina.core.AsyncListenerWrapper.fireOnTimeout(AsyncListenerWrapper.java:45)
at
org.apache.catalina.core.AsyncContextImpl.timeout(AsyncContextImpl.java:109)
at
org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:270)
at
org.apache.coyote.http11.Http11NioProcessor.asyncDispatch(Http11NioProcessor.java:232)
at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.event(Http11NioProtocol.java:305)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1526)
at
java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:619)


The sample code is below:

protected void service(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
AsyncContext context = request.startAsync();
context.setTimeout(3000);
context.addListener(new AsyncListener() {

public void onComplete(AsyncEvent asyncEvent) throws IOException {}

public void onTimeout(AsyncEvent asyncEvent) throws IOException {
System.out.println("HITTING TIMEOUT");
asyncEvent.getAsyncContext().dispatch();
}

public void onError(AsyncEvent asyncEvent) throws IOException {}

public void onStartAsync(AsyncEvent asyncEvent) throws IOException
{}
});
}


It looks like the Servlet 3.0 specification allows to do such call, here's the
quotation that explicitly states the flow of the timeouted async contexts (page
18):

"In the event that an asynchronous operation times out, the container must run
through the following steps:
■ Invoke the AsyncListener.onTimeout method on all the AsyncListener
instances registered with the ServletRequest on which the asynchronous
operation was initiated.
■ If none of the listeners called AsyncContext.complete() or any of the
AsyncContext.dispatch methods, perform an error dispatch with a status
code equal to HttpServletResponse.SC_INTERNAL_SERVER_ERROR.
■ If no matching error page was found, or the error page did not call
AsyncContext.complete() or any of the AsyncContext.dispatch
methods, the container MUST call AsyncContext.complete()"

Second step assumes that the call to dispatch in onTimeout() is allowed.

-- 
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: r1037267 - /tomcat/native/branches/1.1.x/xdocs/images/tomcat.gif

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:04:28 2010
New Revision: 1037267

URL: http://svn.apache.org/viewvc?rev=1037267&view=rev
Log:
Add tm logo

Modified:
tomcat/native/branches/1.1.x/xdocs/images/tomcat.gif

Modified: tomcat/native/branches/1.1.x/xdocs/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/images/tomcat.gif?rev=1037267&r1=1037266&r2=1037267&view=diff
==
Binary files - no diff available.



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

svn commit: r1037268 - /tomcat/native/trunk/xdocs/images/tomcat.gif

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:04:41 2010
New Revision: 1037268

URL: http://svn.apache.org/viewvc?rev=1037268&view=rev
Log:
Add tm logo

Modified:
tomcat/native/trunk/xdocs/images/tomcat.gif

Modified: tomcat/native/trunk/xdocs/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/images/tomcat.gif?rev=1037268&r1=1037267&r2=1037268&view=diff
==
Binary files - no diff available.



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

svn commit: r1037270 - /tomcat/jk/trunk/xdocs/images/tomcat.gif

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:06:22 2010
New Revision: 1037270

URL: http://svn.apache.org/viewvc?rev=1037270&view=rev
Log:
Add tm logo

Modified:
tomcat/jk/trunk/xdocs/images/tomcat.gif

Modified: tomcat/jk/trunk/xdocs/images/tomcat.gif
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/tomcat.gif?rev=1037270&r1=1037269&r2=1037270&view=diff
==
Binary files - no diff available.



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

svn commit: r1037273 - in /tomcat/site/trunk: docs/images/tomcat-power.gif xdocs/images/tomcat-power.gif

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:13:49 2010
New Revision: 1037273

URL: http://svn.apache.org/viewvc?rev=1037273&view=rev
Log:
Add tm powered by logo

Modified:
tomcat/site/trunk/docs/images/tomcat-power.gif
tomcat/site/trunk/xdocs/images/tomcat-power.gif

Modified: tomcat/site/trunk/docs/images/tomcat-power.gif
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/images/tomcat-power.gif?rev=1037273&r1=1037272&r2=1037273&view=diff
==
Binary files - no diff available.

Modified: tomcat/site/trunk/xdocs/images/tomcat-power.gif
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/images/tomcat-power.gif?rev=1037273&r1=1037272&r2=1037273&view=diff
==
Binary files - no diff available.



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

svn commit: r1037274 - /tomcat/trunk/webapps/ROOT/tomcat-power.gif

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:15:09 2010
New Revision: 1037274

URL: http://svn.apache.org/viewvc?rev=1037274&view=rev
Log:
Add tm powered by logo

Modified:
tomcat/trunk/webapps/ROOT/tomcat-power.gif

Modified: tomcat/trunk/webapps/ROOT/tomcat-power.gif
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat-power.gif?rev=1037274&r1=1037273&r2=1037274&view=diff
==
Binary files - no diff available.



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

svn commit: r1037276 - in /tomcat/trunk/webapps/ROOT: asf-logo.png bg-button.png bg-middle.png bg-nav-item.png bg-nav.png bg-upper.png border-radius.htc tomcat.css tomcat.png

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:29:50 2010
New Revision: 1037276

URL: http://svn.apache.org/viewvc?rev=1037276&view=rev
Log:
Images are not executable

Modified:
tomcat/trunk/webapps/ROOT/asf-logo.png   (props changed)
tomcat/trunk/webapps/ROOT/bg-button.png   (props changed)
tomcat/trunk/webapps/ROOT/bg-middle.png   (props changed)
tomcat/trunk/webapps/ROOT/bg-nav-item.png   (props changed)
tomcat/trunk/webapps/ROOT/bg-nav.png   (props changed)
tomcat/trunk/webapps/ROOT/bg-upper.png   (props changed)
tomcat/trunk/webapps/ROOT/border-radius.htc   (props changed)
tomcat/trunk/webapps/ROOT/tomcat.css   (props changed)
tomcat/trunk/webapps/ROOT/tomcat.png   (props changed)

Propchange: tomcat/trunk/webapps/ROOT/asf-logo.png
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/bg-button.png
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/bg-middle.png
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/bg-nav-item.png
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/bg-nav.png
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/bg-upper.png
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/border-radius.htc
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/tomcat.css
('svn:executable' removed)

Propchange: tomcat/trunk/webapps/ROOT/tomcat.png
('svn:executable' removed)



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

svn commit: r1037277 - /tomcat/trunk/webapps/ROOT/tomcat.png

2010-11-20 Thread mturk 
Author: mturk
Date: Sat Nov 20 17:34:56 2010
New Revision: 1037277

URL: http://svn.apache.org/viewvc?rev=1037277&view=rev
Log:
Use image with tm (the same as tomcat.gif logo)

Modified:
tomcat/trunk/webapps/ROOT/tomcat.png

Modified: tomcat/trunk/webapps/ROOT/tomcat.png
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/tomcat.png?rev=1037277&r1=1037276&r2=1037277&view=diff
==
Binary files - no diff available.



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

svn commit: r1037280 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml

2010-11-20 Thread jboynes 
Author: jboynes
Date: Sat Nov 20 17:58:31 2010
New Revision: 1037280

URL: http://svn.apache.org/viewvc?rev=1037280&view=rev
Log:
remove taglib report as it fails due to multiple tlds

Modified:
tomcat/taglibs/taglibs-parent/trunk/pom.xml

Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1037280&r1=1037279&r2=1037280&view=diff
==
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sat Nov 20 17:58:31 2010
@@ -149,10 +149,6 @@
   
 
   
-net.sourceforge.maven-taglib
-maven-taglib-plugin
-  
-  
 maven-javadoc-plugin
 
   true



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

DO NOT REPLY [Bug 50305] Provide an option to disable session tracking with URL

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50305

--- Comment #2 from Konstantin Kolinko  2010-11-20 
13:07:39 EST ---
It is already implemented in TC6. See bug 49811 and
http://svn.apache.org/viewvc?rev=1027196&view=rev

-- 
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: r1037284 [6/12] - in /tomcat/taglibs/standard/trunk/jstlel: ./ src/main/java/org/apache/taglibs/standard/lang/jstl/ src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ src/main/jav

2010-11-20 Thread jboynes 
Modified: 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java?rev=1037284&r1=1037283&r2=1037284&view=diff
==
--- 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
 Sat Nov 20 18:14:00 2010
@@ -13,62 +13,59 @@
  * 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.
- */ 
+ */
 
 package org.apache.taglibs.standard.lang.jstl;
 
 /**
- *
  * This is the superclass for all relational operators (except ==
  * or !=)
- * 
+ *
  * @author Nathan Abramson - Art Technology Group
  * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
 
 public abstract class RelationalOperator
-  extends BinaryOperator
-{
-  //-
-  /**
-   *
-   * Applies the operator to the given value
-   **/
-  public Object apply (Object pLeft,
-  Object pRight,
-  Object pContext,
-  Logger pLogger)
-throws ELException
-  {
-return Coercions.applyRelationalOperator (pLeft, pRight, this, pLogger);
-  }
-
-  //-
-  /**
-   *
-   * Applies the operator to the given double values
-   **/
-  public abstract boolean apply (double pLeft,
-double pRight,
-Logger pLogger);
-  
-  //-
-  /**
-   *
-   * Applies the operator to the given long values
-   **/
-  public abstract boolean apply (long pLeft,
-long pRight,
-Logger pLogger);
-  
-  //-
-  /**
-   *
-   * Applies the operator to the given String values
-   **/
-  public abstract boolean apply (String pLeft,
-String pRight,
-Logger pLogger);
+extends BinaryOperator {
+//-
+
+/**
+ * Applies the operator to the given value
+ */
+public Object apply(Object pLeft,
+Object pRight,
+Object pContext,
+Logger pLogger)
+throws ELException {
+return Coercions.applyRelationalOperator(pLeft, pRight, this, pLogger);
+}
+
+//-
+
+/**
+ * Applies the operator to the given double values
+ */
+public abstract boolean apply(double pLeft,
+  double pRight,
+  Logger pLogger);
+
+//-
+
+/**
+ * Applies the operator to the given long values
+ */
+public abstract boolean apply(long pLeft,
+  long pRight,
+  Logger pLogger);
+
+//-
+
+/**
+ * Applies the operator to the given String values
+ */
+public abstract boolean apply(String pLeft,
+  String pRight,
+  Logger pLogger);
 
-  //-
+//-
 }

Modified: 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java?rev=1037284&r1=1037283&r2=1037284&view=diff
==
--- 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
 Sat Nov 20 18:14:00 2010
@@ -13,172 +13,156 @@
  * 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.
- */ 
+ */
 
 package org.apache.taglibs.standard.lang.jstl;
 
 /**
- *
  * An expression representing a String literal value.
- * 
+ *
  * @author Nathan Abramson - Art Technology Group
  * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
 
 public class StringLiteral
-  extends Literal
-{
-  //-
-  /**
-   *
-   * Construct

svn commit: r1037284 [12/12] - in /tomcat/taglibs/standard/trunk/jstlel: ./ src/main/java/org/apache/taglibs/standard/lang/jstl/ src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ src/main/ja

2010-11-20 Thread jboynes 
Modified: 
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java?rev=1037284&r1=1037283&r2=1037284&view=diff
==
--- 
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
 Sat Nov 20 18:14:00 2010
@@ -13,7 +13,7 @@
  * 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.
- */ 
+ */
 
 package org.apache.taglibs.standard.lang.jstl.test;
 
@@ -21,257 +21,351 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
  * This is a test bean with a set of properties
- * 
+ *
  * @author Nathan Abramson - Art Technology Group
  * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
- **/
+ */
+
+public class Bean1 {
+//-
+// Properties
+//-
+// property boolean1
+
+boolean mBoolean1;
+
+public boolean getBoolean1() {
+return mBoolean1;
+}
+
+public void setBoolean1(boolean pBoolean1) {
+mBoolean1 = pBoolean1;
+}
+
+//-
+// property byte1
+
+byte mByte1;
+
+public byte getByte1() {
+return mByte1;
+}
+
+public void setByte1(byte pByte1) {
+mByte1 = pByte1;
+}
+
+//-
+// property char1
+
+char mChar1;
+
+public char getChar1() {
+return mChar1;
+}
+
+public void setChar1(char pChar1) {
+mChar1 = pChar1;
+}
+
+//-
+// property short1
+
+short mShort1;
+
+public short getShort1() {
+return mShort1;
+}
+
+public void setShort1(short pShort1) {
+mShort1 = pShort1;
+}
+
+//-
+// property int1
+
+int mInt1;
+
+public int getInt1() {
+return mInt1;
+}
+
+public void setInt1(int pInt1) {
+mInt1 = pInt1;
+}
+
+//-
+// property long1
+
+long mLong1;
+
+public long getLong1() {
+return mLong1;
+}
+
+public void setLong1(long pLong1) {
+mLong1 = pLong1;
+}
+
+//-
+// property float1
+
+float mFloat1;
+
+public float getFloat1() {
+return mFloat1;
+}
+
+public void setFloat1(float pFloat1) {
+mFloat1 = pFloat1;
+}
+
+//-
+// property double1
+
+double mDouble1;
+
+public double getDouble1() {
+return mDouble1;
+}
+
+public void setDouble1(double pDouble1) {
+mDouble1 = pDouble1;
+}
+
+//-
+// property boolean2
+
+Boolean mBoolean2;
+
+public Boolean getBoolean2() {
+return mBoolean2;
+}
+
+public void setBoolean2(Boolean pBoolean2) {
+mBoolean2 = pBoolean2;
+}
+
+//-
+// property byte2
+
+Byte mByte2;
+
+public Byte getByte2() {
+return mByte2;
+}
+
+public void setByte2(Byte pByte2) {
+mByte2 = pByte2;
+}
+
+//-
+// property char2
+
+Character mChar2;
+
+public Character getChar2() {
+return mChar2;
+}
+
+public void setChar2(Character pChar2) {
+mChar2 = pChar2;
+}
+
+//-
+// property short2
+
+Short mShort2;
+
+public Short getShort2() {
+return mShort2;
+}
+
+public void setShort2(Short pShort2) {
+mShort2 = pShort2;
+}
+
+//-
+// property int2
+
+Integer mInt2;
+
+public Integer getInt2() {
+return mInt2;
+}
+
+public void setInt2(Integer pInt2) {
+mInt2 = pInt2;
+}
+
+//-
+// property long2
+
+Long mLong2;
+
+public Long getLong2() {
+return mLong2;
+}
+
+public void setLong2(Long pLong2) {
+mLong2 = pLong2;
+}
+
+//-
+// property float2
+
+Float mFloat2;
+
+public Float getFloat2() {
+return mFloat2;
+}
+
+public void setFloat2(Float pFloat2) {
+mFloat2 = pFloat2;
+}
+
+//-
+// property double2
+
+Double mDouble2;
+
+public Double getDouble2() {
+return mDouble2;
+}

svn commit: r1037286 - in /tomcat/taglibs/standard/trunk/compat: pom.xml src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java src/main/java/org/apache/taglibs/standard/tag/compat/

2010-11-20 Thread jboynes 
Author: jboynes
Date: Sat Nov 20 18:16:25 2010
New Revision: 1037286

URL: http://svn.apache.org/viewvc?rev=1037286&view=rev
Log:
reformat code to clean up tabs

Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml

tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForEachTag.java

tomcat/taglibs/standard/trunk/compat/src/main/java/org/apache/taglibs/standard/tag/compat/core/ForTokensTag.java

Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037286&r1=1037285&r2=1037286&view=diff
==
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 18:16:25 2010
@@ -20,161 +20,190 @@
 Enable Cactus tests
 -->
 http://maven.apache.org/POM/4.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  4.0.0
-  
-org.apache.taglibs
-taglibs-parent
-1-SNAPSHOT
-  
-
-  taglibs-standard-compat
-  1.2-SNAPSHOT
-  bundle
-
-  Apache Standard Taglib - JSTL 1.0 Compatibility
-
-  2001
-  
-An implementation of the JSP Standard Tag Library (JSTL).
-  
-
-  http://tomcat.apache.org/taglibs/standard/
-
-  
-
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat
-
scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat
-
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat
-  
-
-  
-Pierre Delisle
-Shawn Bayern
-Nathan Abramson
-Hans Bergsten
-Scott Hasse
-Justyna Horwat
-Mark Kolb
-Jan Luehe
-Glenn Nielsen
-Dmitri Plotnikov
-Felipe Leme
-Henri Yandell
-Bjorn Townsend
-  
-
-  
-Robert Goff
-  
-
-  
-  
-  org.apache.taglibs
-  taglibs-standard-spec
-  1.2-SNAPSHOT
-
-  
-  org.apache.taglibs
-  taglibs-standard-impl
-  1.2-SNAPSHOT
-
-
-
-  javax.servlet
-  servlet-api
-  2.5
-  provided
-
-
-  javax.servlet.jsp
-  jsp-api
-  2.1
-  provided
-
-
-  javax.el
-  el-api
-  1.0
-  provided
-
-
-  xalan
-  xalan
-  2.7.1
-  provided
-
-
-
-  junit
-  junit
-  4.8.1
-  test
-
-  
-  org.easymock
-  easymock
-  3.0
-  test
-  
-   
+xmlns="http://maven.apache.org/POM/4.0.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.taglibs
+taglibs-parent
+1-SNAPSHOT
+
+
+taglibs-standard-compat
+1.2-SNAPSHOT
+bundle
+
+Apache Standard Taglib - JSTL 1.0 Compatibility
+
+2001
+
+An implementation of the JSP Standard Tag Library (JSTL).
+
+
+http://tomcat.apache.org/taglibs/standard/
+
+
+
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat
+
scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/compat
+
+
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat
+
+
+
+
+Pierre Delisle
+
+
+Shawn Bayern
+
+
+Nathan Abramson
+
+
+Hans Bergsten
+
+
+Scott Hasse
+
+
+Justyna Horwat
+
+
+Mark Kolb
+
+
+Jan Luehe
+
+
+Glenn Nielsen
+
+
+Dmitri Plotnikov
+
+
+Felipe Leme
+
+
+Henri Yandell
+
+
+Bjorn Townsend
+
+
+
+
+
+Robert Goff
+
+
+
+
+
+org.apache.taglibs
+taglibs-standard-spec
+1.2-SNAPSHOT
+
+
+org.apache.taglibs
+taglibs-standard-impl
+1.2-SNAPSHOT
+
+
+
+javax.servlet
+servlet-api
+2.5
+provided
+
+
+javax.servlet.jsp
+jsp-api
+2.1
+provided
+
+
+javax.el
+el-api
+1.0
+provided
+
+
+xalan
+xalan
+2.7.1
+provided
+
+
+
+junit
+junit
+4.8.1
+test
+
+
+org.easymock
+easymock
+3.0
+test
+
+
 
 
-  
-

svn commit: r1037290 - in /tomcat/taglibs/standard/trunk: compat/pom.xml jstlel/pom.xml

2010-11-20 Thread jboynes 
Author: jboynes
Date: Sat Nov 20 18:26:15 2010
New Revision: 1037290

URL: http://svn.apache.org/viewvc?rev=1037290&view=rev
Log:
remove extraneous package import that caused a build warning

Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/jstlel/pom.xml

Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037290&r1=1037289&r2=1037290&view=diff
==
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 18:26:15 2010
@@ -158,7 +158,6 @@
 true
 
 *;version="1.2"
-
org.apache.x*;resolution:=optional,*
 
 
 

Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1037290&r1=1037289&r2=1037290&view=diff
==
--- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sat Nov 20 18:26:15 2010
@@ -158,7 +158,6 @@
 true
 
 *;version="1.2"
-
org.apache.x*;resolution:=optional,*
 
 
 



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

svn commit: r1037291 [5/5] - in /tomcat/taglibs/standard/trunk/examples: src/org/apache/taglibs/standard/examples/beans/ src/org/apache/taglibs/standard/examples/i18n/ src/org/apache/taglibs/standard/

2010-11-20 Thread jboynes 
Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff
==
--- tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp (original)
+++ tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp Sat Nov 20 18:34:03 
2010
@@ -3,7 +3,7 @@
 
 
 
-  JSTL: XML Support -- Parse / Out
+JSTL: XML Support -- Parse / Out
 
 
 
@@ -15,51 +15,67 @@
 
 
 
-  
-
-
-  
-
-  Expression
-  Result
-
-<%--
-
-  3 + 3
-  
-
---%>
-
-  $doc//sport
-  
-
-
-  $doc/games/country/*
-  
-
-
-  $doc//*
-  
-
-
-  $doc/games/country
-  
-
-
-  $doc/games/country[last()]
-  
-
-
-  $doc//@id
-  
-
-
-  $doc//count...@id='Denmark']
-  
-
-  
-
-  
+
+
+
+
+
+
+
+Expression
+Result
+
+<%--
+
+  3 + 3
+  
+
+--%>
+
+$doc//sport
+
+
+
+
+
+$doc/games/country/*
+
+
+
+
+
+$doc//*
+
+
+
+
+
+$doc/games/country
+
+
+
+
+
+$doc/games/country[last()]
+
+
+
+
+
+$doc//@id
+
+
+
+
+
+$doc//count...@id='Denmark']
+
+
+
+
+
+
+
 
 
 

Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff
==
--- tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp (original)
+++ tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp Sat Nov 20 
18:34:03 2010
@@ -3,25 +3,25 @@
 
 
 
-  JSTL: XML Support -- Parse
+JSTL: XML Support -- Parse
 
 
 Parse from Objects and URLs
 
 
-  
-   
-
- foo
-
-   
-   
- bar
-   
-  
-
+
+
+
+foo
+
+
+
+bar
+
+
+
 
-
+
 
 
 

Modified: tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff
==
--- tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp 
(original)
+++ tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp Sat 
Nov 20 18:34:03 2010
@@ -3,21 +3,21 @@
 
 
 
-  JSTL: XML Support -- Parse
+JSTL: XML Support -- Parse
 
 
 Parse from Objects and URLs
 
 
-
+
 
-
-]>
-
-  &included;
-
-
+]>
+
+&included;
+
+
 
 
 

Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff
==
--- tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp (original)
+++ tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp Sat Nov 20 18:34:03 
2010
@@ -2,30 +2,30 @@
 
 
 
-  JSTL: XML Support -- Parse / Set / Out
+JSTL: XML Support -- Parse / Set / Out
 
 
 Parse / Set / Out
 
 
-  
-   
-
- foo
-
-   
-   
- 
-   bar
- 
-   
-  
+
+
+
+foo
+
+
+
+
+bar
+
+
+
 
 
 
 
 
-
+
 
 
 

Modified: tomcat/taglibs/standard/trunk/examples/web/xml/Transform.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/xml/Transform.jsp?rev=1037291&r1=1037290&r2=1037

DO NOT REPLY [Bug 50305] Provide an option to disable session tracking with URL

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50305

sylvain.laur...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #3 from sylvain.laur...@gmail.com 2010-11-20 14:06:39 EST ---
Sorry I missed that one. So the functionality is in tc6 but not in tc7 ?
weird... 

This means that users have to upgrade to servlet 3 to set the session tracking
mode...

*** This bug has been marked as a duplicate of bug 49811 ***

-- 
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 49811] [PATCH] Disable UrlRewriting

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811

sylvain.laur...@gmail.com changed:

   What|Removed |Added

 CC||sylvain.laur...@gmail.com

--- Comment #18 from sylvain.laur...@gmail.com 2010-11-20 14:06:39 EST ---
*** Bug 50305 has been marked as a duplicate of this bug. ***

-- 
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 49811] [PATCH] Disable UrlRewriting

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=49811

--- Comment #19 from sylvain.laur...@gmail.com 2010-11-20 14:08:30 EST ---
Why not porting this feature to tc7 ? even if servlet 3 apps can do it through
web.xml, we should think of servlet 2 applications that are deployed in tc7...

-- 
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 50308] Call to AsyncContext.dispatch() in the onTimeout callback throws exception

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50308

Juriy  changed:

   What|Removed |Added

 CC||juriy.b...@gmail.com
 OS/Version||All

-- 
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: r1037312 - in /tomcat/taglibs/standard/trunk: ./ build-tools/ build-tools/src/ build-tools/src/main/ build-tools/src/main/resources/ build-tools/src/main/resources/taglibs/ compat/ impl/ j

2010-11-20 Thread jboynes 
Author: jboynes
Date: Sat Nov 20 19:47:07 2010
New Revision: 1037312

URL: http://svn.apache.org/viewvc?rev=1037312&view=rev
Log:
add common module for tool configuration; use common checkstyle rules for all 
modules

Added:
tomcat/taglibs/standard/trunk/build-tools/   (with props)
tomcat/taglibs/standard/trunk/build-tools/pom.xml   (with props)
tomcat/taglibs/standard/trunk/build-tools/src/
tomcat/taglibs/standard/trunk/build-tools/src/main/
tomcat/taglibs/standard/trunk/build-tools/src/main/resources/
tomcat/taglibs/standard/trunk/build-tools/src/main/resources/taglibs/

tomcat/taglibs/standard/trunk/build-tools/src/main/resources/taglibs/checkstyle.xml
   (props changed)
  - copied unchanged from r1037291, 
tomcat/taglibs/standard/trunk/impl/checkstyle.xml
Removed:
tomcat/taglibs/standard/trunk/impl/checkstyle.xml
Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/jstlel/pom.xml
tomcat/taglibs/standard/trunk/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml

Propchange: tomcat/taglibs/standard/trunk/build-tools/
--
--- svn:ignore (added)
+++ svn:ignore Sat Nov 20 19:47:07 2010
@@ -0,0 +1,2 @@
+*.iml
+target

Added: tomcat/taglibs/standard/trunk/build-tools/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools/pom.xml?rev=1037312&view=auto
==
--- tomcat/taglibs/standard/trunk/build-tools/pom.xml (added)
+++ tomcat/taglibs/standard/trunk/build-tools/pom.xml Sat Nov 20 19:47:07 2010
@@ -0,0 +1,46 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.taglibs
+taglibs-parent
+1-SNAPSHOT
+
+
+taglibs-build-tools
+1.2-SNAPSHOT
+Apache Standard Taglib - Build Tools
+
+Build tool settings common to all Standard Taglib 
modules
+
+
+
scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools
+
scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/standard/trunk/build-tools
+
+
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/build-tools
+
+
+

Propchange: tomcat/taglibs/standard/trunk/build-tools/pom.xml
--
svn:eol-style = native

Propchange: 
tomcat/taglibs/standard/trunk/build-tools/src/main/resources/taglibs/checkstyle.xml
--
svn:eol-style = native

Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1037312&r1=1037311&r2=1037312&view=diff
==
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sat Nov 20 19:47:07 2010
@@ -161,6 +161,18 @@
 
 
 
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+2.6
+
+
+org.apache.taglibs
+taglibs-build-tools
+1.2-SNAPSHOT
+
+
+
 
 
 
@@ -201,6 +213,14 @@
 
 
 
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+2.6
+
+taglibs/checkstyle.xml
+
+
 
 
 

Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1037312&r1=1037311&r2=1037312&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sat Nov 20 19:47:07 2010
@@ -158,6 +158,18 @@
 
 
 
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+2.6
+
+
+org.apache.taglibs
+taglibs-build-tools
+1.2-SNAPSHOT
+
+
+
 
 
 
@@ -207,7 +219,7 @@
 maven-checkstyle-plugin
 2.6
 
-checkstyle.xml
+taglibs/checkstyle.xml

DO NOT REPLY [Bug 50279] Tab police

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50279

Jeremy Boynes  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Jeremy Boynes  2010-11-20 14:49:25 EST 
---
All standard modules reformatted to remove tabs.
Common checkstyle rule added for all modules

-- 
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 50306] Detect stuck threads

2010-11-20 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50306

--- Comment #1 from Pid  2010-11-20 15:53:38 EST ---
(In reply to comment #0)
> Feature request : 
> regularly scan worker threads and if one has been processing the same request
> for longer than a configurable delay, log a warning with the stack trace of
> that thread.
> This would allow to detect very long running threads, usually the ones that 
> are
> stuck in a network call or in a deadlock.

The diagnostics package Rainer & I discussed included something similar to
this. It's possible to use JMX to identify if a thread is associated with a
request and report the properties of the request.

It's also possible to enumerate deadlocked threads using JMX.

I've got some sample code which does various diagnostic tasks, but it's very
experimental...

-- 
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: r1037334 - in /tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard: ./ functions/ resources/ tag/common/core/ tag/common/fmt/ tag/common/sql/ tag/common/xml/ tlv/

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sat Nov 20 21:34:45 2010
New Revision: 1037334

URL: http://svn.apache.org/viewvc?rev=1037334&view=rev
Log:
Code formatting followup.
Remove '' added by the formatter from javadocs.

Modified:

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/resources/Resources.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java

tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/util/EscapeXML.java

Modified: 
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java?rev=1037334&r1=1037333&r2=1037334&view=diff
==
--- 
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
 Sat Nov 20 21:34:45 2010
@@ -31,8 +31,7 @@ public class Version {
  * Get the basic version string for the current release.
  * Version String formatted like
  * "standard-taglib v.r[.dd| Dnn]".
- * 
- * Futurework: have this read version info from jar manifest.
+ * Futurework: have this read version info from jar manifest.
  *
  * @return String denoting our current version
  */
@@ -66,8 +65,7 @@ public class Version {
  * significant, externally apparent enhancement from
  * the previous release. 'n' represents the n'th
  * version.
- * 
- * Clients should carefully consider the implications
+ * Clients should carefully consider the implications
  * of new versions as external interfaces and behaviour
  * may have changed.
  */
@@ -105,15 +103,13 @@ public class Version {
  * Optional identifier designates development drop of
  * a specific release. D01 is the first development drop
  * of a new release.
- * 
- * Development drops are works in progress towards a
+ * Development drops are works in progress towards a
  * compeleted, final release. A specific development drop
  * may not completely implement all aspects of a new
  * feature, which may take several development drops to
  * complete. At the point of the final drop for the
  * release, the D suffix will be omitted.
- * 
- * Each 'D' drops can contain functional enhancements as
+ * Each 'D' drops can contain functional enhancements as
  * well as defect fixes. 'D' drops may not be as stable as
  * the final releases.
  */

Modified: 
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/functions/Functions.java?rev=1037334&r1=1037333&r2=1037334&view=diff

svn commit: r1037338 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sat Nov 20 21:46:37 2010
New Revision: 1037338

URL: http://svn.apache.org/viewvc?rev=1037338&view=rev
Log:
Remove empty lines.
Looks like this class suffered from EOLN misconfigurations. It is 
svn:eol-style=native already.

Modified:

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java

Modified: 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java?rev=1037338&r1=1037337&r2=1037338&view=diff
==
--- 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
 Sat Nov 20 21:46:37 2010
@@ -25,102 +25,64 @@ import java.lang.reflect.Method;
 
 /**
  * This contains the information for one indexed property in a
- * 
- * BeanInfo - IndexedPropertyDescriptor, read method, and write
- * 
+ * BeanInfo - IndexedPropertyDescriptor, read method, and write
  * method.  This class is necessary because the read/write methods in
- * 
  * the IndexedPropertyDescriptor may not be accessible if the bean
- * 
  * given to the introspector is not a public class.  In this case, a
- * 
  * publicly accessible version of the method must be found by
- * 
  * searching for a public superclass/interface that declares the
- * 
  * method (this searching is done by the BeanInfoManager).
  *
  * @author Nathan Abramson - Art Technology Group
  * @version $Change: 181181 $$DateTime: 2001/06/26 09:55:09 $$Author$
  */
-
-
-public class BeanInfoIndexedProperty
-
-{
+public class BeanInfoIndexedProperty {
 
 //-
-
 // Properties
 
 //-
-
 // property readMethod
 
-
 Method mReadMethod;
 
-public Method getReadMethod()
-
-{
+public Method getReadMethod() {
 return mReadMethod;
 }
 
-
 //-
-
 // property writeMethod
 
-
 Method mWriteMethod;
 
-public Method getWriteMethod()
-
-{
+public Method getWriteMethod() {
 return mWriteMethod;
 }
 
-
 //-
-
 // property propertyDescriptor
 
-
 IndexedPropertyDescriptor mIndexedPropertyDescriptor;
 
-public IndexedPropertyDescriptor getIndexedPropertyDescriptor()
-
-{
+public IndexedPropertyDescriptor getIndexedPropertyDescriptor() {
 return mIndexedPropertyDescriptor;
 }
 
-
 //-
 
 /**
  * Constructor
  */
-
 public BeanInfoIndexedProperty
-
 (Method pReadMethod,
-
  Method pWriteMethod,
-
  IndexedPropertyDescriptor pIndexedPropertyDescriptor)
-
 {
-
 mReadMethod = pReadMethod;
-
 mWriteMethod = pWriteMethod;
-
 mIndexedPropertyDescriptor = pIndexedPropertyDescriptor;
-
 }
 
-
 //-
-
 }
 



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

svn commit: r1037344 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sat Nov 20 22:13:28 2010
New Revision: 1037344

URL: http://svn.apache.org/viewvc?rev=1037344&view=rev
Log:
Remove empty lines.
Looks like this class suffered from EOLN misconfigurations. It is 
svn:eol-style=native already.

Modified:

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java

Modified: 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java?rev=1037344&r1=1037343&r2=1037344&view=diff
==
--- 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
 Sat Nov 20 22:13:28 2010
@@ -33,39 +33,25 @@ import javax.servlet.jsp.PageContext;
 
 /**
  * This class is used to generate the implicit Map and List objects
- * 
  * that wrap various elements of the PageContext.  It also returns the
- * 
  * correct implicit object for a given implicit object name.
  *
  * @author Nathan Abramson - Art Technology Group
  * @version $Change: 181177 $$DateTime: 2001/06/26 08:45:09 $$Author$
  */
-
-
 public class ImplicitObjects
-
 {
-
 //-
-
 // Constants
-
 //-
 
-
 static final String sAttributeName =
-
 "org.apache.taglibs.standard.ImplicitObjects";
 
-
 //-
-
 // Member variables
-
 //-
 
-
 PageContext mContext;
 
 Map mPage;
@@ -88,884 +74,516 @@ public class ImplicitObjects
 
 Map mCookie;
 
-
 //-
 
 /**
  * Constructor
  */
-
 public ImplicitObjects(PageContext pContext)
-
 {
-
 mContext = pContext;
-
 }
 
-
 //-
 
 /**
  * Finds the ImplicitObjects associated with the PageContext,
- * 
  * creating it if it doesn't yet exist.
  */
-
 public static ImplicitObjects getImplicitObjects(PageContext pContext)
-
 {
-
 ImplicitObjects objs =
-
 (ImplicitObjects)
-
 pContext.getAttribute(sAttributeName,
-
 PageContext.PAGE_SCOPE);
-
 if (objs == null) {
-
 objs = new ImplicitObjects(pContext);
-
 pContext.setAttribute(sAttributeName,
-
 objs,
-
 PageContext.PAGE_SCOPE);
-
 }
-
 return objs;
-
 }
 
-
 //-
 
 /**
  * Returns the Map that "wraps" page-scoped attributes
  */
-
 public Map getPageScopeMap()
-
 {
-
 if (mPage == null) {
-
 mPage = createPageScopeMap(mContext);
-
 }
-
 return mPage;
-
 }
 
-
 //-
 
 /**
  * Returns the Map that "wraps" request-scoped attributes
  */
-
 public Map getRequestScopeMap()
-
 {
-
 if (mRequest == null) {
-
 mRequest = createRequestScopeMap(mContext);
-
 }
-
 return mRequest;
-
 }
 
-
 //-
 
 /**
  * Returns the Map that "wraps" session-scoped attributes
  */
-
 public Map getSessionScopeMap()
-
 {
-
 if (mSession == null) {
-
 mSession = createSessionScopeMap(mContext);
-
 }
-
 return mSession;
-
 }
 
-
 //-
-
 /**
  * Returns the Map that "wraps" application-scoped attributes
  */
-
 public Map getApplicationScopeMap()
-
 {
-
 if (mApplication == null) {
-
 mApplication = createApplicationScopeMap(mContext);
-
 }
-
 return mApplication;
-
 }
 
-
 //-
 
 /**
  * Returns the Map that maps parameter name to a single parameter
- * 
  * values.
  */
-
 public Map getParamMap()
-
 {
-
 if (mParam == null) {
-
 mParam = createParamMap(mContext);
-
 }
-
 return mParam;
-
 }
 
-
 //-
 
 /**
  * Returns the Map that maps parameter name to an array of parameter
- * 
  * values.
  */
-
 public Map getParamsMap()
-
 {
-
 if (mParams == null) {
-
 mParams = createParamsMap(mContext);
-
 }
-
 return mParams;
-
 }
 
-
 //-
 
 /**
  * Returns the Map that maps header name to a single header
- * 
  * valu

svn commit: r1037345 - in /tomcat/taglibs/standard/trunk: examples/src/org/apache/taglibs/standard/examples/util/ jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ jstlel/src/main/java/org/a

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sat Nov 20 22:22:23 2010
New Revision: 1037345

URL: http://svn.apache.org/viewvc?rev=1037345&view=rev
Log:
Code formatting followup.
Correct javadocs: remove '' added by the formatter.

Modified:

tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java

tomcat/taglibs/standard/trunk/jstlel/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/Config.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/JakartaInline.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java

Modified: 
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==
--- 
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
 Sat Nov 20 22:22:23 2010
@@ -22,8 +22,7 @@ import java.io.PrintWriter;
 /**
  * ServletResponseWrapper used for the the generation of
  * semi-dynamic pages.
- * 
- * This 'wrapped' response object is passed as the second argument
+ * This 'wrapped' response object is passed as the second argument
  * to the internal RequestDispatcher.include(). It channels
  * all output text into the PrintWriter specified in the
  * constructor (which is associated with the file where the

Modified: 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java?rev=1037345&r1=1037344&r2=1037345&view=diff
==
--- 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
 Sat Nov 20 22:22:23 2010
@@ -26,8 +26,7 @@ import java.util.Map;
  * Represents an operator that obtains a Map entry, an indexed
  * value, a property value, or an indexed property value of an object.
  * The following are the rules for evaluating this operator:
- * 
- * 
+ * 
  * Evaluating a[b] (assuming a.b == a["b"])
  *   a is null
  * return null
@@ -49,17 +48,17 @@ import java.util.Map;
  * a.get(b) or Array.get(a, b) throws other exception
  *   error
  * return a.get(b) or Array.get(a, b)
- * 
+ *
  *   coerce b to String
  *   b is a readable property of a
  * getter throws an exception
  *   error
  * otherwise
  *   return result o

svn commit: r1037349 - in /tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl: sql/Result.java sql/ResultSupport.java sql/SQLExecutionTag.java tlv/PermittedTaglibsTLV.java tlv/Scr

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sat Nov 20 22:47:57 2010
New Revision: 1037349

URL: http://svn.apache.org/viewvc?rev=1037349&view=rev
Log:
Code formatting followup.
Correct javadocs: remove '' added by the formatter.

Modified:

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java

tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java

Modified: 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java?rev=1037349&r1=1037348&r2=1037349&view=diff
==
--- 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
 Sat Nov 20 22:47:57 2010
@@ -23,7 +23,6 @@ import java.util.SortedMap;
  * This interface represents the result of a 
  * action. It provides access to the following information in the
  * query result:
- * 
  * 
  *  The result rows (getRows() and getRowsByIndex())
  *  The column names (getColumnNames())
@@ -32,7 +31,6 @@ import java.util.SortedMap;
  * or just a subset that is limited by a maximum row setting
  * (isLimitedByMaxRows())
  * 
- * 
  * An implementation of the Result interface provides a
  * disconnected view into the result of a query.
  *
@@ -43,13 +41,11 @@ public interface Result {
 /**
  * Returns the result of the query as an array of 
SortedMap objects.
  * Each item of the array represents a specific row in the query 
result.
- * 
  * A row is structured as a SortedMap object where the key 
is the column name,
  * and where the value is the value associated with the column identified 
by
  * the key. The column value is an Object of the Java type corresponding
  * to the mapping between column types and Java types defined by the JDBC
  * specification when the ResultSet.getObject() method is 
used.
- * 
  * The SortedMap must use the Comparator
  * java.util.String.CASE_INSENSITIVE_ORDER.
  * This makes it possible to access the key as a case insensitive 
representation

Modified: 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java?rev=1037349&r1=1037348&r2=1037349&view=diff
==
--- 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
 Sat Nov 20 22:47:57 2010
@@ -25,8 +25,7 @@ import java.sql.SQLException;
  * from a source java.sql.ResultSet object. A Result object makes it much
  * easier for page authors to access and manipulate the data resulting
  * from a SQL query.
- * 
- * Note that these methods hide any SQLExceptions that are caused and return
+ * Note that these methods hide any SQLExceptions that are caused and return
  * null - to work around that
  * use org.apache.taglibs.standard.tag.common.sql.ResultImpl directly.
  *

Modified: 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java?rev=1037349&r1=1037348&r2=1037349&view=diff
==
--- 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/spec/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
 Sat Nov 20 22:47:57 2010
@@ -20,22 +20,18 @@ package javax.servlet.jsp.jstl.sql;
 /**
  * This interface allows tag handlers implementing it to receive
  * values for parameter markers in their SQL statements.
- * 
  * This interface is implemented by both  and
  * . Its addSQLParameter() method
  * is called by nested parameter actions (such as )
  * to substitute PreparedStatement parameter values for
  * "?" parameter markers in the SQL statement of the enclosing
  * SQLExecutionTag action.
- * 
  * The given parameter values are converted to their corresponding
  * SQL type (following the rules in the JDBC specification) before
  * they are sen

svn commit: r1037354 - /tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sat Nov 20 23:26:57 2010
New Revision: 1037354

URL: http://svn.apache.org/viewvc?rev=1037354&view=rev
Log:
Formatting followup.
Do not wrap .

Modified:
tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld

Modified: tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld?rev=1037354&r1=1037353&r2=1037354&view=diff
==
--- tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld 
(original)
+++ tomcat/taglibs/standard/trunk/impl/src/main/resources/META-INF/fn.tld Sat 
Nov 20 23:26:57 2010
@@ -102,8 +102,7 @@
 
 replace
 
org.apache.taglibs.standard.functions.Functions
-java.lang.String replace(java.lang.String, 
java.lang.String, java.lang.String)
-
+java.lang.String replace(java.lang.String, 
java.lang.String, java.lang.String)
 
 ${fn:replace(text, "-", "•")}
 



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

Re: svn commit: r1037279 [1/10] - in /tomcat/taglibs/standard/trunk/impl: (..)

2010-11-20 Thread Konstantin Kolinko 
2010/11/20  :
> Author: jboynes
> Date: Sat Nov 20 17:57:45 2010
> New Revision: 1037279
>
> URL: http://svn.apache.org/viewvc?rev=1037279&view=rev
> Log:
> reformat code to remove tabs;add checkstyle report
>

http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java?limit_changes=0&r1=1037279&r2=1037278&pathrev=1037279

@@ -548,9 +548,9 @@ public class XPathUtil {
 Vector vector = new Vector();
 Object resultObject = null;
 if ( result.getType()== XObject.CLASS_BOOLEAN ) {
-resultObject = new Boolean( result.bool());
+resultObject = result.bool();
 } else if ( result.getType()== XObject.CLASS_NUMBER ) {
-resultObject = new Double( result.num());
+resultObject = result.num();
 } else if ( result.getType()== XObject.CLASS_STRING ) {
 resultObject = result.str();
 }

The formatter fixed implicit boxing.
It'd be better to use Boolean.valueOf() though. I am leaving for
others to fix it (if anybody wants to do that).

It is the only serious code change in this commit.

Best regards,
Konstantin Kolinko

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

svn commit: r1037359 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sun Nov 21 00:13:43 2010
New Revision: 1037359

URL: http://svn.apache.org/viewvc?rev=1037359&view=rev
Log:
Formatting followup.
I will revert formatting in these classes, because all of them are generated 
ones.

First step: I am deleting them.
Next step will be copying them from before r1037284.

Removed:

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java


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

svn commit: r1037360 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/

2010-11-20 Thread kkolinko 
Author: kkolinko
Date: Sun Nov 21 00:18:14 2010
New Revision: 1037360

URL: http://svn.apache.org/viewvc?rev=1037360&view=rev
Log:
Formatting followup.
I am reverting formatting that was done in r1037284,
because all of these classes are generated ones.

I am copying the old versions from r1037283.

Added:

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java

tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
  - copied unchanged from r1037283, 
tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java


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

Re: svn commit: r1037279 [1/10] - in /tomcat/taglibs/standard/trunk/impl: (..)

2010-11-20 Thread Jeremy Boynes 
That was me rather than the reformatter when I was checking out checkstyle. 
Forgot to revert that from the original patch, sorry.

On Nov 20, 2010, at 3:34 PM, Konstantin Kolinko wrote:

> 2010/11/20  :
>> Author: jboynes
>> Date: Sat Nov 20 17:57:45 2010
>> New Revision: 1037279
>> 
>> URL: http://svn.apache.org/viewvc?rev=1037279&view=rev
>> Log:
>> reformat code to remove tabs;add checkstyle report
>> 
> 
> http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java?limit_changes=0&r1=1037279&r2=1037278&pathrev=1037279
> 
> @@ -548,9 +548,9 @@ public class XPathUtil {
> Vector vector = new Vector();
> Object resultObject = null;
> if ( result.getType()== XObject.CLASS_BOOLEAN ) {
> -resultObject = new Boolean( result.bool());
> +resultObject = result.bool();
> } else if ( result.getType()== XObject.CLASS_NUMBER ) {
> -resultObject = new Double( result.num());
> +resultObject = result.num();
> } else if ( result.getType()== XObject.CLASS_STRING ) {
> resultObject = result.str();
> }
> 
> The formatter fixed implicit boxing.
> It'd be better to use Boolean.valueOf() though. I am leaving for
> others to fix it (if anybody wants to do that).
> 
> It is the only serious code change in this commit.
> 
> 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

Re: svn commit: r1037360 - /tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/

2010-11-20 Thread Jeremy Boynes 
Can we generate these during the build rather than checking in the generated 
source?

On Nov 20, 2010, at 4:18 PM, kkoli...@apache.org wrote:

> Author: kkolinko
> Date: Sun Nov 21 00:18:14 2010
> New Revision: 1037360
> 
> URL: http://svn.apache.org/viewvc?rev=1037360&view=rev
> Log:
> Formatting followup.
> I am reverting formatting that was done in r1037284,
> because all of these classes are generated ones.
> 
> I am copying the old versions from r1037283.
> 
> Added:
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
>
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
>  - copied unchanged from r1037283, 
> tomcat/taglibs/standard/trunk/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
> 
> 
> -
> 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