You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2010/07/22 16:31:59 UTC
svn commit: r966688 - in /incubator/chemistry/opencmis/trunk: ./
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/
chemistry-opencmis-client/chemistry-opencmis-clie...
Author: fmui
Date: Thu Jul 22 14:31:58 2010
New Revision: 966688
URL: http://svn.apache.org/viewvc?rev=966688&view=rev
Log:
- fixed CMIS-223 (Client SOAP messages expire after 24 hours)
- a few other smaller fixes
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java
incubator/chemistry/opencmis/trunk/pom.xml
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java?rev=966688&r1=966687&r2=966688&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java Thu Jul 22 14:31:58 2010
@@ -26,6 +26,7 @@ import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.soap.MTOMFeature;
@@ -65,9 +66,6 @@ import com.sun.xml.ws.developer.WSBindin
/**
* Provides CMIS Web Services port objects. Handles authentication headers.
- *
- * @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
*/
public class PortProvider {
@@ -165,106 +163,138 @@ public class PortProvider {
* Gets a port object from the session or (re-)initializes the port objects.
*/
@SuppressWarnings("unchecked")
- private Object getPortObject(String portKey) {
- Map<String, Object> portMap = (Map<String, Object>) fSession.get(SpiSessionParameter.PORTS);
+ private Object getPortObject(String serviceKey) {
+ Map<String, Service> serviceMap = (Map<String, Service>) fSession.get(SpiSessionParameter.SERVICES);
- // does the port map exist?
- if (portMap == null) {
+ // does the service map exist?
+ if (serviceMap == null) {
fSession.writeLock();
try {
// try again
- portMap = (Map<String, Object>) fSession.get(SpiSessionParameter.PORTS);
- if (portMap == null) {
- portMap = Collections.synchronizedMap(new HashMap<String, Object>());
- fSession.put(SpiSessionParameter.PORTS, portMap, true);
+ serviceMap = (Map<String, Service>) fSession.get(SpiSessionParameter.SERVICES);
+ if (serviceMap == null) {
+ serviceMap = Collections.synchronizedMap(new HashMap<String, Service>());
+ fSession.put(SpiSessionParameter.SERVICES, serviceMap, true);
}
- if (portMap.containsKey(portKey)) {
- return portMap.get(portKey);
+ if (serviceMap.containsKey(serviceKey)) {
+ return createPortObject(serviceMap.get(serviceKey));
}
- // create object
- Object portObject = initPortObject(portKey);
- portMap.put(portKey, portObject);
+ // create service object
+ Service serviceObject = initServiceObject(serviceKey);
+ serviceMap.put(serviceKey, serviceObject);
- return portObject;
+ // create port object
+ return createPortObject(serviceObject);
} finally {
fSession.writeUnlock();
}
}
- // is the port in the port map?
- if (!portMap.containsKey(portKey)) {
+ // is the service in the service map?
+ if (!serviceMap.containsKey(serviceKey)) {
fSession.writeLock();
try {
// try again
- if (portMap.containsKey(portKey)) {
- return portMap.get(portKey);
+ if (serviceMap.containsKey(serviceKey)) {
+ return createPortObject(serviceMap.get(serviceKey));
}
// create object
- Object portObject = initPortObject(portKey);
- portMap.put(portKey, portObject);
+ Service serviceObject = initServiceObject(serviceKey);
+ serviceMap.put(serviceKey, serviceObject);
- return portObject;
+ return createPortObject(serviceObject);
} finally {
fSession.writeUnlock();
}
}
- return portMap.get(portKey);
+ return createPortObject(serviceMap.get(serviceKey));
}
/**
- * Creates a port object.
+ * Creates a service object.
*/
- private Object initPortObject(String portKey) {
- Object portObject = null;
+ private Service initServiceObject(String serviceKey) {
+ Service serviceObject = null;
if (log.isDebugEnabled()) {
- log.debug("Initializing Web Service " + portKey + "...");
+ log.debug("Initializing Web Service " + serviceKey + "...");
}
try {
// get WSDL URL
- URL wsdlUrl = new URL((String) fSession.get(portKey));
+ URL wsdlUrl = new URL((String) fSession.get(serviceKey));
+
+ // build the requested service object
+ if (SessionParameter.WEBSERVICES_REPOSITORY_SERVICE.equals(serviceKey)) {
+ serviceObject = new RepositoryService(wsdlUrl, new QName(CMIS_NAMESPACE, REPOSITORY_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_NAVIGATION_SERVICE.equals(serviceKey)) {
+ serviceObject = new NavigationService(wsdlUrl, new QName(CMIS_NAMESPACE, NAVIGATION_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_OBJECT_SERVICE.equals(serviceKey)) {
+ serviceObject = new ObjectService(wsdlUrl, new QName(CMIS_NAMESPACE, OBJECT_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_VERSIONING_SERVICE.equals(serviceKey)) {
+ serviceObject = new VersioningService(wsdlUrl, new QName(CMIS_NAMESPACE, VERSIONING_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_DISCOVERY_SERVICE.equals(serviceKey)) {
+ serviceObject = new DiscoveryService(wsdlUrl, new QName(CMIS_NAMESPACE, DISCOVERY_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_MULTIFILING_SERVICE.equals(serviceKey)) {
+ serviceObject = new MultiFilingService(wsdlUrl, new QName(CMIS_NAMESPACE, MULTIFILING_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_RELATIONSHIP_SERVICE.equals(serviceKey)) {
+ serviceObject = new RelationshipService(wsdlUrl, new QName(CMIS_NAMESPACE, RELATIONSHIP_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_POLICY_SERVICE.equals(serviceKey)) {
+ serviceObject = new PolicyService(wsdlUrl, new QName(CMIS_NAMESPACE, POLICY_SERVICE));
+ } else if (SessionParameter.WEBSERVICES_ACL_SERVICE.equals(serviceKey)) {
+ serviceObject = new ACLService(wsdlUrl, new QName(CMIS_NAMESPACE, ACL_SERVICE));
+ } else {
+ throw new CmisRuntimeException("Cannot find Web Services service object [" + serviceKey + "]!");
+ }
+ } catch (CmisBaseException ce) {
+ throw ce;
+ } catch (Exception e) {
+ throw new CmisConnectionException("Cannot initalize Web Services service object [" + serviceKey + "]: "
+ + e.getMessage(), e);
+ }
+
+ return serviceObject;
+ }
- // build the requested port object
- if (SessionParameter.WEBSERVICES_REPOSITORY_SERVICE.equals(portKey)) {
- RepositoryService service = new RepositoryService(wsdlUrl,
- new QName(CMIS_NAMESPACE, REPOSITORY_SERVICE));
- portObject = service.getRepositoryServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_NAVIGATION_SERVICE.equals(portKey)) {
- NavigationService service = new NavigationService(wsdlUrl,
- new QName(CMIS_NAMESPACE, NAVIGATION_SERVICE));
- portObject = service.getNavigationServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_OBJECT_SERVICE.equals(portKey)) {
- ObjectService service = new ObjectService(wsdlUrl, new QName(CMIS_NAMESPACE, OBJECT_SERVICE));
- portObject = service.getObjectServicePort(new MTOMFeature(), new StreamingAttachmentFeature(null, true,
- 4 * 1024 * 1024));
+ /**
+ * Creates a port object.
+ */
+ private Object createPortObject(Service service) {
+ Object portObject = null;
+
+ if (log.isDebugEnabled()) {
+ log.debug("Creating Web Service port object of " + (service == null ? "???" : service.getServiceName())
+ + "...");
+ }
+
+ try {
+ if (service instanceof RepositoryService) {
+ portObject = ((RepositoryService) service).getRepositoryServicePort(new MTOMFeature());
+ } else if (service instanceof NavigationService) {
+ portObject = ((NavigationService) service).getNavigationServicePort(new MTOMFeature());
+ } else if (service instanceof ObjectService) {
+ portObject = ((ObjectService) service).getObjectServicePort(new MTOMFeature(),
+ new StreamingAttachmentFeature(null, true, 4 * 1024 * 1024));
((BindingProvider) portObject).getRequestContext().put(
JAXWSProperties.HTTP_CLIENT_STREAMING_CHUNK_SIZE, CHUNK_SIZE);
- } else if (SessionParameter.WEBSERVICES_VERSIONING_SERVICE.equals(portKey)) {
- VersioningService service = new VersioningService(wsdlUrl,
- new QName(CMIS_NAMESPACE, VERSIONING_SERVICE));
- portObject = service.getVersioningServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_DISCOVERY_SERVICE.equals(portKey)) {
- DiscoveryService service = new DiscoveryService(wsdlUrl, new QName(CMIS_NAMESPACE, DISCOVERY_SERVICE));
- portObject = service.getDiscoveryServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_MULTIFILING_SERVICE.equals(portKey)) {
- MultiFilingService service = new MultiFilingService(wsdlUrl, new QName(CMIS_NAMESPACE,
- MULTIFILING_SERVICE));
- portObject = service.getMultiFilingServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_RELATIONSHIP_SERVICE.equals(portKey)) {
- RelationshipService service = new RelationshipService(wsdlUrl, new QName(CMIS_NAMESPACE,
- RELATIONSHIP_SERVICE));
- portObject = service.getRelationshipServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_POLICY_SERVICE.equals(portKey)) {
- PolicyService service = new PolicyService(wsdlUrl, new QName(CMIS_NAMESPACE, POLICY_SERVICE));
- portObject = service.getPolicyServicePort(new MTOMFeature());
- } else if (SessionParameter.WEBSERVICES_ACL_SERVICE.equals(portKey)) {
- ACLService service = new ACLService(wsdlUrl, new QName(CMIS_NAMESPACE, ACL_SERVICE));
- portObject = service.getACLServicePort(new MTOMFeature());
+ } else if (service instanceof VersioningService) {
+ portObject = ((VersioningService) service).getVersioningServicePort(new MTOMFeature());
+ } else if (service instanceof DiscoveryService) {
+ portObject = ((DiscoveryService) service).getDiscoveryServicePort(new MTOMFeature());
+ } else if (service instanceof MultiFilingService) {
+ portObject = ((MultiFilingService) service).getMultiFilingServicePort(new MTOMFeature());
+ } else if (service instanceof RelationshipService) {
+ portObject = ((RelationshipService) service).getRelationshipServicePort(new MTOMFeature());
+ } else if (service instanceof PolicyService) {
+ portObject = ((PolicyService) service).getPolicyServicePort(new MTOMFeature());
+ } else if (service instanceof ACLService) {
+ portObject = ((ACLService) service).getACLServicePort(new MTOMFeature());
+ } else {
+ throw new CmisRuntimeException("Cannot find Web Services service object!");
}
// add SOAP and HTTP authentication headers
@@ -277,7 +307,8 @@ public class PortProvider {
}
// HTTP header
- Map<String, List<String>> httpHeaders = authProvider.getHTTPHeaders(wsdlUrl.toString());
+ Map<String, List<String>> httpHeaders = authProvider.getHTTPHeaders(service.getWSDLDocumentLocation()
+ .toString());
if (httpHeaders != null) {
((BindingProvider) portObject).getRequestContext().put(MessageContext.HTTP_REQUEST_HEADERS,
httpHeaders);
@@ -286,13 +317,7 @@ public class PortProvider {
} catch (CmisBaseException ce) {
throw ce;
} catch (Exception e) {
- throw new CmisConnectionException("Cannot initalize Web Services port object [" + portKey + "]: "
- + e.getMessage(), e);
- }
-
- // we have no object ... strange ...
- if (portObject == null) {
- throw new CmisRuntimeException("Cannot find Web Services port object [" + portKey + "]!");
+ throw new CmisConnectionException("Cannot initalize Web Services port object: " + e.getMessage(), e);
}
return portObject;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java?rev=966688&r1=966687&r2=966688&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/SpiSessionParameter.java Thu Jul 22 14:31:58 2010
@@ -19,12 +19,11 @@
package org.apache.chemistry.opencmis.client.bindings.spi.webservices;
/**
- * @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ * Web Services session parameter.
*/
public final class SpiSessionParameter {
- public static final String PORTS = "org.apache.chemistry.opencmis.binding.webservices.ports";
+ public static final String SERVICES = "org.apache.chemistry.opencmis.binding.webservices.services";
private SpiSessionParameter() {
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java?rev=966688&r1=966687&r2=966688&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java Thu Jul 22 14:31:58 2010
@@ -93,7 +93,7 @@ public abstract class AbstractPersistent
throw new IllegalArgumentException("Object type must be set!");
}
- if (objectType.getPropertyDefinitions().size() < 9) {
+ if ((objectType.getPropertyDefinitions() == null) || objectType.getPropertyDefinitions().size() < 9) {
// there must be at least the 9 standard properties that all objects
// have
throw new IllegalArgumentException("Object type must have property defintions!");
@@ -276,7 +276,8 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#updateProperties()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#updateProperties()
*/
public ObjectId updateProperties() {
readLock();
@@ -314,7 +315,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#updateProperties(java.util.Map)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#updateProperties(
+ * java.util.Map)
*/
public ObjectId updateProperties(Map<String, ?> properties) {
if ((properties == null) || (properties.isEmpty())) {
@@ -403,7 +405,8 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getCreationDate()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getCreationDate()
*/
public GregorianCalendar getCreationDate() {
return getPropertyValue(PropertyIds.CREATION_DATE);
@@ -421,7 +424,9 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getLastModificationDate()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getLastModificationDate
+ * ()
*/
public GregorianCalendar getLastModificationDate() {
return getPropertyValue(PropertyIds.LAST_MODIFICATION_DATE);
@@ -430,7 +435,8 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getLastModifiedBy()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getLastModifiedBy()
*/
public String getLastModifiedBy() {
return getPropertyValue(PropertyIds.LAST_MODIFIED_BY);
@@ -463,7 +469,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#getProperty(java.lang.String)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getProperty(java.
+ * lang.String)
*/
@SuppressWarnings("unchecked")
public <T> Property<T> getProperty(String id) {
@@ -479,8 +486,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#getPropertyMultivalue(java.
- * lang.String)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getPropertyMultivalue
+ * (java. lang.String)
*/
public <T> List<T> getPropertyMultivalue(String id) {
Property<T> property = getProperty(id);
@@ -495,8 +502,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#getPropertyValue(java.lang.
- * String)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getPropertyValue(
+ * java.lang. String)
*/
public <T> T getPropertyValue(String id) {
Property<T> property = getProperty(id);
@@ -510,7 +517,9 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#setName(java.lang.String)
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#setName(java.lang
+ * .String)
*/
public void setName(String name) {
setProperty(PropertyIds.NAME, name);
@@ -520,8 +529,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#setProperty(java.lang.String,
- * java.lang.Object)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#setProperty(java.
+ * lang.String, java.lang.Object)
*/
@SuppressWarnings("unchecked")
public <T> void setProperty(String id, T value) {
@@ -549,8 +558,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#setPropertyMultivalue(java.
- * lang.String, java.util.List)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#setPropertyMultivalue
+ * (java. lang.String, java.util.List)
*/
@SuppressWarnings("unchecked")
public <T> void setPropertyMultivalue(String id, List<T> value) {
@@ -593,7 +602,8 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getAllowableActions()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getAllowableActions()
*/
public AllowableActions getAllowableActions() {
readLock();
@@ -635,8 +645,9 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#applyAcl(java.util.List,
- * java.util.List, org.apache.opencmis.commons.enums.AclPropagation)
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#applyAcl(java.util
+ * .List, java.util.List, org.apache.opencmis.commons.enums.AclPropagation)
*/
public Acl applyAcl(List<Ace> addAces, List<Ace> removeAces, AclPropagation aclPropagation) {
String objectId = getObjectId();
@@ -650,8 +661,9 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#addAcl(java.util.List,
- * org.apache.opencmis.commons.enums.AclPropagation)
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#addAcl(java.util.
+ * List, org.apache.opencmis.commons.enums.AclPropagation)
*/
public void addAcl(List<Ace> addAces, AclPropagation aclPropagation) {
applyAcl(addAces, null, aclPropagation);
@@ -660,8 +672,9 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#removeAcl(java.util.List,
- * org.apache.opencmis.commons.enums.AclPropagation)
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#removeAcl(java.util
+ * .List, org.apache.opencmis.commons.enums.AclPropagation)
*/
public void removeAcl(List<Ace> removeAces, AclPropagation aclPropagation) {
applyAcl(null, removeAces, aclPropagation);
@@ -687,8 +700,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#applyPolicy(org.apache.opencmis
- * .client.api.ObjectId)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#applyPolicy(org.apache
+ * .opencmis .client.api.ObjectId)
*/
public void applyPolicy(ObjectId policyId) {
if ((policyId == null) || (policyId.getId() == null)) {
@@ -703,8 +716,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#removePolicy(org.apache.opencmis
- * .client.api.ObjectId)
+ * org.apache.chemistry.opencmis.client.api.CmisObject#removePolicy(org.
+ * apache.opencmis .client.api.ObjectId)
*/
public void removePolicy(ObjectId policyId) {
if ((policyId == null) || (policyId.getId() == null)) {
@@ -734,7 +747,8 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getRelationships()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getRelationships()
*/
public List<Relationship> getRelationships() {
readLock();
@@ -748,8 +762,9 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getRelationships(boolean,
- * org.apache.opencmis.commons.enums.RelationshipDirection,
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getRelationships(
+ * boolean, org.apache.opencmis.commons.enums.RelationshipDirection,
* org.apache.chemistry.opencmis.client.api.objecttype.ObjectType,
* org.apache.chemistry.opencmis.client.api.OperationContext, int)
*/
@@ -832,7 +847,8 @@ public abstract class AbstractPersistent
/*
* (non-Javadoc)
*
- * @see org.apache.chemistry.opencmis.client.api.CmisObject#getRefreshTimestamp()
+ * @see
+ * org.apache.chemistry.opencmis.client.api.CmisObject#getRefreshTimestamp()
*/
public long getRefreshTimestamp() {
readLock();
@@ -847,8 +863,8 @@ public abstract class AbstractPersistent
* (non-Javadoc)
*
* @see
- * org.apache.chemistry.opencmis.client.api.CmisObject#refresh(org.apache.opencmis
- * .client.api.OperationContext )
+ * org.apache.chemistry.opencmis.client.api.CmisObject#refresh(org.apache
+ * .opencmis .client.api.OperationContext )
*/
public void refresh() {
writeLock();
Modified: incubator/chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/pom.xml?rev=966688&r1=966687&r2=966688&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/pom.xml (original)
+++ incubator/chemistry/opencmis/trunk/pom.xml Thu Jul 22 14:31:58 2010
@@ -347,7 +347,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
+ <version>1.2.16</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -444,6 +444,7 @@
<!-- Assemblies the doc package -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
<inherited>false</inherited>
<configuration>
<attach>true</attach>