Author: fmui
Date: Thu Nov 14 13:21:52 2013
New Revision: 1541900
URL: http://svn.apache.org/r1541900
Log:
introduced a client session ID to simplify debugging in multi session
environments
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/BindingSession.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/AbstractApacheClientHttpInvoker.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/DefaultHttpInvoker.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/Axis2PortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunJREPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/CmisBinding.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/cache/impl/CacheImpl.java
Thu Nov 14 13:21:52 2013
@@ -198,7 +198,7 @@ public class CacheImpl implements Cache
cacheLevel.put(value, keys[keys.length - 1]);
if (LOG.isTraceEnabled()) {
- LOG.trace(name + ": put [" + getFormattedKeys(keys) + "] = " +
value);
+ LOG.trace("{}: put [{}] = {}", name, getFormattedKeys(keys),
value);
}
} finally {
lock.writeLock().unlock();
@@ -230,7 +230,7 @@ public class CacheImpl implements Cache
cacheLevel.remove(keys[keys.length - 1]);
if (LOG.isTraceEnabled()) {
- LOG.trace(name + ": removed [" + getFormattedKeys(keys) + "]");
+ LOG.trace("{}: removed [{}]", name, getFormattedKeys(keys));
}
} finally {
lock.writeLock().unlock();
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/CmisBindingImpl.java
Thu Nov 14 13:21:52 2013
@@ -158,6 +158,10 @@ public final class CmisBindingImpl imple
}
}
+ public String getSessionId() {
+ return session.getSessionId();
+ }
+
public RepositoryService getRepositoryService() {
checkSession();
return repositoryServiceWrapper;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/impl/SessionImpl.java
Thu Nov 14 13:21:52 2013
@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
@@ -33,6 +34,7 @@ public class SessionImpl implements Bind
private static final long serialVersionUID = 1L;
+ private final String id;
private final Map<String, Object> data;
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -41,9 +43,14 @@ public class SessionImpl implements Bind
* Constructor.
*/
public SessionImpl() {
+ id = UUID.randomUUID().toString();
data = new HashMap<String, Object>();
}
+ public String getSessionId() {
+ return id;
+ }
+
public Collection<String> getKeys() {
return data.keySet();
}
@@ -137,6 +144,6 @@ public class SessionImpl implements Bind
@Override
public String toString() {
- return data.toString();
+ return "Session " + id + ": " + data.toString();
}
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/BindingSession.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/BindingSession.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/BindingSession.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/BindingSession.java
Thu Nov 14 13:21:52 2013
@@ -27,6 +27,11 @@ import java.util.Collection;
public interface BindingSession extends Serializable {
/**
+ * Returns the ID of this session.
+ */
+ String getSessionId();
+
+ /**
* Returns all keys.
*/
Collection<String> getKeys();
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/StandardAuthenticationProvider.java
Thu Nov 14 13:21:52 2013
@@ -57,7 +57,7 @@ public class StandardAuthenticationProvi
boolean sendBasicAuth = getSendBasicAuth();
if (getHandleCookies()) {
- cookieManager = new CmisCookieManager();
+ cookieManager = new CmisCookieManager(session.getSessionId());
}
// basic authentication
@@ -218,8 +218,7 @@ public class StandardAuthenticationProvi
password = "";
}
- return Collections
- .singletonList("Basic " +
Base64.encodeBytes(IOUtils.toUTF8Bytes(username + ":" + password)));
+ return Collections.singletonList("Basic " +
Base64.encodeBytes(IOUtils.toUTF8Bytes(username + ":" + password)));
}
/**
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/CmisAtomPubSpi.java
Thu Nov 14 13:21:52 2013
@@ -56,7 +56,7 @@ public class CmisAtomPubSpi implements C
*/
public CmisAtomPubSpi(BindingSession session) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Initializing AtomPub SPI...");
+ LOG.debug("Session {}: Initializing AtomPub SPI...",
session.getSessionId());
}
this.session = session;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
Thu Nov 14 13:21:52 2013
@@ -53,7 +53,7 @@ public class CmisBrowserBindingSpi imple
*/
public CmisBrowserBindingSpi(BindingSession session) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Initializing Browser Binding SPI...");
+ LOG.debug("Session {}: Initializing Browser Binding SPI...",
session.getSessionId());
}
this.session = session;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisCookieManager.java
Thu Nov 14 13:21:52 2013
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
import
org.apache.chemistry.opencmis.commons.exceptions.CmisConnectionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,6 +52,7 @@ public class CmisCookieManager implement
private static final String VERSION_ZERO_HEADER = "Set-cookie";
private static final String VERSION_ONE_HEADER = "Set-cookie2";
+ private final String sessionId;
private final CmisCookieStoreImpl store;
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -58,6 +60,14 @@ public class CmisCookieManager implement
* Constructs a new cookie manager.
*/
public CmisCookieManager() {
+ this("<unknown>");
+ }
+
+ /**
+ * Constructs a new cookie manager.
+ */
+ public CmisCookieManager(String sessionId) {
+ this.sessionId = sessionId;
store = new CmisCookieStoreImpl();
}
@@ -86,9 +96,9 @@ public class CmisCookieManager implement
lock.writeLock().lock();
try {
List<CmisHttpCookie> cookies = store.get(uri);
+ String uriPath = uri.getPath();
for (int i = 0; i < cookies.size(); i++) {
CmisHttpCookie cookie = cookies.get(i);
- String uriPath = uri.getPath();
String cookiePath = cookie.getPath();
// if the uri's path does not path-match cookie's path, remove
// cookies from the list
@@ -101,7 +111,8 @@ public class CmisCookieManager implement
if (LOG.isDebugEnabled()) {
if (map != null && !map.isEmpty()) {
- LOG.debug("Setting cookies for URL " + url + ": " +
map.get("Cookie"));
+ LOG.debug("Session {}: Setting cookies for URL {}: {}",
sessionId, url,
+ map.get("Cookie") == null ? "" :
map.get("Cookie").toString());
}
}
@@ -177,7 +188,7 @@ public class CmisCookieManager implement
if (LOG.isDebugEnabled()) {
if (!cookies.isEmpty()) {
- LOG.debug("Retrieved cookies for URL " + url + ": " +
cookies);
+ LOG.debug("Session {}: Retrieved cookies for URL {}: {}",
sessionId, url, cookies.toString());
}
}
} finally {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/AbstractApacheClientHttpInvoker.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/AbstractApacheClientHttpInvoker.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/AbstractApacheClientHttpInvoker.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/AbstractApacheClientHttpInvoker.java
Thu Nov 14 13:21:52 2013
@@ -102,7 +102,7 @@ public abstract class AbstractApacheClie
try {
// log before connect
if (LOG.isDebugEnabled()) {
- LOG.debug(method + " " + url);
+ LOG.debug("Session {}: {} {}", session.getSessionId(), method,
url);
}
// get HTTP client object from session
@@ -288,7 +288,8 @@ public abstract class AbstractApacheClie
// log after connect
if (LOG.isTraceEnabled()) {
- LOG.trace(method + " " + url + " > Headers: " +
responseHeaders);
+ LOG.trace("Session {}: {} {} > Headers: {}",
session.getSessionId(), method, url,
+ responseHeaders.toString());
}
// forward response HTTP headers
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/DefaultHttpInvoker.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/DefaultHttpInvoker.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/DefaultHttpInvoker.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/DefaultHttpInvoker.java
Thu Nov 14 13:21:52 2013
@@ -79,7 +79,7 @@ public class DefaultHttpInvoker implemen
try {
// log before connect
if (LOG.isDebugEnabled()) {
- LOG.debug(method + " " + url);
+ LOG.debug("Session {}: {} {}", session.getSessionId(), method,
url);
}
// connect
@@ -211,7 +211,8 @@ public class DefaultHttpInvoker implemen
// log after connect
if (LOG.isTraceEnabled()) {
- LOG.trace(method + " " + url + " > Headers: " +
conn.getHeaderFields());
+ LOG.trace("Session {}: {} {} > Headers: {}",
session.getSessionId(), method, url, conn
+ .getHeaderFields().toString());
}
// forward response HTTP headers
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
Thu Nov 14 13:21:52 2013
@@ -65,7 +65,7 @@ public class CmisLocalSpi implements Cmi
*/
public CmisLocalSpi(BindingSession session) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Initializing local SPI...");
+ LOG.debug("Session {}: Initializing local SPI...",
session.getSessionId());
}
// get the service factory class name
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
Thu Nov 14 13:21:52 2013
@@ -194,7 +194,7 @@ public abstract class AbstractPortProvid
URL wsdlUrl =
service.getPortClass().getResource("/wsdl/cmis11/CMISWS-Service.wsdl");
if (LOG.isDebugEnabled()) {
- LOG.debug("WSDL URL: " + wsdlUrl.toExternalForm());
+ LOG.debug("Session {}: WSDL URL: {}",
getSession().getSessionId(), wsdlUrl.toExternalForm());
}
Service newService = serviceConstructor.newInstance(new Object[] {
wsdlUrl, service.getQName() });
@@ -488,7 +488,8 @@ public abstract class AbstractPortProvid
*/
protected CmisServiceHolder initServiceObject(final CmisWebSerivcesService
service) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Initializing Web Service " + service.getServiceName() +
"...");
+ LOG.debug("Session {}: Initializing Web Service {} ...",
getSession().getSessionId(),
+ service.getServiceName());
}
try {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/Axis2PortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/Axis2PortProvider.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/Axis2PortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/Axis2PortProvider.java
Thu Nov 14 13:21:52 2013
@@ -57,7 +57,8 @@ public class Axis2PortProvider extends A
*/
protected BindingProvider createPortObject(CmisServiceHolder
serviceHolder) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating Web Service port object of " +
serviceHolder.getServiceName() + "...");
+ LOG.debug("Session {}: Creating Web Service port object of {}
...", getSession().getSessionId(),
+ serviceHolder.getServiceName());
}
try {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CXFPortProvider.java
Thu Nov 14 13:21:52 2013
@@ -52,9 +52,9 @@ public class CXFPortProvider extends Abs
* Creates a port object.
*/
protected BindingProvider createPortObject(CmisServiceHolder
serviceHolder) {
-
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating Web Service port object of " +
serviceHolder.getServiceName() + "...");
+ LOG.debug("Session {}: Creating Web Service port object of {}
...", getSession().getSessionId(),
+ serviceHolder.getServiceName());
}
try {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
Thu Nov 14 13:21:52 2013
@@ -63,7 +63,7 @@ public class CmisWebServicesSpi implemen
*/
public CmisWebServicesSpi(BindingSession session) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Initializing Web Services SPI...");
+ LOG.debug("Session {}: Initializing Web Services SPI...",
session.getSessionId());
}
AbstractPortProvider portProvider = null;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunJREPortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunJREPortProvider.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunJREPortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunJREPortProvider.java
Thu Nov 14 13:21:52 2013
@@ -52,7 +52,8 @@ public class SunJREPortProvider extends
*/
protected BindingProvider createPortObject(CmisServiceHolder
serviceHolder) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating Web Service port object of " +
serviceHolder.getServiceName() + "...");
+ LOG.debug("Session {}: Creating Web Service port object of {}
...", getSession().getSessionId(),
+ serviceHolder.getServiceName());
}
try {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SunRIPortProvider.java
Thu Nov 14 13:21:52 2013
@@ -52,7 +52,8 @@ public class SunRIPortProvider extends A
*/
protected BindingProvider createPortObject(CmisServiceHolder
serviceHolder) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating Web Service port object of " +
serviceHolder.getServiceName() + "...");
+ LOG.debug("Session {}: Creating Web Service port object of {}
...", getSession().getSessionId(),
+ serviceHolder.getServiceName());
}
try {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java
Thu Nov 14 13:21:52 2013
@@ -1223,4 +1223,11 @@ public class SessionImpl implements Sess
getBinding().getPolicyService().removePolicy(getRepositoryId(),
id, objectId.getId(), null);
}
}
+
+ // ----
+
+ @Override
+ public String toString() {
+ return "Session " + getBinding().getSessionId();
+ }
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/CmisBinding.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/CmisBinding.java?rev=1541900&r1=1541899&r2=1541900&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/CmisBinding.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/spi/CmisBinding.java
Thu Nov 14 13:21:52 2013
@@ -34,6 +34,11 @@ package org.apache.chemistry.opencmis.co
public interface CmisBinding {
/**
+ * Returns the client session id.
+ */
+ String getSessionId();
+
+ /**
* Gets a Repository Service interface object.
*/
RepositoryService getRepositoryService();
