Author: ilgrosso
Date: Wed Feb 27 13:21:49 2013
New Revision: 1450770
URL: http://svn.apache.org/r1450770
Log:
[COCOON-2305] #resolve
Added:
cocoon/branches/BRANCH_2_1_X/lib/core/servlet-2.3.jar
- copied unchanged from r1447697, cocoon/branches/BRANCH_2_1_X/tools/jetty/lib/servlet-2.3.jar
Removed:
cocoon/branches/BRANCH_2_1_X/lib/core/servlet_2_2.jar
cocoon/branches/BRANCH_2_1_X/tools/jetty/lib/servlet-2.3.jar
Modified:
cocoon/branches/BRANCH_2_1_X/ (props changed)
cocoon/branches/BRANCH_2_1_X/cocoon.bat
cocoon/branches/BRANCH_2_1_X/cocoon.sh
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
Propchange: cocoon/branches/BRANCH_2_1_X/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 27 13:21:49 2013
@@ -18,3 +18,5 @@ bin
*.launch
prj.el
dist
+nbproject
+.cocoon.sh.swp
Modified: cocoon/branches/BRANCH_2_1_X/cocoon.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/cocoon.bat?rev=1450770&r1=1450769&r2=1450770&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/cocoon.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/cocoon.bat Wed Feb 27 13:21:49 2013
@@ -137,7 +137,7 @@ goto cliLoop
:cliLoopEnd
-"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet_2_2.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.Main Loader %param%
+"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet-2.3.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.Main Loader %param%
goto end
:: ----- Precompile ------------------------------------------------------------
@@ -153,7 +153,7 @@ goto PrecompileLoop
:PrecompileLoopEnd
-"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet_2_2.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper Loader %param%
+"%JAVA_HOME%\bin\java.exe" %JAVA_OPTIONS% -classpath "%CP%" -Djava.endorsed.dirs=lib\endorsed "-Dloader.jar.repositories=%COCOON_LIB%" "-Dloader.class.path=lib\core\servlet-2.3.jar;%COCOON_HOME%\build\webapp\WEB-INF\classes" -Dloader.verbose=false -Dloader.main.class=org.apache.cocoon.bean.XSPPrecompileWrapper Loader %param%
goto end
:: ----- Servlet ---------------------------------------------------------------
Modified: cocoon/branches/BRANCH_2_1_X/cocoon.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/cocoon.sh?rev=1450770&r1=1450769&r2=1450770&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/cocoon.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/cocoon.sh Wed Feb 27 13:21:49 2013
@@ -55,7 +55,7 @@
#
# CLI_CLASSPATH
# The additional classpath for cli and precompile, defaults to
-# lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes
+# lib/core/servlet-2.3.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes
#
@@ -170,7 +170,7 @@ fi
CLI="-Dloader.main.class=org.apache.cocoon.Main"
CLI_LIBRARIES="-Dloader.jar.repositories=$COCOON_LIB"
if [ "$CLI_CLASSPATH" = "" ] ; then
- CLI_CLASSPATH="lib/core/servlet_2_2.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes"
+ CLI_CLASSPATH="lib/core/servlet-2.3.jar:$COCOON_WEBAPP_HOME/WEB-INF/classes"
fi
CLI_VERBOSE="-Dloader.verbose=false"
CLI_PROPERTIES="$CLI_LIBRARIES -Dloader.class.path=$CLI_CLASSPATH $CLI_VERBOSE"
@@ -185,7 +185,7 @@ JETTY_WEBAPP="-Dwebapp=$COCOON_WEBAPP_HO
JETTY_HOME="-Dhome=$COCOON_HOME"
JETTY_PORT_ARGS="-Djetty.port=$JETTY_PORT"
JETTY_ADMIN_ARGS="-Djetty.admin.port=$JETTY_ADMIN_PORT"
-JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS}"
+JETTY_LIBRARIES="-Dloader.jar.repositories=$COCOON_HOME/tools/jetty/lib${PATHSEP}${ENDORSED_LIBS} -Dloader.class.path=lib/core/servlet-2.3.jar"
# ----- Do the action ----------------------------------------------------------
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=1450770&r1=1450769&r2=1450770&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Wed Feb 27 13:21:49 2013
@@ -609,10 +609,10 @@
<file>
<title>Servlet API</title>
- <description>Servlet API Version 2.2</description>
+ <description>Servlet API Version 2.3</description>
<used-by>Cocoon</used-by>
- <lib>core/servlet_2_2.jar</lib>
- <homepage>http://tomcat.apache.org/</homepage>
+ <lib>core/servlet-2.3.jar</lib>
+ <homepage>http://jetty.codehaus.org/</homepage>
</file>
<file>
Modified: cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt?rev=1450770&r1=1450769&r2=1450770&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt (original)
+++ cocoon/branches/BRANCH_2_1_X/misc/notes/review-jars.txt Wed Feb 27 13:21:49 2013
@@ -109,7 +109,9 @@ http://logging.apache.org/log4j/
L: lib/core/servlet_2_2.jar
F: N:
-R:
+R: servlet-2.3.jar
+http://jetty.codehaus.org/
+U: Done
L: lib/core/slf4j-api-1.6.4.jar
F: O: slf4j-api-1.5.11
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java?rev=1450770&r1=1450769&r2=1450770&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletRequestWrapper.java Wed Feb 27 13:21:49 2013
@@ -18,9 +18,11 @@ package javax.servlet.http;
import java.io.BufferedReader;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
+import java.util.Map;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletInputStream;
@@ -97,6 +99,10 @@ public class HttpServletRequestWrapper i
public String getRequestURI() {
return null;
}
+
+ public StringBuffer getRequestURL() {
+ return null;
+ }
public String getServletPath() {
return null;
@@ -145,6 +151,9 @@ public class HttpServletRequestWrapper i
public String getCharacterEncoding() {
return null;
}
+
+ public void setCharacterEncoding(String string) throws UnsupportedEncodingException {
+ }
public int getContentLength() {
return 0;
@@ -177,6 +186,10 @@ public class HttpServletRequestWrapper i
public String[] getParameterValues(String arg0) {
return null;
}
+
+ public Map getParameterMap() {
+ return null;
+ }
public String getProtocol() {
return null;
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java?rev=1450770&r1=1450769&r2=1450770&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/mocks/javax/servlet/http/HttpServletResponseWrapper.java Wed Feb 27 13:21:49 2013
@@ -136,4 +136,7 @@ public class HttpServletResponseWrapper
public void setLocale(Locale arg0) {
}
+
+ public void resetBuffer() {
+ }
}
\ No newline at end of file
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.