Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2010-05-05 13:00:51 +0000
committerGreg Wilkins2010-05-05 13:00:51 +0000
commitd41459934c28b9d3748a8572ea59b8697f3355e0 (patch)
treed65e64624d1865454b3ec2da4bb7958c96e9753b
parent2b03bc5c5bc6b6d8ae96babcf9bc17b9f9208aef (diff)
downloadorg.eclipse.jetty.project-d41459934c28b9d3748a8572ea59b8697f3355e0.tar.gz
org.eclipse.jetty.project-d41459934c28b9d3748a8572ea59b8697f3355e0.tar.xz
org.eclipse.jetty.project-d41459934c28b9d3748a8572ea59b8697f3355e0.zip
#311154 Added deprecated StringBuffer API for backwards compatibility
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1721 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt28
-rw-r--r--jetty-util/src/main/java/org/eclipse/jetty/util/ajax/JSON.java76
2 files changed, 91 insertions, 13 deletions
diff --git a/VERSION.txt b/VERSION.txt
index ffb0353337..2fd42daba1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,13 +1,21 @@
+
+ + 311154 Added deprecated StringBuffer API for backwards compatibility
+
jetty-7.1.0.RC1-SNAPSHOT
+ 286889 Allow System and Server classes to be set on Server instance and when applied to all webapps
- + 296650 JETTY-1198 reset idle timeout on request body chunks
+ 291448 SessionManager has isCheckingRemoteSessionIdEncoding
+ + 296650 JETTY-1198 reset idle timeout on request body chunks
+ 297104 HTTP CONNECT does not work correct with SSL destinations
+ 306782 Close connection when expected 100 continues is not sent
+ 308848 Update test suite to JUnit4 - Module jetty-ajp
+ 308861 Update test suite to JUnit4 - Module jetty-security
+ + 308864 Update test suite to JUnit4 - Module jetty-servlets
+ + 308865 Update test suite to JUnit4 - Module jetty-start
+ 308868 Update test suite to JUnit4 - Module jetty-websocket
+ 308869 Update test suite to JUnit4 - Module jetty-xml
+ + 309153 Hide extracted WEB-INF/lib when running a non-extracted war
+ + 309369 Added WebSocketLoadTest
+ + 309686 Fixed response buffers usage
+ 310094 Improved start.jar options handling and configs
+ 310382 NPE protection when WAR is not a file
+ 310562 SslSocketConnector fails to start if excludeCipherSuites is set
@@ -15,15 +23,9 @@ jetty-7.1.0.RC1-SNAPSHOT
+ 310703 Update test suite to JUnit4 - Module tests/test-integration
+ 310918 Synchronize content exchange
+ 311154 Use Appendable in preference to StringBuilder/StringBuffer in APIs
- + 308865 Update test suite to JUnit4 - Module jetty-start
- + 309153 Hide extracted WEB-INF/lib when running a non-extracted war
- + 309686 Fixed response buffers usage
+ 311362 Optional org.eclipse.jetty.util.log.stderr.SOURCE
- + 308864 Update test suite to JUnit4 - Module jetty-servlets
+ JETTY-1030 - Improve jetty.sh script
+ JETTY-1142 Replace Set-Cookies with same name
- + 309369 Using websockets in multithreaded environment causes threads to block each other
- due to the synchronization done while scheduling a new Timeout task
jetty-7.1.0.RC0 27 April 2010
+ 294563 Websocket client connection
@@ -40,16 +42,16 @@ jetty-7.1.0.RC0 27 April 2010
+ 310051 _configurationClasses now defaults to null in WebAppContext
+ 310094 Improved start.jar usage and config files
+ 310431 Default ErrorHandler as server Bean
- + JETTY-903 Stop both caches
+ + 310467 Allow SocketConnector to create generic Connection objects
+ + 310603 Make Logger interface consistent
+ + 310605 Make a clean room implementation of the JSP logger bridge
+ + Add AnnotationConfiguration to jetty-plus.xml
+ + Fix jetty-plus.xml reference to addLifeCycle
+ JETTY-1200 SSL NIO Endpoint wraps non NIO buffers
+ JETTY-1202 Use platform default algorithm for SecureRandom
+ JETTY-1212 handle long content lengths
+ JETTY-1214 avoid ISE when scavenging invalid session
- + Fix jetty-plus.xml reference to addLifeCycle
- + Add AnnotationConfiguration to jetty-plus.xml
- + 310467 Allow SocketConnector to create generic Connection objects
- + 310603 Make Logger interface consistent
- + 310605 Make a clean room implementation of the JSP logger bridge
+ + JETTY-903 Stop both caches
jetty-7.0.2.v20100331 31 March 2010
+ 297552 Don't call Continuation timeouts from acceptor tick
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ajax/JSON.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ajax/JSON.java
index a56f0e4f9a..5795950355 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/ajax/JSON.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ajax/JSON.java
@@ -270,6 +270,12 @@ public class JSON
return parse(source);
}
+ @Deprecated
+ public void append(StringBuffer buffer, Object object)
+ {
+ append((Appendable)buffer,object);
+ }
+
/* ------------------------------------------------------------ */
/**
* Append object as JSON to string buffer.
@@ -319,6 +325,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendNull(StringBuffer buffer)
+ {
+ appendNull((Appendable)buffer);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendNull(Appendable buffer)
{
try
@@ -332,6 +345,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendJSON(final StringBuffer buffer, final Convertor convertor, final Object object)
+ {
+ appendJSON((Appendable)buffer,convertor,object);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendJSON(final Appendable buffer, final Convertor convertor, final Object object)
{
appendJSON(buffer,new Convertible()
@@ -348,6 +368,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendJSON(final StringBuffer buffer, Convertible converter)
+ {
+ appendJSON((StringBuffer)buffer,converter);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendJSON(final Appendable buffer, Convertible converter)
{
ConvertableOutput out=new ConvertableOutput(buffer);
@@ -356,12 +383,26 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendJSON(StringBuffer buffer, Generator generator)
+ {
+ generator.addJSON(buffer);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendJSON(Appendable buffer, Generator generator)
{
generator.addJSON(buffer);
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendMap(StringBuffer buffer, Map<?,?> map)
+ {
+ appendMap((Appendable)buffer,map);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendMap(Appendable buffer, Map<?,?> map)
{
try
@@ -393,6 +434,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendArray(StringBuffer buffer, Collection collection)
+ {
+ appendArray((Appendable)buffer,collection);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendArray(Appendable buffer, Collection collection)
{
try
@@ -424,6 +472,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendArray(StringBuffer buffer, Object array)
+ {
+ appendArray((Appendable)buffer,array);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendArray(Appendable buffer, Object array)
{
try
@@ -453,6 +508,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendBoolean(StringBuffer buffer, Boolean b)
+ {
+ appendBoolean((Appendable)buffer,b);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendBoolean(Appendable buffer, Boolean b)
{
try
@@ -471,6 +533,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendNumber(StringBuffer buffer, Number number)
+ {
+ appendNumber((Appendable)buffer,number);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendNumber(Appendable buffer, Number number)
{
try
@@ -489,6 +558,13 @@ public class JSON
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void appendString(StringBuffer buffer, String string)
+ {
+ appendString((Appendable)buffer,string);
+ }
+
+ /* ------------------------------------------------------------ */
public void appendString(Appendable buffer, String string)
{
if (string == null)

Back to the top