Author: schof
Date: Thu Nov 10 08:09:45 2005
New Revision: 332320
URL: http://svn.apache.org/viewcvs?rev=332320&view=rev
Log:
Applied Rahul Akolkar's patch for Bug#37364.
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java
struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListCategoriesTestCase.java
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListLocalesTestCase.java
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListStateNamesTestCase.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java?rev=332320&r1=332319&r2=332320&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java
Thu Nov 10 08:09:45 2005
@@ -240,7 +240,7 @@
protected void reject(ShaleWebContext context) throws Exception {
HttpServletResponse response = context.getResponse();
- response.sendError(response.SC_FORBIDDEN);
+ response.sendError(HttpServletResponse.SC_FORBIDDEN);
}
@@ -325,11 +325,11 @@
} catch (IOException e) {
; // Can not happen
}
- if (type == st.TT_EOF) {
+ if (type == StreamTokenizer.TT_EOF) {
break;
- } else if (type == st.TT_NUMBER) {
+ } else if (type == StreamTokenizer.TT_NUMBER) {
list.add(Pattern.compile("" + st.nval));
- } else if (type == st.TT_WORD) {
+ } else if (type == StreamTokenizer.TT_WORD) {
list.add(Pattern.compile(st.sval.trim()));
} else {
throw new IllegalArgumentException(expr);
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java?rev=332320&r1=332319&r2=332320&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java
Thu Nov 10 08:09:45 2005
@@ -322,11 +322,11 @@
} catch (IOException e) {
; // Can not happen
}
- if (type == st.TT_EOF) {
+ if (type == StreamTokenizer.TT_EOF) {
break;
- } else if (type == st.TT_NUMBER) {
+ } else if (type == StreamTokenizer.TT_NUMBER) {
list.add(Pattern.compile("" + st.nval));
- } else if (type == st.TT_WORD) {
+ } else if (type == StreamTokenizer.TT_WORD) {
list.add(Pattern.compile(st.sval.trim()));
} else {
throw new IllegalArgumentException(expr);
Modified:
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListCategoriesTestCase.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListCategoriesTestCase.java?rev=332320&r1=332319&r2=332320&view=diff
==============================================================================
---
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListCategoriesTestCase.java
(original)
+++
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListCategoriesTestCase.java
Thu Nov 10 08:09:45 2005
@@ -119,7 +119,7 @@
swcontext = null;
dataPickle = null;
responseWriter = null;
- CatalogFactory.getInstance().clear();
+ CatalogFactory.clear();
}
Modified:
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListLocalesTestCase.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListLocalesTestCase.java?rev=332320&r1=332319&r2=332320&view=diff
==============================================================================
---
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListLocalesTestCase.java
(original)
+++
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListLocalesTestCase.java
Thu Nov 10 08:09:45 2005
@@ -119,7 +119,7 @@
swcontext = null;
dataPickle = null;
responseWriter = null;
- CatalogFactory.getInstance().clear();
+ CatalogFactory.clear();
}
Modified:
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListStateNamesTestCase.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListStateNamesTestCase.java?rev=332320&r1=332319&r2=332320&view=diff
==============================================================================
---
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListStateNamesTestCase.java
(original)
+++
struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/remote/ListStateNamesTestCase.java
Thu Nov 10 08:09:45 2005
@@ -119,7 +119,7 @@
swcontext = null;
dataPickle = null;
responseWriter = null;
- CatalogFactory.getInstance().clear();
+ CatalogFactory.clear();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
