From 1d8a9ff3998a1b7168365c0dc6fbfc4a6e48e186 Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Thu, 21 Apr 2011 00:09:29 +0000 Subject: [PATCH] CSPACE-3851 Consumer can perform CRUDL operations on a group. Basic Group support added, with a draft schema. Follows standard CRUDL pattern, and is a trivial service. Note that group membership will be through relations, much as objects are associated to Intakes, etc. --- services/group/.classpath | 6 + services/group/.project | 23 + .../.settings/org.maven.ide.eclipse.prefs | 9 + services/group/3rdparty/.classpath | 6 + services/group/3rdparty/.project | 23 + .../.settings/org.maven.ide.eclipse.prefs | 9 + services/group/3rdparty/build.xml | 127 ++++++ .../nuxeo-platform-cs-group/.classpath | 8 + .../3rdparty/nuxeo-platform-cs-group/.project | 17 + .../.settings/org.maven.ide.eclipse.prefs | 9 + .../nuxeo-platform-cs-group/build.xml | 143 ++++++ .../3rdparty/nuxeo-platform-cs-group/pom.xml | 38 ++ .../src/main/resources/META-INF/MANIFEST.MF | 23 + .../resources/OSGI-INF/core-types-contrib.xml | 15 + .../OSGI-INF/deployment-fragment.xml | 408 ++++++++++++++++++ .../resources/OSGI-INF/ecm-types-contrib.xml | 29 ++ .../resources/OSGI-INF/layouts-contrib.xml | 78 ++++ .../resources/OSGI-INF/life-cycle-contrib.xml | 11 + .../main/resources/schemas/groups_common.xsd | 27 ++ services/group/3rdparty/pom.xml | 24 ++ services/group/build.xml | 124 ++++++ services/group/client/.classpath | 10 + services/group/client/.project | 29 ++ .../.settings/org.maven.ide.eclipse.prefs | 9 + services/group/client/pom.xml | 96 +++++ .../services/client/GroupClient.java | 60 +++ .../services/client/GroupProxy.java | 62 +++ .../client/test/GroupServiceTest.java | 279 ++++++++++++ .../src/test/resources/log4j.properties | 23 + services/group/jaxb/.classpath | 9 + services/group/jaxb/.project | 19 + .../.settings/org.maven.ide.eclipse.prefs | 9 + services/group/jaxb/pom.xml | 47 ++ .../services/GroupJAXBSchema.java | 10 + .../services/GroupListItemJAXBSchema.java | 6 + .../jaxb/src/main/resources/groups_common.xsd | 52 +++ services/group/pom.xml | 24 ++ services/group/service/.classpath | 10 + services/group/service/.project | 31 ++ .../.settings/org.maven.ide.eclipse.prefs | 9 + services/group/service/pom.xml | 122 ++++++ services/group/service/profiles.xml | 4 + .../services/group/GroupResource.java | 59 +++ .../nuxeo/GroupDocumentModelHandler.java | 32 ++ .../group/nuxeo/GroupValidatorHandler.java | 18 + .../services/test/GroupServiceTest.java | 13 + .../service/src/test/resources/log4j.xml | 45 ++ 47 files changed, 2244 insertions(+) create mode 100644 services/group/.classpath create mode 100644 services/group/.project create mode 100644 services/group/.settings/org.maven.ide.eclipse.prefs create mode 100644 services/group/3rdparty/.classpath create mode 100644 services/group/3rdparty/.project create mode 100644 services/group/3rdparty/.settings/org.maven.ide.eclipse.prefs create mode 100644 services/group/3rdparty/build.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/.classpath create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/.project create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/.settings/org.maven.ide.eclipse.prefs create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/build.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/pom.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/deployment-fragment.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/layouts-contrib.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml create mode 100644 services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd create mode 100644 services/group/3rdparty/pom.xml create mode 100644 services/group/build.xml create mode 100644 services/group/client/.classpath create mode 100644 services/group/client/.project create mode 100644 services/group/client/.settings/org.maven.ide.eclipse.prefs create mode 100644 services/group/client/pom.xml create mode 100644 services/group/client/src/main/java/org/collectionspace/services/client/GroupClient.java create mode 100644 services/group/client/src/main/java/org/collectionspace/services/client/GroupProxy.java create mode 100644 services/group/client/src/test/java/org/collectionspace/services/client/test/GroupServiceTest.java create mode 100644 services/group/client/src/test/resources/log4j.properties create mode 100644 services/group/jaxb/.classpath create mode 100644 services/group/jaxb/.project create mode 100644 services/group/jaxb/.settings/org.maven.ide.eclipse.prefs create mode 100644 services/group/jaxb/pom.xml create mode 100644 services/group/jaxb/src/main/java/org/collectionspace/services/GroupJAXBSchema.java create mode 100644 services/group/jaxb/src/main/java/org/collectionspace/services/GroupListItemJAXBSchema.java create mode 100644 services/group/jaxb/src/main/resources/groups_common.xsd create mode 100644 services/group/pom.xml create mode 100644 services/group/service/.classpath create mode 100644 services/group/service/.project create mode 100644 services/group/service/.settings/org.maven.ide.eclipse.prefs create mode 100644 services/group/service/pom.xml create mode 100644 services/group/service/profiles.xml create mode 100644 services/group/service/src/main/java/org/collectionspace/services/group/GroupResource.java create mode 100644 services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupDocumentModelHandler.java create mode 100644 services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupValidatorHandler.java create mode 100644 services/group/service/src/test/java/org/collectionspace/services/test/GroupServiceTest.java create mode 100644 services/group/service/src/test/resources/log4j.xml diff --git a/services/group/.classpath b/services/group/.classpath new file mode 100644 index 000000000..046988541 --- /dev/null +++ b/services/group/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/services/group/.project b/services/group/.project new file mode 100644 index 000000000..4266eac1f --- /dev/null +++ b/services/group/.project @@ -0,0 +1,23 @@ + + + org.collectionspace.services.group + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/services/group/.settings/org.maven.ide.eclipse.prefs b/services/group/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..1156693b1 --- /dev/null +++ b/services/group/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Dec 03 15:35:01 PST 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/services/group/3rdparty/.classpath b/services/group/3rdparty/.classpath new file mode 100644 index 000000000..046988541 --- /dev/null +++ b/services/group/3rdparty/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/services/group/3rdparty/.project b/services/group/3rdparty/.project new file mode 100644 index 000000000..738d25db7 --- /dev/null +++ b/services/group/3rdparty/.project @@ -0,0 +1,23 @@ + + + org.collectionspace.services.group.3rdparty + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/services/group/3rdparty/.settings/org.maven.ide.eclipse.prefs b/services/group/3rdparty/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..e2ce08c02 --- /dev/null +++ b/services/group/3rdparty/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Aug 27 16:35:21 PDT 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/services/group/3rdparty/build.xml b/services/group/3rdparty/build.xml new file mode 100644 index 000000000..59882a47d --- /dev/null +++ b/services/group/3rdparty/build.xml @@ -0,0 +1,127 @@ + + + + group service 3rdparty + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/.classpath b/services/group/3rdparty/nuxeo-platform-cs-group/.classpath new file mode 100644 index 000000000..199bbbbdb --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/.project b/services/group/3rdparty/nuxeo-platform-cs-group/.project new file mode 100644 index 000000000..96967c793 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/.project @@ -0,0 +1,17 @@ + + org.collectionspace.services.group.3rdparty.nuxeo + Group Nuxeo Document Type. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/.settings/org.maven.ide.eclipse.prefs b/services/group/3rdparty/nuxeo-platform-cs-group/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..e2ce08c02 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Aug 27 16:35:21 PDT 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml new file mode 100644 index 000000000..03f1a75a7 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml @@ -0,0 +1,143 @@ + + + + group nuxeo document type + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml new file mode 100644 index 000000000..5e8e1e18c --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/pom.xml @@ -0,0 +1,38 @@ + + + + org.collectionspace.services + org.collectionspace.services.group.3rdparty + 1.7-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.group.3rdparty.nuxeo + services.group.3rdparty.nuxeo + jar + + Group Nuxeo Document Type + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + src/main/resources/META-INF/MANIFEST.MF + + ${eclipseVersion} + 2 + + + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..46363cd06 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,23 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 1 +Bundle-Name: NuxeoCS +Bundle-SymbolicName: org.collectionspace.group;singleton:=true +Bundle-Version: 1.0.0 +Bundle-Localization: plugin +Bundle-Vendor: Nuxeo +Require-Bundle: org.nuxeo.runtime, + org.nuxeo.ecm.core.api, + org.nuxeo.ecm.core, + org.nuxeo.ecm.core.api, + org.nuxeo.ecm.platform.types.api, + org.nuxeo.ecm.platform.versioning.api, + org.nuxeo.ecm.platform.ui, + org.nuxeo.ecm.platform.forms.layout.client, + org.nuxeo.ecm.platform.ws, + org.collectionspace.collectionspace_core +Provide-Package: org.collectionspace.group +Nuxeo-Component: OSGI-INF/core-types-contrib.xml, + OSGI-INF/life-cycle-contrib.xml, + OSGI-INF/ecm-types-contrib.xml, + OSGI-INF/layouts-contrib.xml + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml new file mode 100644 index 000000000..095ed1841 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/core-types-contrib.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/deployment-fragment.xml new file mode 100644 index 000000000..88b94ffd1 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/deployment-fragment.xml @@ -0,0 +1,408 @@ + + + + + + ${bundle.fileName} + + + + + nuxeo.war + /nuxeo + + + + + + + + + + + + Seam Context Filter + /ws/FileManageWS + + + + Seam Context Filter + /DocumentManagerWS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #{currentServerLocation.name}/#{currentTabAction.label} + + + + Create new document in #{currentDocument.name} + + + + Create new document in #{currentDocument.name} + + + + breadcrumb=command.user_dashboard + + + + breadcrumb=command.manageMembers + + + + breadcrumb=command.manageMembers + + + + breadcrumb=title.vocabularies + + + + breadcrumb=command.advancedSearch + + + + + + en + en_GB + en_US + fr + de + es + it + ar + ru + ja + vn + + + messages + + + + config/addWorkspace.jpdl.xml + + + + + + generic_error_page + /generic_error_page.xhtml + + + + + generic_message_page + /generic_message_page.xhtml + + + + + home + /nxstartup.xhtml + + + + + user_login + /login.xhtml + + + + + user_logout + /logout.xhtml + + + + + view_servers + /view_servers.xhtml + + + + + + + view_domains + /view_domains.xhtml + + + + + select_document_type + /select_document_type.xhtml + + + + + create_document + /create_document.xhtml + + + + + edit_document + /edit_document.xhtml + + + + + view_documents + /view_documents.xhtml + + + + + create_file + /create_file.xhtml + + + + + create_workspace_wizard + /createWorkspaceWizard.xhtml + + + + + send_email + /document_email.xhtml + + + + + + view_workspaces + /view_workspaces.xhtml + + + + + + create_domain + /create_domain.xhtml + + + + + + edit_domain + /edit_domain.xhtml + + + + + + create_workspace + /create_workspace.xhtml + + + + + + edit_workspace + /edit_workspace.xhtml + + + + + + + members_management + /members_management.xhtml + + + + + view_users + /view_users.xhtml + + + + + view_many_users + /view_many_users.xhtml + + + + + edit_user + /edit_user.xhtml + + + + + edit_user_password + /edit_user_password.xhtml + + + + + view_user + /view_user.xhtml + + + + + create_user + /create_user.xhtml + + + + + view_groups + /view_groups.xhtml + + + + + view_group + /view_group.xhtml + + + + + edit_group + /edit_group.xhtml + + + + + create_group + /create_group.xhtml + + + + + view_vocabularies + /view_vocabularies.xhtml + + + + + view_vocabulary + /view_vocabulary.xhtml + + + + + + + search_form + /search/search_form.xhtml + + + + + search_results_nxql + /search/search_results_nxql.xhtml + + + + + search_results_advanced + + /search/search_results_advanced.xhtml + + + + + + search_results_simple + /search/search_results_simple.xhtml + + + + + + + clipboard + /incl/clipboard.xhtml + + + + + user_dashboard + /user_dashboard.xhtml + + + + + select_workspace_template + /select_workspace_template.xhtml + + + + + pdf_generation_error + /pdf_generation_error.xhtml + + + + + mass_edit + /massedit_documents.xhtml + + + + + mass_edit_confirm + /massedit_documents_preview.xhtml + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml new file mode 100644 index 000000000..fece3e412 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/ecm-types-contrib.xml @@ -0,0 +1,29 @@ + + + + + + + view_documents + + + heading + collectionspace_core + group + + + + + + Group + + + + + + Group + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/layouts-contrib.xml new file mode 100644 index 000000000..0e732673a --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + title + scopeNote + responsibleDept + + + + + + + + true + + title + + + dataInputText + + + + + + + + true + + scopeNote + + + dataInputText + + + + + + + + true + + responsibleDepartment + + + dataInputText + + + + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml new file mode 100644 index 000000000..18caecf3c --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/OSGI-INF/life-cycle-contrib.xml @@ -0,0 +1,11 @@ + + + + + + default + + + + diff --git a/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd new file mode 100644 index 000000000..745a89bd0 --- /dev/null +++ b/services/group/3rdparty/nuxeo-platform-cs-group/src/main/resources/schemas/groups_common.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/services/group/3rdparty/pom.xml b/services/group/3rdparty/pom.xml new file mode 100644 index 000000000..459c0ae52 --- /dev/null +++ b/services/group/3rdparty/pom.xml @@ -0,0 +1,24 @@ + + + + org.collectionspace.services.group + org.collectionspace.services + 1.7-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.group.3rdparty + services.group.3rdparty + pom + + + 3rd party build for group service + + + + nuxeo-platform-cs-group + + diff --git a/services/group/build.xml b/services/group/build.xml new file mode 100644 index 000000000..b85db1825 --- /dev/null +++ b/services/group/build.xml @@ -0,0 +1,124 @@ + + + + group service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/group/client/.classpath b/services/group/client/.classpath new file mode 100644 index 000000000..425cd1620 --- /dev/null +++ b/services/group/client/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/services/group/client/.project b/services/group/client/.project new file mode 100644 index 000000000..8e3ece9bc --- /dev/null +++ b/services/group/client/.project @@ -0,0 +1,29 @@ + + org.collectionspace.services.group.client + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + org.collectionspace.services.3rdparty.nuxeo.quote-api + org.collectionspace.services.client + org.collectionspace.services.common + org.collectionspace.services.common-api + org.collectionspace.services.contact.client + org.collectionspace.services.contact.jaxb + org.collectionspace.services.hyperjaxb + org.collectionspace.services.jaxb + org.collectionspace.services.group.jaxb + org.collectionspace.services.person.client + org.collectionspace.services.person.jaxb + + + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/services/group/client/.settings/org.maven.ide.eclipse.prefs b/services/group/client/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..e2ce08c02 --- /dev/null +++ b/services/group/client/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Aug 27 16:35:21 PDT 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/services/group/client/pom.xml b/services/group/client/pom.xml new file mode 100644 index 000000000..e3f8d0c05 --- /dev/null +++ b/services/group/client/pom.xml @@ -0,0 +1,96 @@ + + + + org.collectionspace.services + org.collectionspace.services.group + 1.7-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.group.client + services.group.client + + + + + org.slf4j + slf4j-api + test + + + org.slf4j + slf4j-log4j12 + test + + + + org.collectionspace.services + org.collectionspace.services.authority + true + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.common + true + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.group.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.person.client + ${project.version} + + + + org.testng + testng + 5.6 + + + org.jboss.resteasy + resteasy-jaxrs + + + + tjws + webserver + + + + + org.jboss.resteasy + resteasy-jaxb-provider + + + org.jboss.resteasy + resteasy-multipart-provider + + + commons-httpclient + commons-httpclient + 3.1 + + + + + collectionspace-services-group-client + + diff --git a/services/group/client/src/main/java/org/collectionspace/services/client/GroupClient.java b/services/group/client/src/main/java/org/collectionspace/services/client/GroupClient.java new file mode 100644 index 000000000..e73ace195 --- /dev/null +++ b/services/group/client/src/main/java/org/collectionspace/services/client/GroupClient.java @@ -0,0 +1,60 @@ +/** + * This document is a part of the source code and related artifacts + * for CollectionSpace, an open source collections management system + * for museums and related institutions: + * + * http://www.collectionspace.org + * http://wiki.collectionspace.org + * + * Copyright (c) 2009 Regents of the University of California + * + * Licensed under the Educational Community License (ECL), Version 2.0. + * You may not use this file except in compliance with this License. + * + * You may obtain a copy of the ECL 2.0 License at + * https://source.collectionspace.org/collection-space/LICENSE.txt + */ +package org.collectionspace.services.client; + +import org.collectionspace.services.jaxb.AbstractCommonList; +import org.jboss.resteasy.client.ClientResponse; + +/** + * GroupClient.java + * + * $LastChangedRevision: 2108 $ + * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $ + * + */ +public class GroupClient extends AbstractPoxServiceClientImpl { + public static final String SERVICE_NAME = "groups"; + public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; + public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT; + public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/"; + public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME; + + @Override + public String getServiceName() { + return SERVICE_NAME; + } + + @Override + public String getServicePathComponent() { + return SERVICE_PATH_COMPONENT; + } + + @Override + public Class getProxyClass() { + // TODO Auto-generated method stub + return GroupProxy.class; + } + + /* + * Proxied service calls. + * + */ + + public ClientResponse readList() { + return getProxy().readList(); + } +} diff --git a/services/group/client/src/main/java/org/collectionspace/services/client/GroupProxy.java b/services/group/client/src/main/java/org/collectionspace/services/client/GroupProxy.java new file mode 100644 index 000000000..610a5a88a --- /dev/null +++ b/services/group/client/src/main/java/org/collectionspace/services/client/GroupProxy.java @@ -0,0 +1,62 @@ +/** + * GroupProxy.java + * + * {Purpose of This Class} + * + * {Other Notes Relating to This Class (Optional)} + * + * $LastChangedBy: $ + * $LastChangedRevision: $ + * $LastChangedDate: $ + * + * This document is a part of the source code and related artifacts + * for CollectionSpace, an open source collections management system + * for museums and related institutions: + * + * http://www.collectionspace.org + * http://wiki.collectionspace.org + * + * Copyright © 2011 U.C. Berkeley + * + * Licensed under the Educational Community License (ECL), Version 2.0. + * You may not use this file except in compliance with this License. + * + * You may obtain a copy of the ECL 2.0 License at + * https://source.collectionspace.org/collection-space/LICENSE.txt + */ +package org.collectionspace.services.client; + +import org.jboss.resteasy.client.ClientResponse; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.collectionspace.services.client.workflow.WorkflowClient; +import org.collectionspace.services.jaxb.AbstractCommonList; + +/** + * @version $Revision: 2108 $ + */ +@Path(GroupClient.SERVICE_PATH_PROXY) +@Produces({"application/xml"}) +@Consumes({"application/xml"}) +public interface GroupProxy extends CollectionSpacePoxProxy { + // List + @GET + ClientResponse readList(); + + @Override + @GET + @Produces({"application/xml"}) + ClientResponse readIncludeDeleted( + @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted); + + @Override + @GET + @Produces({"application/xml"}) + ClientResponse keywordSearchIncludeDeleted( + @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords, + @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted); +} diff --git a/services/group/client/src/test/java/org/collectionspace/services/client/test/GroupServiceTest.java b/services/group/client/src/test/java/org/collectionspace/services/client/test/GroupServiceTest.java new file mode 100644 index 000000000..97b1abdaf --- /dev/null +++ b/services/group/client/src/test/java/org/collectionspace/services/client/test/GroupServiceTest.java @@ -0,0 +1,279 @@ +/** + * This document is a part of the source code and related artifacts + * for CollectionSpace, an open source collections management system + * for museums and related institutions: + * + * http://www.collectionspace.org + * http://wiki.collectionspace.org + * + * Copyright © 2009 Regents of the University of California + * + * Licensed under the Educational Community License (ECL), Version 2.0. + * You may not use this file except in compliance with this License. + * + * You may obtain a copy of the ECL 2.0 License at + * https://source.collectionspace.org/collection-space/LICENSE.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.collectionspace.services.client.test; + +import java.util.List; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import org.collectionspace.services.client.CollectionSpaceClient; +import org.collectionspace.services.client.GroupClient; +import org.collectionspace.services.client.GroupProxy; +import org.collectionspace.services.client.PayloadOutputPart; +import org.collectionspace.services.client.PoxPayloadIn; +import org.collectionspace.services.client.PoxPayloadOut; +import org.collectionspace.services.jaxb.AbstractCommonList; +import org.collectionspace.services.group.GroupsCommon; + +import org.jboss.resteasy.client.ClientResponse; + +import org.testng.Assert; +import org.testng.annotations.Test; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * GroupServiceTest, carries out tests against a deployed and running Group Service.

