]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5103a79)
CSPACE-4808,CSPACE-3457: Removing cruft from the DocHandlerParams blocks in the servi...
authorAron Roberts <aron@socrates.berkeley.edu>
Sat, 4 Aug 2012 00:06:54 +0000 (17:06 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Sat, 4 Aug 2012 00:06:54 +0000 (17:06 -0700)
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml patch | blob | history
services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java patch | blob | history

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 311e46cba7ce95defea39fe2b47fb68ff75e4881..82019b13b9a988cb7f4ae14c9ede6d8fd8f5c90b 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -87,8 +87,6 @@
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.collectionobject.nuxeo.CollectionObjectDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
-                    <service:DublinCoreTitle>collectionobjects</service:DublinCoreTitle>
-                    <service:ListResultsItemMethodName>getCollectionObjectListItem</service:ListResultsItemMethodName>
                     <service:ListResultsFields>
                         <service:ListResultField>
                             <service:element>objectNumber</service:element>
@@ -656,14 +654,7 @@
             <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.intake.nuxeo.IntakeDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.group.nuxeo.IntakeDocumentModelHandler</service:classname>
                 <service:params>
-                    <service:SchemaName>intakes</service:SchemaName>
-                    <service:DublinCoreTitle>intakes</service:DublinCoreTitle>
-                    <service:SummaryFields> entryNumber|depositor|currentOwner|uri|csid</service:SummaryFields>
-                    <service:AbstractCommonListClassname />
-                    <service:CommonListItemClassname />
-                    <service:ListResultsItemMethodName>getIntakeListItem</service:ListResultsItemMethodName>
                     <service:ListResultsFields>
                         <service:ListResultField>
                             <service:element>entryNumber</service:element>
@@ -797,14 +788,7 @@
             <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler</service:classname>
                 <service:params>
-                    <service:SchemaName>loansin</service:SchemaName>
-                    <service:DublinCoreTitle>loansin</service:DublinCoreTitle>
-                    <service:SummaryFields>loanInNumber|lenderList|loanReturnDate|uri|csid</service:SummaryFields>
-                    <service:AbstractCommonListClassname />
-                    <service:CommonListItemClassname />
-                    <service:ListResultsItemMethodName>getLoaninListItem</service:ListResultsItemMethodName>
                     <service:ListResultsFields>
                         <service:ListResultField>
                             <service:element>loanInNumber</service:element>
@@ -980,7 +964,6 @@
             <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler</service:classname>
                 <service:params>
                     <service:ListResultsFields>
                         <service:ListResultField>
@@ -1149,14 +1132,7 @@
             <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.imports.nuxeo.ImportsDocumentModelHandler</service:documentHandler>
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:classname>org.collectionspace.services.imports.nuxeo.ImportsDocumentModelHandler</service:classname>
                 <service:params>
-                    <service:SchemaName>imports</service:SchemaName>
-                    <service:DublinCoreTitle>imports</service:DublinCoreTitle>
-                    <service:SummaryFields>importsField|uri|csid</service:SummaryFields>
-                    <service:AbstractCommonListClassname>org.collectionspace.services.imports.ImportsCommonList</service:AbstractCommonListClassname>
-                    <service:CommonListItemClassname>org.collectionspace.services.imports.ImportsCommonList$ImportsListItem</service:CommonListItemClassname>
-                    <service:ListResultsItemMethodName>getImportsListItem</service:ListResultsItemMethodName>
                     <service:ListResultsFields>
                         <service:ListResultField>
                             <service:element>importsField</service:element>
@@ -1567,7 +1543,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                         <service:ListResultField>
                             <service:element>order</service:element>
                             <service:xpath>order</service:xpath>
@@ -1698,7 +1674,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
@@ -1872,7 +1848,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                         <service:ListResultField>
                             <service:element>foreName</service:element>
                             <service:xpath>personTermGroupList/[0]/foreName</service:xpath>
@@ -2067,7 +2043,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
@@ -2212,7 +2188,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
@@ -2395,7 +2371,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                         <!-- Uncomment when bug in returning list result values from complex types,
                              currently in the CSPACE-4813 branch (P/NP term work in services), is fixed -->
                         <!--
@@ -2581,7 +2557,7 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                     <service:ListResultsFields>
-                        <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
+                        <!-- Omit the standard AuthorityItem fields (they are handled by the code) -->
                     </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index d4dd49b9573951ba69d4a4e790115cab869d0f38..8bff24172997d647aa8279f0866f2b08be8d8d5b 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -163,25 +163,6 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
         throw new UnsupportedOperationException();\r
     }\r
 \r
-    // This is an old hack restored by Laramie in confusion about how the \r
-       // replacement model works. Will be removed ASAP.\r
-    public AbstractCommonList extractCommonPartListLaramieHACK(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {\r
-        String label = getServiceContext().getCommonPartLabel();\r
-        AbstractCommonList commonList = createAbstractCommonListImpl();\r
-        //LC extractPagingInfo((commonList), wrapDoc);\r
-        commonList.setFieldsReturned(getSummaryFields(commonList));\r
-        List list = createItemsList(commonList);\r
-        Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();\r
-        while(iter.hasNext()){\r
-            DocumentModel docModel = iter.next();\r
-            String id = NuxeoUtils.getCsid(docModel);//NuxeoUtils.extractId(docModel.getPathAsString());\r
-            Object item = createItemForCommonList(docModel, label, id);\r
-            list.add(item);\r
-        }\r
-        extractPagingInfo((commonList), wrapDoc); //LC\r
-        return commonList;\r
-    }\r
-\r
        public static String getUpdatedAtAsString(DocumentModel docModel) throws Exception {\r
                        GregorianCalendar cal = (GregorianCalendar)\r
                                                                docModel.getProperty(CollectionSpaceClient.COLLECTIONSPACE_CORE_SCHEMA,\r
@@ -193,9 +174,6 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
     @Override\r
     public AbstractCommonList extractCommonPartList(DocumentWrapper<DocumentModelList> wrapDoc) throws Exception {\r
         String classname = getDocHandlerParams().getAbstractCommonListClassname();\r
-        if (!Tools.isBlank(classname)){\r
-             return extractCommonPartListLaramieHACK(wrapDoc);\r
-        }\r
        CommonList commonList = new CommonList();\r
         String markRtSbj = null;\r
        RepositoryInstance repoSession = null;\r