Author: areshetnyak
Date: 2011-04-29 08:18:25 -0400 (Fri, 29 Apr 2011)
New Revision: 4334
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthSchemeNotImplException.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationHandler.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationInfo.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationPrompter.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/BufferedInputStream.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CIHashtable.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ChunkedInputStream.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentEncodingModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentMD5Module.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookiePolicyHandler.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/FilenameMangler.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/GlobalConstants.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModuleConstants.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HashVerifier.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpHeaderElement.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpOutputStream.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/LinkedList.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Log.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5InputStream.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ModuleException.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/NVPair.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ParseException.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ProtocolNotSuppException.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RedirectionModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Request.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RespInputStream.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ResponseHandler.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryException.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoRequest.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoResponse.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksClient.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksException.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/TransferEncodingModule.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/URI.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/UncompressInputStream.java
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Util.java
ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/PropertyResolver.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java
Log:
EXOJCR-1221 : The same violations was fixed in WS.
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthSchemeNotImplException.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthSchemeNotImplException.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthSchemeNotImplException.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)AuthSchemeNotImplException.java 0.3-3 06/05/2001
+ * @(#)AuthSchemeNotImplException.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationHandler.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationHandler.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationHandler.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)AuthorizationHandler.java 0.3-3 06/05/2001
+ * @(#)AuthorizationHandler.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationInfo.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationInfo.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationInfo.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)AuthorizationInfo.java 0.3-3 06/05/2001
+ * @(#)AuthorizationInfo.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)AuthorizationModule.java 0.3-3 06/05/2001
+ * @(#)AuthorizationModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationPrompter.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationPrompter.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/AuthorizationPrompter.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)AuthorizationPrompter.java 0.3-3 06/05/2001
+ * @(#)AuthorizationPrompter.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/BufferedInputStream.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/BufferedInputStream.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/BufferedInputStream.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)BufferedInputStream.java 0.3-3 06/05/2001
+ * @(#)BufferedInputStream.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CIHashtable.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CIHashtable.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CIHashtable.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)CIHashtable.java 0.3-3 06/05/2001
+ * @(#)CIHashtable.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ChunkedInputStream.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ChunkedInputStream.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ChunkedInputStream.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ChunkedInputStream.java 0.3-3 06/05/2001
+ * @(#)ChunkedInputStream.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Codecs.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Codecs.java 0.3-3 06/05/2001
+ * @(#)Codecs.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentEncodingModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentEncodingModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentEncodingModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ContentEncodingModule.java 0.3-3 06/05/2001
+ * @(#)ContentEncodingModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentMD5Module.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentMD5Module.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ContentMD5Module.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ContentMD5Module.java 0.3-3 06/05/2001
+ * @(#)ContentMD5Module.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Cookie.java 0.3-3 06/05/2001
+ * @(#)Cookie.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Cookie2.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Cookie2.java 0.3-3 06/05/2001
+ * @(#)Cookie2.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookieModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)CookieModule.java 0.3-3 06/05/2001
+ * @(#)CookieModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookiePolicyHandler.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookiePolicyHandler.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/CookiePolicyHandler.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)CookiePolicyHandler.java 0.3-3 06/05/2001
+ * @(#)CookiePolicyHandler.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)DefaultAuthHandler.java 0.3-3 06/05/2001
+ * @(#)DefaultAuthHandler.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
@@ -79,6 +79,11 @@
*/
public class DefaultAuthHandler implements AuthorizationHandler, GlobalConstants
{
+ /**
+ * The logger
+ */
+ private static final Log LOG =
ExoLogger.getLogger("org.exoplatform.common.http.client.DefaultAuthHandler");
+
private static final byte[] NUL = new byte[0];
private static final int DI_A1 = 0;
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)DefaultModule.java 0.3-3 06/05/2001
+ * @(#)DefaultModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/FilenameMangler.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/FilenameMangler.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/FilenameMangler.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)FilenameMangler.java 0.3-3 06/05/2001
+ * @(#)FilenameMangler.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/GlobalConstants.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/GlobalConstants.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/GlobalConstants.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)GlobalConstants.java 0.3-3 06/05/2001
+ * @(#)GlobalConstants.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HTTPClientModule.java 0.3-3 06/05/2001
+ * @(#)HTTPClientModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModuleConstants.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModuleConstants.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPClientModuleConstants.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HTTPClientModuleConstants.java 0.3-3 06/05/2001
+ * @(#)HTTPClientModuleConstants.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPConnection.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HTTPConnection.java 0.3-3 06/05/2001
+ * @(#)HTTPConnection.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
@@ -1460,7 +1460,7 @@
}
catch (XMLStreamException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
throw new IOException("Can't write XML data to output stream.");
}
return response;
@@ -1582,7 +1582,7 @@
}
catch (XMLStreamException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
throw new IOException("Can't write XML data to output stream.");
}
return response;
@@ -1639,7 +1639,7 @@
}
catch (XMLStreamException e)
{
- e.printStackTrace();
+ log.error(e.getLocalizedMessage(), e);
throw new IOException("Can't write XML request.");
}
finally
@@ -3786,8 +3786,10 @@
try
{
if (ServerProtocolVersion >= HTTP_1_1
- || ((((Proxy_Host == null || Protocol == HTTPS) && (con =
resp.getHeader("Connection")) != null) || ((Proxy_Host != null &&
Protocol != HTTPS) && (con =
- resp.getHeader("Proxy-Connection")) != null)) &&
Util.hasToken(con, "keep-alive")))
+ || ((((Proxy_Host == null || Protocol == HTTPS)
+ && (con = resp.getHeader("Connection")) != null)
|| ((Proxy_Host != null && Protocol != HTTPS)
+ && (con = resp.getHeader("Proxy-Connection")) !=
null))
+ && Util.hasToken(con, "keep-alive")))
{
doesKeepAlive = true;
keepAliveUnknown = false;
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HTTPResponse.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HTTPResponse.java 0.3-3 06/05/2001
+ * @(#)HTTPResponse.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HashVerifier.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HashVerifier.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HashVerifier.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HashVerifier.java 0.3-3 06/05/2001
+ * @(#)HashVerifier.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpHeaderElement.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpHeaderElement.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpHeaderElement.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HttpHeaderElement.java 0.3-3 06/05/2001
+ * @(#)HttpHeaderElement.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpOutputStream.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpOutputStream.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpOutputStream.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HttpOutputStream.java 0.3-3 06/05/2001
+ * @(#)HttpOutputStream.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/HttpURLConnection.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)HttpURLConnection.java 0.3-3 06/05/2001
+ * @(#)HttpURLConnection.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/IdempotentSequence.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)IdempotentSequence.java 0.3-3 06/05/2001
+ * @(#)IdempotentSequence.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
@@ -32,6 +32,9 @@
package org.exoplatform.common.http.client;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.util.Enumeration;
import java.util.Hashtable;
@@ -67,6 +70,11 @@
// DAV methods
PROPFIND = 8, PROPPATCH = 9, MKCOL = 10, COPY = 11, MOVE = 12, LOCK = 13,
UNLOCK = 14;
+ /**
+ * The logger
+ */
+ private static final Log LOG =
ExoLogger.getLogger("org.exoplatform.common.http.client.IdempotentSequence");
+
/** these are the history of previous requests */
private int[] m_history;
@@ -356,24 +364,24 @@
seq.add(new Request(null, "PUT", "/b7", null, null, null,
false));
if (!seq.isIdempotent(new Request(null, null, "/b1", null, null, null,
false)))
- System.err.println("Sequence b1 failed");
+ LOG.error("Sequence b1 failed");
if (!seq.isIdempotent(new Request(null, null, "/b2", null, null, null,
false)))
- System.err.println("Sequence b2 failed");
+ LOG.error("Sequence b2 failed");
if (!seq.isIdempotent(new Request(null, null, "/b3", null, null, null,
false)))
- System.err.println("Sequence b3 failed");
+ LOG.error("Sequence b3 failed");
if (seq.isIdempotent(new Request(null, null, "/b4", null, null, null,
false)))
- System.err.println("Sequence b4 failed");
+ LOG.error("Sequence b4 failed");
if (!seq.isIdempotent(new Request(null, null, "/b5", null, null, null,
false)))
- System.err.println("Sequence b5 failed");
+ LOG.error("Sequence b5 failed");
if (seq.isIdempotent(new Request(null, null, "/b6", null, null, null,
false)))
- System.err.println("Sequence b6 failed");
+ LOG.error("Sequence b6 failed");
if (seq.isIdempotent(new Request(null, null, "/b7", null, null, null,
false)))
- System.err.println("Sequence b7 failed");
+ LOG.error("Sequence b7 failed");
if (seq.isIdempotent(new Request(null, null, "/b8", null, null, null,
false)))
- System.err.println("Sequence b8 failed");
+ LOG.error("Sequence b8 failed");
if (seq.isIdempotent(new Request(null, null, "/b9", null, null, null,
false)))
- System.err.println("Sequence b9 failed");
+ LOG.error("Sequence b9 failed");
- System.out.println("Tests finished");
+ LOG.error("Tests finished");
}
}
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/LinkedList.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/LinkedList.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/LinkedList.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)LinkedList.java 0.3-3 06/05/2001
+ * @(#)LinkedList.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Log.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Log.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Log.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Log.java 0.3-3 06/05/2001
+ * @(#)Log.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
@@ -33,6 +33,7 @@
package org.exoplatform.common.http.client;
import org.exoplatform.commons.utils.PrivilegedSystemHelper;
+import org.exoplatform.services.log.ExoLogger;
import java.io.ByteArrayOutputStream;
import java.io.FileWriter;
@@ -72,6 +73,12 @@
*/
public class Log
{
+ /**
+ * The logger
+ */
+ private static final org.exoplatform.services.log.Log LOG =
+ ExoLogger.getLogger("org.exoplatform.common.http.client.Log");
+
/** The HTTPConnection facility (1) */
public static final int CONN = 1 << 0;
@@ -127,7 +134,7 @@
}
catch (IOException ioe)
{
- System.err.println("failed to open file log stream `" + file +
"': " + ioe);
+ LOG.error("failed to open file log stream `" + file +
"': " + ioe, ioe);
}
}
}
@@ -176,8 +183,8 @@
}
catch (IOException ioe)
{
- System.err.println("Failed to write to log: " + ioe);
- System.err.println("Failed log Entry was: " + msg);
+ LOG.error("Failed to write to log: " + ioe, ioe);
+ LOG.error("Failed log Entry was: " + msg);
}
}
@@ -210,9 +217,9 @@
}
catch (IOException ioe)
{
- System.err.println("Failed to write to log: " + ioe);
- System.err.print("Failed log Entry was: " + prefix);
- t.printStackTrace(System.err);
+ LOG.error("Failed to write to log: " + ioe, ioe);
+ LOG.error("Failed log Entry was: " + prefix);
+ LOG.error(t.getLocalizedMessage(), t);
}
}
@@ -241,9 +248,9 @@
}
catch (IOException ioe)
{
- System.err.println("Failed to write to log: " + ioe);
- System.err.println("Failed log Entry was: " + prefix);
- System.err.println(new String(buf.toByteArray()));
+ LOG.error("Failed to write to log: " + ioe, ioe);
+ LOG.error("Failed log Entry was: " + prefix);
+ LOG.error(new String(buf.toByteArray()));
}
}
@@ -325,7 +332,7 @@
}
catch (IOException ioe)
{
- System.err.println("Error closing log stream: " + ioe);
+ LOG.error("Error closing log stream: " + ioe, ioe);
}
}
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)MD5.java 0.3-3 06/05/2001
+ * @(#)MD5.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5InputStream.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5InputStream.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/MD5InputStream.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)MD5InputStream.java 0.3-3 06/05/2001
+ * @(#)MD5InputStream.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ModuleException.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ModuleException.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ModuleException.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ModuleException.java 0.3-3 06/05/2001
+ * @(#)ModuleException.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/NVPair.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/NVPair.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/NVPair.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)NVPair.java 0.3-3 06/05/2001
+ * @(#)NVPair.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ParseException.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ParseException.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ParseException.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ParseException.java 0.3-3 06/05/2001
+ * @(#)ParseException.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ProtocolNotSuppException.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ProtocolNotSuppException.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ProtocolNotSuppException.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ProtocolNotSuppException.java 0.3-3 06/05/2001
+ * @(#)ProtocolNotSuppException.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RedirectionModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RedirectionModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RedirectionModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)RedirectionModule.java 0.3-3 06/05/2001
+ * @(#)RedirectionModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Request.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Request.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Request.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Request.java 0.3-3 06/05/2001
+ * @(#)Request.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RespInputStream.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RespInputStream.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RespInputStream.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)RespInputStream.java 0.3-3 06/05/2001
+ * @(#)RespInputStream.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Response.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Response.java 0.3-3 06/05/2001
+ * @(#)Response.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ResponseHandler.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ResponseHandler.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/ResponseHandler.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)ResponseHandler.java 0.3-3 06/05/2001
+ * @(#)ResponseHandler.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryException.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryException.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryException.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)RetryException.java 0.3-3 06/05/2001
+ * @(#)RetryException.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RetryModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)RetryModule.java 0.3-3 06/05/2001
+ * @(#)RetryModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoRequest.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoRequest.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoRequest.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)RoRequest.java 0.3-3 06/05/2001
+ * @(#)RoRequest.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoResponse.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoResponse.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/RoResponse.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)RoResponse.java 0.3-3 06/05/2001
+ * @(#)RoResponse.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksClient.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksClient.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksClient.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)SocksClient.java 0.3-3 06/05/2001
+ * @(#)SocksClient.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksException.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksException.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/SocksException.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)SocksException.java 0.3-3 06/05/2001
+ * @(#)SocksException.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/StreamDemultiplexor.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)StreamDemultiplexor.java 0.3-3 06/05/2001
+ * @(#)StreamDemultiplexor.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/TransferEncodingModule.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/TransferEncodingModule.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/TransferEncodingModule.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)TransferEncodingModule.java 0.3-3 06/05/2001
+ * @(#)TransferEncodingModule.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/URI.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/URI.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/URI.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)URI.java 0.3-3 06/05/2001
+ * @(#)URI.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
@@ -80,8 +80,8 @@
* <PRE>
* base =
http://a/b/c/d;p?q
* rel = http:g
- * result = http:g (correct)
- * result =
http://a/b/c/g (backwards compatible)
+ * result = http:g (correct)
+ * result =
http://a/b/c/g (backwards compatible)
* </PRE>
*
* See rfc-2396, section 5.2, step 3, second paragraph.
@@ -557,8 +557,8 @@
public static String canonicalizePath(String path)
{
int idx, len = path.length();
- if (!((idx = path.indexOf("/.")) != -1 && (idx == len - 2 ||
path.charAt(idx + 2) == '/' || (path.charAt(idx + 2) == '.' &&
(idx == len - 3 || path
- .charAt(idx + 3) == '/')))))
+ if (!((idx = path.indexOf("/.")) != -1 && (idx == len - 2 ||
path.charAt(idx + 2) == '/'
+ || (path.charAt(idx + 2) == '.' && (idx == len - 3 ||
path.charAt(idx + 3) == '/')))))
return path;
char[] p = new char[path.length()]; // clean path
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/UncompressInputStream.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/UncompressInputStream.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/UncompressInputStream.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)UncompressInputStream.java 0.3-3 06/05/2001
+ * @(#)UncompressInputStream.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
@@ -32,6 +32,9 @@
package org.exoplatform.common.http.client;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.io.EOFException;
import java.io.FileInputStream;
import java.io.FilterInputStream;
@@ -49,6 +52,11 @@
class UncompressInputStream extends FilterInputStream
{
/**
+ * The logger
+ */
+ private static final Log LOG =
ExoLogger.getLogger("exo.ws.commons.UncompressInputStream");
+
+ /**
* @param is the input stream to decompress
* @exception IOException if the header is malformed
*/
@@ -175,8 +183,8 @@
l_n_bits++;
l_maxcode = (l_n_bits == maxbits) ? l_maxmaxcode : (1 << l_n_bits) -
1;
- if (debug)
- System.err.println("Code-width expanded to " + l_n_bits);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Code-width expanded to " + l_n_bits);
l_bitmask = (1 << l_n_bits) - 1;
l_bit_pos = resetbuf(l_bit_pos);
@@ -216,8 +224,8 @@
l_maxcode = (1 << l_n_bits) - 1;
l_bitmask = l_maxcode;
- if (debug)
- System.err.println("Code tables reset");
+ if (LOG.isDebugEnabled())
+ LOG.debug("Code tables reset");
l_bit_pos = resetbuf(l_bit_pos);
continue main_loop;
@@ -392,10 +400,10 @@
if ((header & HDR_FREE) > 0)
throw new IOException("Header bit 6 set");
- if (debug)
+ if (LOG.isDebugEnabled())
{
- System.err.println("block mode: " + block_mode);
- System.err.println("max bits: " + maxbits);
+ LOG.debug("block mode: " + block_mode);
+ LOG.debug("max bits: " + maxbits);
}
// initialize stuff
@@ -423,7 +431,7 @@
{
if (args.length != 1)
{
- System.err.println("Usage: UncompressInputStream <file>");
+ LOG.error("Usage: UncompressInputStream <file>");
System.exit(1);
}
@@ -443,7 +451,7 @@
}
long end = System.currentTimeMillis();
- System.err.println("Decompressed " + tot + " bytes");
- System.err.println("Time: " + (end - beg) / 1000. + "
seconds");
+ LOG.error("Decompressed " + tot + " bytes");
+ LOG.error("Time: " + (end - beg) / 1000. + " seconds");
}
}
Modified:
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Util.java
===================================================================
---
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Util.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/Util.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -1,5 +1,5 @@
/*
- * @(#)Util.java 0.3-3 06/05/2001
+ * @(#)Util.java 0.3-3 06/05/2001
*
* This file is part of the HTTPClient package
* Copyright (C) 1996-2001 Ronald Tschal�r
Modified:
ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java
===================================================================
---
ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonWriterImpl.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -356,9 +356,8 @@
JsonToken token = stack.pop();
if (token != JsonToken.object)
{
- System.out.println(token);
// wrong JSON structure.
- throw new JsonException("Sysntax error. Unexpected element
'}'.");
+ throw new JsonException("Sysntax error. Unexpected element '}' :
" + token);
}
writer.write('}');
commaFirst = true;
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/BaseObjectModel.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -100,8 +100,9 @@
{
if (Modifier.isPublic(modif)
|| Modifier.isProtected(modif)
- || (!Modifier.isPrivate(modif) && ((resourcePackageName ==
null && scPackageName == null) || resourcePackageName
- .equals(scPackageName))))
+ || (!Modifier.isPrivate(modif)
+ && ((resourcePackageName == null &&
scPackageName == null)
+ || resourcePackageName.equals(scPackageName))))
{
FieldInjector inj = new FieldInjectorImpl(clazz, jfield);
// Skip not annotated field. They will be not injected from
container.
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/ResourceBinder.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -188,6 +188,11 @@
* @deprecated Do not need container here any more.
*/
protected final ExoContainer container;
+
+ /**
+ * The name of the container
+ */
+ protected final String containerName;
public ResourceBinder(ExoContainerContext containerContext) throws Exception
{
@@ -217,6 +222,7 @@
rd = RuntimeDelegate.getInstance();
container = containerContext.getContainer();
+ this.containerName = containerContext.getName();
}
/**
@@ -641,7 +647,7 @@
*/
protected void startResourceCleaner()
{
- Thread thread = new Thread(new ResourceCleaner(60));
+ Thread thread = new Thread(new ResourceCleaner(60), "Resource Cleaner " +
containerName);
thread.setDaemon(true);
thread.start();
}
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/DefaultMethodInvoker.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -161,7 +161,7 @@
{
if (LOG.isDebugEnabled())
{
- e.printStackTrace();
+ LOG.debug(e.getLocalizedMessage(), e);
}
if (e instanceof WebApplicationException)
{
@@ -206,7 +206,7 @@
{
if (LOG.isDebugEnabled())
{
- cause.printStackTrace();
+ LOG.debug(cause.getLocalizedMessage(), cause);
}
// get cause of exception that method produces
Throwable throwable = cause.getCause();
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/PropertyResolver.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/PropertyResolver.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/method/PropertyResolver.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -20,7 +20,6 @@
import org.exoplatform.services.rest.ApplicationContext;
import org.exoplatform.services.rest.Property;
-import org.exoplatform.services.rest.impl.ApplicationContextImpl;
/**
* @author <a href="mailto:andrew00x@gmail.com">Andrey
Parfonov</a>
@@ -43,8 +42,9 @@
this.property = property;
}
+
/**
- * @see
org.exoplatform.services.rest.impl.method.ParameterResolver#resolve(org.exoplatform.services.rest.Parameter,
org.exoplatform.services.rest.ApplicationContext)
+ * {@inheritDoc}
*/
@Override
public Object resolve(org.exoplatform.services.rest.Parameter parameter,
ApplicationContext context)
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/DOMSourceEntityProvider.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -100,7 +100,7 @@
// if can't read from stream (e.g. steam is empty)
if (LOG.isDebugEnabled())
{
- cause.printStackTrace();
+ LOG.debug(cause.getLocalizedMessage(), cause);
}
return null;
}
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBElementEntityProvider.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -105,7 +105,7 @@
// if can't read from stream (e.g. steam is empty)
if (LOG.isDebugEnabled())
{
- cause.printStackTrace();
+ LOG.debug(cause.getLocalizedMessage(), cause);
}
return null;
}
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java
===================================================================
---
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java 2011-04-29
12:05:32 UTC (rev 4333)
+++
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/impl/provider/JAXBObjectEntityProvider.java 2011-04-29
12:18:25 UTC (rev 4334)
@@ -101,7 +101,7 @@
// if can't read from stream (e.g. steam is empty)
if (LOG.isDebugEnabled())
{
- cause.printStackTrace();
+ LOG.debug(cause.getLocalizedMessage(), cause);
}
return null;
}