svn commit: r1591585 - in /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java: __projectPrefix__CmisService.java __projectPrefix__CmisServiceFactory.java

[fmui]

Author: fmui
Date: Thu May  1 09:46:46 2014
New Revision: 1591585

URL: http://svn.apache.org/r1591585
Log:
adjusted server archetype

Modified:
    
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisService.java
    
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisServiceFactory.java

Modified: 
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisService.java
URL: 
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisService.java?rev=1591585&r1=1591584&r2=1591585&view=diff
==============================================================================
--- 
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisService.java
 (original)
+++ 
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisService.java
 Thu May  1 09:46:46 2014
@@ -25,11 +25,12 @@ import org.apache.chemistry.opencmis.com
 import 
org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
 import org.apache.chemistry.opencmis.commons.impl.server.AbstractCmisService;
 import org.apache.chemistry.opencmis.commons.server.CallContext;
+import 
org.apache.chemistry.opencmis.server.support.wrapper.CallContextAwareCmisService;
 
 /**
  * CMIS Service Implementation.
  */
-public class ${projectPrefix}CmisService extends AbstractCmisService {
+public class ${projectPrefix}CmisService extends AbstractCmisService 
implements CallContextAwareCmisService {
 
     private CallContext context;
 

Modified: 
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisServiceFactory.java
URL: 
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisServiceFactory.java?rev=1591585&r1=1591584&r2=1591585&view=diff
==============================================================================
--- 
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisServiceFactory.java
 (original)
+++ 
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-archetype/src/main/resources/archetype-resources/src/main/java/__projectPrefix__CmisServiceFactory.java
 Thu May  1 09:46:46 2014
@@ -9,7 +9,7 @@ import java.util.Map;
 import 
org.apache.chemistry.opencmis.commons.impl.server.AbstractServiceFactory;
 import org.apache.chemistry.opencmis.commons.server.CallContext;
 import org.apache.chemistry.opencmis.commons.server.CmisService;
-import org.apache.chemistry.opencmis.server.support.CmisServiceWrapper;
+import 
org.apache.chemistry.opencmis.server.support.wrapper.ConformanceCmisServiceWrapper;
 
 /**
  * CMIS Service Factory.
@@ -51,15 +51,15 @@ public class ${projectPrefix}CmisService
         // (can also be pooled or stored in a ThreadLocal)
         ${projectPrefix}CmisService service = new 
${projectPrefix}CmisService();
 
-        // add the CMIS service wrapper
+        // add the conformance CMIS service wrapper
         // (The wrapper catches invalid CMIS requests and sets default values
         // for parameters that have not been provided by the client.)
-        CmisServiceWrapper<${projectPrefix}CmisService> wrapperService = 
-                new CmisServiceWrapper<${projectPrefix}CmisService>(service,
-                DEFAULT_MAX_ITEMS_TYPES, DEFAULT_DEPTH_TYPES, 
DEFAULT_MAX_ITEMS_OBJECTS, DEFAULT_DEPTH_OBJECTS);
+        ConformanceCmisServiceWrapper wrapperService = 
+                new ConformanceCmisServiceWrapper(service, 
DEFAULT_MAX_ITEMS_TYPES, DEFAULT_DEPTH_TYPES, 
+                        DEFAULT_MAX_ITEMS_OBJECTS, DEFAULT_DEPTH_OBJECTS);
 
         // hand over the call context to the service object
-        service.setCallContext(context);
+        wrapperService.setCallContext(context);
 
         return wrapperService;
     }