+ * $LastChangedRevision: $ + * $LastChangedDate: $ + */ +public class GroupServiceTest extends AbstractServiceTestImpl { + + private final String CLASS_NAME = GroupServiceTest.class.getName(); + private final Logger logger = LoggerFactory.getLogger(CLASS_NAME); + final String SERVICE_PATH_COMPONENT = "groups"; + private String knownResourceId = null; + + @Override + public String getServicePathComponent() { + return GroupClient.SERVICE_PATH_COMPONENT; + } + + @Override + protected String getServiceName() { + return GroupClient.SERVICE_NAME; + } + + @Override + protected CollectionSpaceClient getClientInstance() { + return new GroupClient(); + } + + @Override + protected AbstractCommonList getAbstractCommonList(ClientResponse response) { + return response.getEntity(AbstractCommonList.class); + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class) + public void create(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupCreate(); + GroupClient client = new GroupClient(); + PoxPayloadOut multipart = createGroupInstance(createIdentifier()); + ClientResponse res = client.create(multipart); + assertStatusCode(res, testName); + if (knownResourceId == null) { + knownResourceId = extractId(res); // Store the ID returned from the first resource created for additional tests below. + logger.debug(testName + ": knownResourceId=" + knownResourceId); + } + allResourceIdsCreated.add(extractId(res)); // Store the IDs from every resource created by tests so they can be deleted after tests have been run. + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) + public void createList(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + for (int i = 0; i < 3; i++) { + create(testName); + } + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create"}) + public void read(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupRead(); + GroupClient client = new GroupClient(); + ClientResponse res = client.read(knownResourceId); + assertStatusCode(res, testName); + PoxPayloadIn input = new PoxPayloadIn(res.getEntity()); + GroupsCommon group = (GroupsCommon) extractPart(input, client.getCommonPartName(), GroupsCommon.class); + Assert.assertNotNull(group); + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"createList", "read"}) + public void readList(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupReadList(); + GroupClient client = new GroupClient(); + ClientResponse res = client.readList(); + AbstractCommonList list = res.getEntity(); + assertStatusCode(res, testName); + if (logger.isDebugEnabled()) { + List items = + list.getListItem(); + int i = 0; + for(AbstractCommonList.ListItem item : items){ + logger.debug(testName + ": list-item[" + i + "] " + + item.toString()); + i++; + } + } + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) + public void update(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupUpdate(); + GroupClient client = new GroupClient(); + ClientResponse res = client.read(knownResourceId); + assertStatusCode(res, testName); + logger.debug("got object to update with ID: " + knownResourceId); + PoxPayloadIn input = new PoxPayloadIn(res.getEntity()); + GroupsCommon group = (GroupsCommon) extractPart(input, client.getCommonPartName(), GroupsCommon.class); + Assert.assertNotNull(group); + + group.setTitle("updated-" + group.getTitle()); + logger.debug("Object to be updated:"+objectAsXmlString(group, GroupsCommon.class)); + PoxPayloadOut output = new PoxPayloadOut(GroupClient.SERVICE_PAYLOAD_NAME); + PayloadOutputPart commonPart = output.addPart(group, MediaType.APPLICATION_XML_TYPE); + commonPart.setLabel(client.getCommonPartName()); + res = client.update(knownResourceId, output); + assertStatusCode(res, testName); + input = new PoxPayloadIn(res.getEntity()); + GroupsCommon updatedGroup = (GroupsCommon) extractPart(input, client.getCommonPartName(), GroupsCommon.class); + Assert.assertNotNull(updatedGroup); + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"update", "testSubmitRequest"}) + public void updateNonExistent(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupUpdateNonExistent(); + // Submit the request to the service and store the response. + // Note: The ID used in this 'create' call may be arbitrary. + // The only relevant ID may be the one used in update(), below. + GroupClient client = new GroupClient(); + PoxPayloadOut multipart = createGroupInstance(NON_EXISTENT_ID); + ClientResponse res = client.update(NON_EXISTENT_ID, multipart); + assertStatusCode(res, testName); + } + + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"}) + public void delete(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupDelete(); + GroupClient client = new GroupClient(); + ClientResponse res = client.delete(knownResourceId); + assertStatusCode(res, testName); + } + + // --------------------------------------------------------------- + // Failure outcome tests : means we expect response to fail, but test to succeed + // --------------------------------------------------------------- + + // Failure outcome + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"read"}) + public void readNonExistent(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupReadNonExistent(); + GroupClient client = new GroupClient(); + ClientResponse res = client.read(NON_EXISTENT_ID); + assertStatusCode(res, testName); + } + + // Failure outcome + @Override + @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {"delete"}) + public void deleteNonExistent(String testName) throws Exception { + logger.debug(testBanner(testName, CLASS_NAME)); + setupDeleteNonExistent(); + GroupClient client = new GroupClient(); + ClientResponse res = client.delete(NON_EXISTENT_ID); + assertStatusCode(res, testName); + } + + // Failure outcomes + // Placeholders until the tests below can be implemented. See Issue CSPACE-401. + + @Override + public void createWithEmptyEntityBody(String testName) throws Exception { + } + + @Override + public void createWithMalformedXml(String testName) throws Exception { + } + + @Override + public void createWithWrongXmlSchema(String testName) throws Exception { + } + + @Override + public void updateWithEmptyEntityBody(String testName) throws Exception { + } + + @Override + public void updateWithMalformedXml(String testName) throws Exception { + } + + @Override + public void updateWithWrongXmlSchema(String testName) throws Exception { + } + + // --------------------------------------------------------------- + // Utility tests : tests of code used in tests above + // --------------------------------------------------------------- + + @Test(dependsOnMethods = {"create", "read"}) + public void testSubmitRequest() { + final int EXPECTED_STATUS = Response.Status.OK.getStatusCode(); // Expected status code: 200 OK + String method = ServiceRequestType.READ.httpMethodName(); + String url = getResourceURL(knownResourceId); + int statusCode = submitRequest(method, url); + logger.debug("testSubmitRequest: url=" + url + " status=" + statusCode); + Assert.assertEquals(statusCode, EXPECTED_STATUS); + } + + // --------------------------------------------------------------- + // Utility methods used by tests above + // --------------------------------------------------------------- + + @Override + protected PoxPayloadOut createInstance(String identifier) { + GroupClient client = new GroupClient(); + return createGroupInstance(identifier); + } + + private PoxPayloadOut createGroupInstance(String uid) { + String identifier = "title-" + uid; + GroupsCommon group = new GroupsCommon(); + group.setTitle(identifier); + group.setResponsibleDepartment("antiquities"); + PoxPayloadOut multipart = new PoxPayloadOut(GroupClient.SERVICE_PAYLOAD_NAME); + PayloadOutputPart commonPart = multipart.addPart(group, MediaType.APPLICATION_XML_TYPE); + commonPart.setLabel(new GroupClient().getCommonPartName()); + + if (logger.isDebugEnabled()) { + logger.debug("to be created, group common"); + logger.debug(objectAsXmlString(group, GroupsCommon.class)); + } + + return multipart; + } +} diff --git a/services/group/client/src/test/resources/log4j.properties b/services/group/client/src/test/resources/log4j.properties new file mode 100644 index 000000000..18c510350 --- /dev/null +++ b/services/group/client/src/test/resources/log4j.properties @@ -0,0 +1,23 @@ +log4j.rootLogger=debug, stdout, R + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout + +# Pattern to output the caller's file name and line number. +log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=target/test-client.log + +log4j.appender.R.MaxFileSize=100KB +# Keep one backup file +log4j.appender.R.MaxBackupIndex=1 + +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n + +#packages +log4j.logger.org.collectionspace=DEBUG +log4j.logger.org.apache=INFO +log4j.logger.httpclient=INFO +log4j.logger.org.jboss.resteasy=INFO diff --git a/services/group/jaxb/.classpath b/services/group/jaxb/.classpath new file mode 100644 index 000000000..bd6bf38eb --- /dev/null +++ b/services/group/jaxb/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/services/group/jaxb/.project b/services/group/jaxb/.project new file mode 100644 index 000000000..11524f3bf --- /dev/null +++ b/services/group/jaxb/.project @@ -0,0 +1,19 @@ + + org.collectionspace.services.group.jaxb + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + org.collectionspace.services.jaxb + + + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/services/group/jaxb/.settings/org.maven.ide.eclipse.prefs b/services/group/jaxb/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..c9f07df5d --- /dev/null +++ b/services/group/jaxb/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Wed Jan 19 22:49:45 PST 2011 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml new file mode 100644 index 000000000..6bf713b24 --- /dev/null +++ b/services/group/jaxb/pom.xml @@ -0,0 +1,47 @@ + + + + org.collectionspace.services.group + org.collectionspace.services + 1.7-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.group.jaxb + services.group.jaxb + + + + com.sun.xml.bind + jaxb-impl + + + org.jvnet.jaxb2-commons + property-listener-injector + + + org.jvnet.jaxb2_commons + runtime + + + org.collectionspace.services + org.collectionspace.services.jaxb + ${project.version} + + + + + collectionspace-services-group-jaxb + install + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + + + + + diff --git a/services/group/jaxb/src/main/java/org/collectionspace/services/GroupJAXBSchema.java b/services/group/jaxb/src/main/java/org/collectionspace/services/GroupJAXBSchema.java new file mode 100644 index 000000000..e2e86fc6d --- /dev/null +++ b/services/group/jaxb/src/main/java/org/collectionspace/services/GroupJAXBSchema.java @@ -0,0 +1,10 @@ +/** + * + */ +package org.collectionspace.services; + +public interface GroupJAXBSchema { + final static String GROUP_TITLE = "title"; + final static String GROUP_SCOPE_NOTE = "scopeNote"; + final static String GROUP_RESPONSIBLE_DEPARTMENT = "responsibleDepartment"; +} diff --git a/services/group/jaxb/src/main/java/org/collectionspace/services/GroupListItemJAXBSchema.java b/services/group/jaxb/src/main/java/org/collectionspace/services/GroupListItemJAXBSchema.java new file mode 100644 index 000000000..22f35ecc3 --- /dev/null +++ b/services/group/jaxb/src/main/java/org/collectionspace/services/GroupListItemJAXBSchema.java @@ -0,0 +1,6 @@ +package org.collectionspace.services; + +public interface GroupListItemJAXBSchema { + final static String CSID = "csid"; + final static String URI = "url"; +} diff --git a/services/group/jaxb/src/main/resources/groups_common.xsd b/services/group/jaxb/src/main/resources/groups_common.xsd new file mode 100644 index 000000000..cd793092b --- /dev/null +++ b/services/group/jaxb/src/main/resources/groups_common.xsd @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/group/pom.xml b/services/group/pom.xml new file mode 100644 index 000000000..1791592f7 --- /dev/null +++ b/services/group/pom.xml @@ -0,0 +1,24 @@ + + + + + org.collectionspace.services + org.collectionspace.services.main + 1.7-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.group + services.group + pom + + + jaxb + service + 3rdparty + client + + + + diff --git a/services/group/service/.classpath b/services/group/service/.classpath new file mode 100644 index 000000000..425cd1620 --- /dev/null +++ b/services/group/service/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/services/group/service/.project b/services/group/service/.project new file mode 100644 index 000000000..7d7a7c21b --- /dev/null +++ b/services/group/service/.project @@ -0,0 +1,31 @@ + + org.collectionspace.services.group.service + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + org.collectionspace.services.3rdparty.nuxeo.quote-api + org.collectionspace.services.client + org.collectionspace.services.collectionobject.jaxb + org.collectionspace.services.common + org.collectionspace.services.common-api + org.collectionspace.services.contact.client + org.collectionspace.services.contact.jaxb + org.collectionspace.services.hyperjaxb + org.collectionspace.services.jaxb + org.collectionspace.services.group.client + org.collectionspace.services.group.jaxb + org.collectionspace.services.person.client + org.collectionspace.services.person.jaxb + + + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/services/group/service/.settings/org.maven.ide.eclipse.prefs b/services/group/service/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..e2ce08c02 --- /dev/null +++ b/services/group/service/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Fri Aug 27 16:35:21 PDT 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/services/group/service/pom.xml b/services/group/service/pom.xml new file mode 100644 index 000000000..acbcc69dc --- /dev/null +++ b/services/group/service/pom.xml @@ -0,0 +1,122 @@ + + + + + org.collectionspace.services + org.collectionspace.services.group + 1.7-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.group.service + services.group.service + jar + + + + org.collectionspace.services + org.collectionspace.services.common + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.group.client + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.group.jaxb + ${project.version} + + + org.collectionspace.services + org.collectionspace.services.collectionobject.jaxb + ${project.version} + + + + junit + junit + 4.1 + test + + + org.testng + testng + 5.6 + + + + + + javax.security + jaas + 1.0.01 + provided + + + + dom4j + dom4j + 1.6.1 + provided + + + + + + org.jboss.resteasy + resteasy-jaxrs + + + tjws + webserver + + + + + org.jboss.resteasy + resteasy-jaxb-provider + + + org.jboss.resteasy + resteasy-multipart-provider + + + + + + org.nuxeo.ecm.core + nuxeo-core-api + ${nuxeo.core.version} + + + jboss-remoting + jboss + + + + + + org.restlet + org.restlet + 1.0.7 + + + com.noelios.restlet + com.noelios.restlet.ext.httpclient + 1.0.7 + + + com.noelios.restlet + com.noelios.restlet + 1.0.7 + + + + + collectionspace-services-group + + + diff --git a/services/group/service/profiles.xml b/services/group/service/profiles.xml new file mode 100644 index 000000000..347b9df22 --- /dev/null +++ b/services/group/service/profiles.xml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/services/group/service/src/main/java/org/collectionspace/services/group/GroupResource.java b/services/group/service/src/main/java/org/collectionspace/services/group/GroupResource.java new file mode 100644 index 000000000..3f856be97 --- /dev/null +++ b/services/group/service/src/main/java/org/collectionspace/services/group/GroupResource.java @@ -0,0 +1,59 @@ +/** + * This document is a part of the source code and related artifacts + * for CollectionSpace, an open source collections management system + * for museums and related institutions: + + * http://www.collectionspace.org + * http://wiki.collectionspace.org + + * Copyright 2009 University of California at Berkeley + + * Licensed under the Educational Community License (ECL), Version 2.0. + * You may not use this file except in compliance with this License. + + * You may obtain a copy of the ECL 2.0 License at + + * https://source.collectionspace.org/collection-space/LICENSE.txt + + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.collectionspace.services.group; + +import org.collectionspace.services.client.GroupClient; +import org.collectionspace.services.common.ResourceBase; + +import javax.ws.rs.Consumes; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; + +@Path(GroupClient.SERVICE_PATH) +@Produces({"application/xml"}) +@Consumes({"application/xml"}) +public class GroupResource extends ResourceBase { + + @Override + public String getServiceName(){ + return GroupClient.SERVICE_NAME; + } + + @Override + protected String getVersionString() { + final String lastChangeRevision = "$LastChangedRevision: 2108 $"; + return lastChangeRevision; + } + + @Override + //public Class getCommonPartClass() { + public Class getCommonPartClass() { + try { + return Class.forName("org.collectionspace.services.group.GroupsCommon");//.class; + } catch (ClassNotFoundException e){ + return null; + } + } + +} diff --git a/services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupDocumentModelHandler.java b/services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupDocumentModelHandler.java new file mode 100644 index 000000000..e39abbb7a --- /dev/null +++ b/services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupDocumentModelHandler.java @@ -0,0 +1,32 @@ +/** + * This document is a part of the source code and related artifacts + * for CollectionSpace, an open source collections management system + * for museums and related institutions: + + * http://www.collectionspace.org + * http://wiki.collectionspace.org + + * Copyright 2009 University of California at Berkeley + + * Licensed under the Educational Community License (ECL), Version 2.0. + * You may not use this file except in compliance with this License. + + * You may obtain a copy of the ECL 2.0 License at + + * https://source.collectionspace.org/collection-space/LICENSE.txt + + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.collectionspace.services.group.nuxeo; + +import org.collectionspace.services.nuxeo.client.java.DocHandlerBase; +import org.collectionspace.services.group.GroupsCommon; + +public class GroupDocumentModelHandler + extends DocHandlerBase { +} + diff --git a/services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupValidatorHandler.java b/services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupValidatorHandler.java new file mode 100644 index 000000000..dc2964c2c --- /dev/null +++ b/services/group/service/src/main/java/org/collectionspace/services/group/nuxeo/GroupValidatorHandler.java @@ -0,0 +1,18 @@ +package org.collectionspace.services.group.nuxeo; + +import org.collectionspace.services.common.context.ServiceContext; +import org.collectionspace.services.common.document.InvalidDocumentException; +import org.collectionspace.services.common.document.ValidatorHandler; +import org.collectionspace.services.common.document.DocumentHandler.Action; + +public class GroupValidatorHandler implements ValidatorHandler { + + @Override + public void validate(Action action, ServiceContext ctx) + throws InvalidDocumentException { + // TODO Auto-generated method stub + System.out.println("GroupValidatorHandler executed."); + + } + +} diff --git a/services/group/service/src/test/java/org/collectionspace/services/test/GroupServiceTest.java b/services/group/service/src/test/java/org/collectionspace/services/test/GroupServiceTest.java new file mode 100644 index 000000000..6d1531909 --- /dev/null +++ b/services/group/service/src/test/java/org/collectionspace/services/test/GroupServiceTest.java @@ -0,0 +1,13 @@ +package org.collectionspace.services.test; + +//import org.collectionspace.services.group.Group; +//import org.collectionspace.services.group.GroupList; + +/** + * Placeholder for server-side testing of Loan Out service code. + * + * @version $Revision: 2108 $ + */ +public class GroupServiceTest { + //empty +} diff --git a/services/group/service/src/test/resources/log4j.xml b/services/group/service/src/test/resources/log4j.xml new file mode 100644 index 000000000..52121cb83 --- /dev/null +++ b/services/group/service/src/test/resources/log4j.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.47.3