]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-210: Checking in a buildable set of sources for the Intake service. This...
authorRichard Millet <richard.millet@berkeley.edu>
Tue, 30 Jun 2009 02:42:22 +0000 (02:42 +0000)
committerRichard Millet <richard.millet@berkeley.edu>
Tue, 30 Jun 2009 02:42:22 +0000 (02:42 +0000)
51 files changed:
services/intake/.classpath [new file with mode: 0644]
services/intake/.project [new file with mode: 0644]
services/intake/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/intake/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/intake/3rdparty/.classpath [new file with mode: 0644]
services/intake/3rdparty/.project [new file with mode: 0644]
services/intake/3rdparty/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/intake/3rdparty/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/.classpath [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/.project [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/META-INF/MANIFEST.MF [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/deployment-fragment.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intake.xsd [new file with mode: 0644]
services/intake/3rdparty/pom.xml [new file with mode: 0644]
services/intake/client/.classpath [new file with mode: 0644]
services/intake/client/.project [new file with mode: 0644]
services/intake/client/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/intake/client/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/intake/client/pom.xml [new file with mode: 0644]
services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java [new file with mode: 0644]
services/intake/client/src/main/java/org/collectionspace/services/client/IntakeProxy.java [new file with mode: 0644]
services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java [new file with mode: 0644]
services/intake/client/src/test/resources/log4j.xml [new file with mode: 0644]
services/intake/client/temp-testng-customsuite.xml [new file with mode: 0644]
services/intake/jaxb/.classpath [new file with mode: 0644]
services/intake/jaxb/.project [new file with mode: 0644]
services/intake/jaxb/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/intake/jaxb/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/intake/jaxb/pom.xml [new file with mode: 0644]
services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeJAXBSchema.java [new file with mode: 0644]
services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java [new file with mode: 0644]
services/intake/jaxb/src/main/resources/intake.xsd [new file with mode: 0644]
services/intake/pom.xml [new file with mode: 0644]
services/intake/service/.classpath [new file with mode: 0644]
services/intake/service/.project [new file with mode: 0644]
services/intake/service/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
services/intake/service/.settings/org.maven.ide.eclipse.prefs [new file with mode: 0644]
services/intake/service/pom.xml [new file with mode: 0644]
services/intake/service/src/main/java/org/collectionspace/services/IntakeResource.java [new file with mode: 0644]
services/intake/service/src/main/java/org/collectionspace/services/IntakeService.java [new file with mode: 0644]
services/intake/service/src/main/java/org/collectionspace/services/IntakeServiceNuxeoImpl.java [new file with mode: 0644]
services/intake/service/src/test/java/org/collectionspace/services/test/IntakeServiceTest.java [new file with mode: 0644]
services/intake/service/src/test/resources/log4j.xml [new file with mode: 0644]

diff --git a/services/intake/.classpath b/services/intake/.classpath
new file mode 100644 (file)
index 0000000..cad20f7
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/services/intake/.project b/services/intake/.project
new file mode 100644 (file)
index 0000000..7b134fd
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>collectionobject-service</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.maven.ide.eclipse.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+       </natures>\r
+</projectDescription>\r
diff --git a/services/intake/.settings/org.eclipse.jdt.core.prefs b/services/intake/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..dac55b0
--- /dev/null
@@ -0,0 +1,5 @@
+#Thu Apr 30 16:21:29 PDT 2009\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
+org.eclipse.jdt.core.compiler.source=1.5\r
diff --git a/services/intake/.settings/org.maven.ide.eclipse.prefs b/services/intake/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..aa95f8a
--- /dev/null
@@ -0,0 +1,8 @@
+#Thu Apr 30 16:20:57 PDT 2009\r
+activeProfiles=\r
+eclipse.preferences.version=1\r
+fullBuildGoals=process-test-resources\r
+includeModules=false\r
+resolveWorkspaceProjects=true\r
+resourceFilterGoals=process-resources resources\:testResources\r
+version=1\r
diff --git a/services/intake/3rdparty/.classpath b/services/intake/3rdparty/.classpath
new file mode 100644 (file)
index 0000000..cad20f7
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/services/intake/3rdparty/.project b/services/intake/3rdparty/.project
new file mode 100644 (file)
index 0000000..5fe78e8
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.collectionspace.services.intake.3rdparty</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.maven.ide.eclipse.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+       </natures>\r
+</projectDescription>\r
diff --git a/services/intake/3rdparty/.settings/org.eclipse.jdt.core.prefs b/services/intake/3rdparty/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..b81e78b
--- /dev/null
@@ -0,0 +1,5 @@
+#Mon Jun 29 14:28:26 PDT 2009\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
+org.eclipse.jdt.core.compiler.source=1.5\r
diff --git a/services/intake/3rdparty/.settings/org.maven.ide.eclipse.prefs b/services/intake/3rdparty/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..0f12a7e
--- /dev/null
@@ -0,0 +1,8 @@
+#Mon Jun 29 14:27:15 PDT 2009\r
+activeProfiles=\r
+eclipse.preferences.version=1\r
+fullBuildGoals=process-test-resources\r
+includeModules=false\r
+resolveWorkspaceProjects=true\r
+resourceFilterGoals=process-resources resources\:testResources\r
+version=1\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/.classpath b/services/intake/3rdparty/nuxeo-platform-cs-intake/.classpath
new file mode 100644 (file)
index 0000000..68e178d
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/.project b/services/intake/3rdparty/nuxeo-platform-cs-intake/.project
new file mode 100644 (file)
index 0000000..8388db4
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>nuxeo-platform-collectionspace</name>\r
+       <comment>Nuxeo Enterprise Platform: CS extensions</comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.maven.ide.eclipse.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.eclipse.jdt.core.prefs b/services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..3a8859d
--- /dev/null
@@ -0,0 +1,5 @@
+#Wed Apr 08 13:25:44 PDT 2009\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.source=1.5\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.maven.ide.eclipse.prefs b/services/intake/3rdparty/nuxeo-platform-cs-intake/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..f18b0e3
--- /dev/null
@@ -0,0 +1,8 @@
+#Wed Apr 08 13:24:46 PDT 2009\r
+activeProfiles=\r
+eclipse.preferences.version=1\r
+fullBuildGoals=process-test-resources\r
+includeModules=false\r
+resolveWorkspaceProjects=true\r
+resourceFilterGoals=process-resources resources\:testResources\r
+version=1\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties
new file mode 100644 (file)
index 0000000..c26799a
--- /dev/null
@@ -0,0 +1,15 @@
+# Example for Windows
+jboss.dir=c:/dev/jboss-4.2.3.GA
+# Example for Unix
+#jboss.dir=/opt/jboss
+
+# Which JBoss server config to use
+jboss.config=default
+
+# nuxeo deployment
+jboss.nuxeo.ear.dir=${jboss.dir}/server/${jboss.config}/deploy/nuxeo.ear
+
+
+# additional command line parameters for mvn commands
+# e.g. to work offline:
+#mvn.opts=-o
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
new file mode 100644 (file)
index 0000000..d4e3b26
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<project name="nuxeo cs" default="all" basedir=".">
+
+  <property file="build.properties" />
+  <property name="cs.nuxeo.jar" value="nuxeo-platform-collectionspace-5.2-SNAPSHOT.jar"/>
+
+  <target name="all" description="all">
+    <delete file="${jboss.nuxeo.ear.dir}/system/${cs.nuxeo.jar}"/>
+    <copy todir="${jboss.nuxeo.ear.dir}/system">
+      <fileset file="${basedir}/target/${cs.nuxeo.jar}" />
+    </copy>
+  </target>
+
+</project>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
new file mode 100644 (file)
index 0000000..39dcdf8
--- /dev/null
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.nuxeo.ecm.platform</groupId>
+    <artifactId>nuxeo-platform-parent</artifactId>
+    <version>5.2-SNAPSHOT</version>
+  </parent>
+
+    <artifactId>nuxeo-platform-cs-intake</artifactId>
+    <packaging>jar</packaging>
+    <name>nuxeo-platform-cs-intake</name>
+    <description>
+    Intake Nuxeo Document Type
+    </description>
+    <properties>
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.nuxeo.ecm.core</groupId>
+            <artifactId>nuxeo-core-schema</artifactId>
+            <version>${nuxeo.version.1.5}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.nuxeo.ecm.platform</groupId>
+            <artifactId>nuxeo-platform-types-core</artifactId>
+            <version>${nuxeo.version.5.2}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/META-INF/MANIFEST.MF b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..653a891
--- /dev/null
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0 \r
+Bundle-ManifestVersion: 1 \r
+Bundle-Name: NuxeoCS\r
+Bundle-SymbolicName: org.collectionspace.intake;singleton:=true \r
+Bundle-Version: 1.0.0\r
+Bundle-Localization: plugin\r
+Bundle-Vendor: Nuxeo \r
+Require-Bundle: org.nuxeo.runtime, \r
+ org.nuxeo.ecm.core.api, \r
+ org.nuxeo.ecm.core,\r
+ org.nuxeo.ecm.core.api,\r
+ org.nuxeo.ecm.platform.types.api,\r
+ org.nuxeo.ecm.platform.versioning.api,\r
+ org.nuxeo.ecm.platform.ui,\r
+ org.nuxeo.ecm.platform.forms.layout.client,\r
+ org.nuxeo.ecm.platform.publishing.api,\r
+ org.nuxeo.ecm.platform.ws \r
+Provide-Package: org.collectionspace.intake\r
+Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
+ OSGI-INF/ecm-types-contrib.xml,\r
+ OSGI-INF/layouts-contrib.xml\r
+\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml
new file mode 100644 (file)
index 0000000..6cb388f
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.intake.coreTypes">
+  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
+    <schema name="intake" prefix="intake" src="schemas/intake.xsd"/>
+  </extension>
+  <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
+    <doctype name="Intake" extends="Document">
+      <schema name="common"/>
+      <schema name="intake"/>
+    </doctype>
+  </extension>
+</component>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/deployment-fragment.xml
new file mode 100644 (file)
index 0000000..88b94ff
--- /dev/null
@@ -0,0 +1,408 @@
+<?xml version="1.0"?>
+<fragment>
+
+  <extension target="application#MODULE">
+    <module>
+      <ejb>${bundle.fileName}</ejb>
+    </module>
+
+    <module>
+      <web>
+        <web-uri>nuxeo.war</web-uri>
+        <context-root>/nuxeo</context-root>
+      </web>
+    </module>
+  </extension>
+
+  <!-- uncomment that to enable tomcat based auth
+    <extension target="web#LOGIN-CONFIG">
+    <login-config>
+    <auth-method>FORM</auth-method>
+    <realm-name>nuxeo.ecm</realm-name>
+    <form-login-config>
+    <form-login-page>/login.jsp</form-login-page>
+    <form-error-page>/login.jsp?loginFailed=true</form-error-page>
+    </form-login-config>
+    </login-config>
+    </extension>
+  -->
+
+  <extension target="web#FILTER-MAPPING">
+
+    <!-- Seam Context Filter is declared in org.nuxeo.ecm.platform.ui.web
+      deployment fragment -->
+
+    <filter-mapping>
+      <filter-name>Seam Context Filter</filter-name>
+      <url-pattern>/ws/FileManageWS</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+      <filter-name>Seam Context Filter</filter-name>
+      <url-pattern>/DocumentManagerWS</url-pattern>
+    </filter-mapping>
+  </extension>
+
+  <extension target="web#SERVLET">
+  </extension>
+
+  <extension target="web#SERVLET-MAPPING">
+  </extension>
+
+  <extension target="pages#PAGES">
+    <!-- This calls a method which load the Workspace logo -->
+    <page view-id="/showLogo.xhtml" action="#{logoHelper.getLogo}"/>
+
+    <!-- Bind URL to the Document URL resolver-->
+    <page view-id="/getDocument.xhtml"
+        action="#{navigationContext.navigateToURL}">
+    </page>
+
+    <page view-id="/nxliveedit.xhtml" action="#{liveEditHelper.getBootstrap()}"/>
+
+    <!-- Bind URL to the Parallele conversation Document URL resolver-->
+    <page view-id="/parallele.xhtml"
+        action="#{paralleleNavigationHelper.navigateToURL}">
+    </page>
+
+    <!-- Post login and 'home' view handler -->
+    <page view-id="/nxstartup.xhtml"
+        action="#{startupHelper.initDomainAndFindStartupPage('Default domain', 'view')}"/>
+
+    <!-- To redirect to the user dashboard instead, use instead:
+
+      <page view-id="/nxstartup.xhtml"
+      action="#{startupHelper.initDomainAndFindStartupPage('Default domain', 'user_dashboard')}" />
+    -->
+
+    <!--  config for workspace management
+      = give a description for each viewId
+    -->
+
+    <page view-id="/view_domains.xhtml">
+      #{currentServerLocation.name}/#{currentTabAction.label}
+    </page>
+
+    <page view-id="/select_document_type.faces.xhtml">
+      Create new document in #{currentDocument.name}
+    </page>
+
+    <page view-id="/create_document.faces.xhtml">
+      Create new document in #{currentDocument.name}
+    </page>
+
+    <page view-id="/user_dashboard.xhtml">
+      breadcrumb=command.user_dashboard
+    </page>
+
+    <page view-id="/view_users.xhtml">
+      breadcrumb=command.manageMembers
+    </page>
+
+    <page view-id="/view_many_users.xhtml">
+      breadcrumb=command.manageMembers
+    </page>
+
+    <page view-id="/view_vocabularies.xhtml">
+      breadcrumb=title.vocabularies
+    </page>
+
+    <page view-id="/search/search_form.xhtml">
+      breadcrumb=command.advancedSearch
+    </page>
+  </extension>
+
+  <extension target="faces-config#APPLICATION">
+    <locale-config>
+      <default-locale>en</default-locale>
+      <supported-locale>en_GB</supported-locale>
+      <supported-locale>en_US</supported-locale>
+      <supported-locale>fr</supported-locale>
+      <supported-locale>de</supported-locale>
+      <supported-locale>es</supported-locale>
+      <supported-locale>it</supported-locale>
+      <supported-locale>ar</supported-locale>
+      <supported-locale>ru</supported-locale>
+      <supported-locale>ja</supported-locale>
+      <supported-locale>vn</supported-locale>
+    </locale-config>
+
+    <message-bundle>messages</message-bundle>
+  </extension>
+
+  <extension target="components#PAGEFLOW">
+    <value>config/addWorkspace.jpdl.xml</value>
+  </extension>
+
+  <extension target="faces-config#NAVIGATION">
+    <!-- generic pages -->
+    <navigation-case>
+      <from-outcome>generic_error_page</from-outcome>
+      <to-view-id>/generic_error_page.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>generic_message_page</from-outcome>
+      <to-view-id>/generic_message_page.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>home</from-outcome>
+      <to-view-id>/nxstartup.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>user_login</from-outcome>
+      <to-view-id>/login.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>user_logout</from-outcome>
+      <to-view-id>/logout.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_servers</from-outcome>
+      <to-view-id>/view_servers.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- pages for document actions -->
+
+    <navigation-case>
+      <from-outcome>view_domains</from-outcome>
+      <to-view-id>/view_domains.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>select_document_type</from-outcome>
+      <to-view-id>/select_document_type.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>create_document</from-outcome>
+      <to-view-id>/create_document.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>edit_document</from-outcome>
+      <to-view-id>/edit_document.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_documents</from-outcome>
+      <to-view-id>/view_documents.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>create_file</from-outcome>
+      <to-view-id>/create_file.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>create_workspace_wizard</from-outcome>
+      <to-view-id>/createWorkspaceWizard.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>send_email</from-outcome>
+      <to-view-id>/document_email.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- AT: BBB, use view_documents instead -->
+    <navigation-case>
+      <from-outcome>view_workspaces</from-outcome>
+      <to-view-id>/view_workspaces.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- AT: BBB, use create_document instead -->
+    <navigation-case>
+      <from-outcome>create_domain</from-outcome>
+      <to-view-id>/create_domain.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- AT: BBB, use edit_document instead -->
+    <navigation-case>
+      <from-outcome>edit_domain</from-outcome>
+      <to-view-id>/edit_domain.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- AT: BBB, use create_document instead -->
+    <navigation-case>
+      <from-outcome>create_workspace</from-outcome>
+      <to-view-id>/create_workspace.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- AT: BBB, use edit_document instead -->
+    <navigation-case>
+      <from-outcome>edit_workspace</from-outcome>
+      <to-view-id>/edit_workspace.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- users ang groups -->
+
+    <navigation-case>
+      <from-outcome>members_management</from-outcome>
+      <to-view-id>/members_management.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_users</from-outcome>
+      <to-view-id>/view_users.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_many_users</from-outcome>
+      <to-view-id>/view_many_users.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>edit_user</from-outcome>
+      <to-view-id>/edit_user.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>edit_user_password</from-outcome>
+      <to-view-id>/edit_user_password.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_user</from-outcome>
+      <to-view-id>/view_user.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>create_user</from-outcome>
+      <to-view-id>/create_user.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_groups</from-outcome>
+      <to-view-id>/view_groups.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_group</from-outcome>
+      <to-view-id>/view_group.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>edit_group</from-outcome>
+      <to-view-id>/edit_group.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>create_group</from-outcome>
+      <to-view-id>/create_group.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_vocabularies</from-outcome>
+      <to-view-id>/view_vocabularies.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>view_vocabulary</from-outcome>
+      <to-view-id>/view_vocabulary.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- search -->
+
+    <navigation-case>
+      <from-outcome>search_form</from-outcome>
+      <to-view-id>/search/search_form.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>search_results_nxql</from-outcome>
+      <to-view-id>/search/search_results_nxql.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>search_results_advanced</from-outcome>
+      <to-view-id>
+        /search/search_results_advanced.xhtml
+      </to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>search_results_simple</from-outcome>
+      <to-view-id>/search/search_results_simple.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <!-- miscellaneaous -->
+
+    <navigation-case>
+      <from-outcome>clipboard</from-outcome>
+      <to-view-id>/incl/clipboard.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>user_dashboard</from-outcome>
+      <to-view-id>/user_dashboard.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>select_workspace_template</from-outcome>
+      <to-view-id>/select_workspace_template.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>pdf_generation_error</from-outcome>
+      <to-view-id>/pdf_generation_error.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>mass_edit</from-outcome>
+      <to-view-id>/massedit_documents.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
+      <from-outcome>mass_edit_confirm</from-outcome>
+      <to-view-id>/massedit_documents_preview.xhtml</to-view-id>
+      <redirect/>
+    </navigation-case>
+  </extension>
+
+</fragment>
+
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml
new file mode 100644 (file)
index 0000000..39d792c
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<component name="org.collectionspace.intake.ecm.types">
+  <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
+    <type id="Intake" coretype="Intake">
+      <label>org.collectionspace.intake</label>
+      <!--icon>/icons/file.gif</icon-->
+      <default-view>view_documents</default-view>
+
+      <layouts mode="any">
+        <layout>heading</layout>
+        <layout>intake</layout>
+      </layouts>        
+    </type>
+
+    <type id="Folder" coretype="Folder">
+      <subtypes>
+        <type>Intake</type>
+      </subtypes>
+    </type>
+    
+    <type id="Workspace" coretype="Workspace">
+      <subtypes>
+        <type>Intake</type>
+      </subtypes>
+    </type>
+
+  </extension>
+</component>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml
new file mode 100644 (file)
index 0000000..a651ba1
--- /dev/null
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+
+<component name="org.collectionspace.intake.layouts.webapp">
+
+  <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
+    point="layouts">
+
+    <layout name="intake">
+      <templates>
+        <template mode="any">/layouts/layout_default_template.xhtml</template>
+      </templates>
+      <rows>
+        <row><widget>currentOwner</widget></row>
+        <row><widget>depositor</widget></row>
+        <row><widget>depositorsRequirements</widget></row>
+        <row><widget>entryDate</widget></row>
+        <row><widget>entryMethod</widget></row>
+        <row><widget>entryNote</widget></row>
+        <row><widget>entryNumber</widget></row>
+        <row><widget>entryReason</widget></row>
+        <row><widget>packingNote</widget></row>
+        <row><widget>returnDate</widget></row>
+      </rows>
+
+      <widget name="currentOwner" type="text">
+        <labels>
+          <label mode="any">currentOwner</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">currentOwner</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="depositor" type="text">
+        <labels>
+          <label mode="any">depositor</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">depositor</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="depositorsRequirements" type="text">
+        <labels>
+          <label mode="any">depositorsRequirements</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">depositorsRequirements</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="entryDate" type="text">
+        <labels>
+          <label mode="any">entryDate</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">entryDate</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="entryMethod" type="text">
+        <labels>
+          <label mode="any">entryMethod</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">entryMethod</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="entryNote" type="text">
+        <labels>
+          <label mode="any">entryNote</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">entryNote</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="entryNumber" type="text">
+        <labels>
+          <label mode="any">entryNumber</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">entryNumber</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="entryReason" type="text">
+        <labels>
+          <label mode="any">entryReason</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">entryReason</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="packingNote" type="text">
+        <labels>
+          <label mode="any">packingNote</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">packingNote</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="returnDate" type="text">
+        <labels>
+          <label mode="any">returnDate</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="intake">returnDate</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+    </layout>
+  </extension>
+</component>
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intake.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intake.xsd
new file mode 100644 (file)
index 0000000..b7c7d9f
--- /dev/null
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<xs:schema \r
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+    xmlns:ns="http://collectionspace.org/intake/"\r
+    xmlns="http://collectionspace.org/intake/"\r
+    targetNamespace="http://collectionspace.org/intake/"\r
+    version="0.1">\r
+    \r
+    <!-- See http://wiki.collectionspace.org/display/collectionspace/Intake+Schema -->\r
+\r
+<!--  Object Entry Information Group -->\r
+    <xs:element name="currentOwner" type="xs:string"/>\r
+    <xs:element name="depositor" type="xs:string"/>\r
+    <xs:element name="depositorsRequirements" type="xs:string"/>\r
+    <xs:element name="entryDate" type="xs:string"/>\r
+    <xs:element name="entryMethod" type="xs:string"/>\r
+    <xs:element name="entryNote" type="xs:string"/>\r
+    <xs:element name="entryNumber" type="xs:string"/>\r
+    <xs:element name="entryReason" type="xs:string"/>\r
+    <xs:element name="packingNote" type="xs:string"/>\r
+    <xs:element name="returnDate" type="xs:string"/>\r
+    \r
+<!--  Date Information Group -->\r
+    <xs:element name="associationDate" type="xs:string"/>\r
+    <xs:element name="earliestDate" type="xs:string"/>\r
+    <xs:element name="earliestDateCertainty" type="xs:string"/>\r
+    <xs:element name="earliestDateQualifier" type="xs:string"/>\r
+    <xs:element name="latestDate" type="xs:string"/>\r
+    <xs:element name="latestDateCertainty" type="xs:string"/>\r
+    <xs:element name="latestDateQualifier" type="xs:string"/>\r
+    <xs:element name="datePeriod" type="xs:string"/>\r
+    <xs:element name="dateText" type="xs:string"/>\r
+    \r
+<!--  Object Collection Information Group -->\r
+    <xs:element name="fieldCollectionDate" type="xs:string"/>\r
+    <xs:element name="fieldCollectionEventName" type="xs:string"/>\r
+    <xs:element name="fieldCollectionEventRefNumber" type="xs:string"/>\r
+    <xs:element name="fieldCollectionMethod" type="xs:string"/>\r
+    <xs:element name="fieldCollectionNote" type="xs:string"/>\r
+    <xs:element name="fieldCollectionNumber" type="xs:string"/>\r
+    <xs:element name="fieldCollectionPlace" type="xs:string"/>\r
+    <xs:element name="fieldCollectionSource" type="xs:string"/>\r
+    <xs:element name="fieldCollector" type="xs:string"/>\r
+    <xs:element name="geologicalComplexName" type="xs:string"/>\r
+    <xs:element name="habitat" type="xs:string"/>\r
+    <xs:element name="habitatNote" type="xs:string"/>\r
+    <xs:element name="stratigraphicUnitName" type="xs:string"/>\r
+    <xs:element name="stratigraphicUnitType" type="xs:string"/>\r
+    <xs:element name="stratigraphicUnitNote" type="xs:string"/>\r
+    \r
+<!-- Valuation Information Group -->\r
+    <xs:element name="ValuationReferenceNumber" type="xs:string"/>\r
+    <xs:element name="Valuer" type="xs:string"/>\r
+    \r
+<!-- Insurance Information Group -->\r
+    <xs:element name="insuranceNote" type="xs:string"/>\r
+    <xs:element name="insurancePolicyNumber" type="xs:string"/>\r
+    <xs:element name="InsuranceReferenceNumber" type="xs:string"/>\r
+    <xs:element name="insuranceRenewalDate" type="xs:string"/>\r
+    <xs:element name="insurer" type="xs:string"/>\r
+    \r
+<!-- Object Location Information Group -->\r
+    <xs:element name="currentLocation" type="xs:string"/>\r
+    <xs:element name="currentLocationFitness" type="xs:string"/>\r
+    <xs:element name="currentLocationNote" type="xs:string"/>\r
+    <xs:element name="locationDate" type="xs:string"/>\r
+    <xs:element name="normalLocation" type="xs:string"/>\r
+    \r
+<!-- Condition Check/Technical Assessment Information Group -->\r
+    <xs:element name="conditionCheckDate" type="xs:string"/>\r
+    <xs:element name="conditionCheckMethod" type="xs:string"/>\r
+    <xs:element name="conditionCheckNote" type="xs:string"/>\r
+    <xs:element name="conditionCheckReason" type="xs:string"/>\r
+    <xs:element name="conditionCheckReferenceNumber" type="xs:string"/>\r
+    <xs:element name="conditionCheckAssesor" type="xs:string"/>\r
+    \r
+</xs:schema>\r
diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
new file mode 100644 (file)
index 0000000..1d2e1b1
--- /dev/null
@@ -0,0 +1,20 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>org.collectionspace.services.intake</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
+    <packaging>pom</packaging>
+    <name>services.intake.3rdparty</name>
+    <description>
+    3rd party build for intake service
+    </description>
+
+</project>
diff --git a/services/intake/client/.classpath b/services/intake/client/.classpath
new file mode 100644 (file)
index 0000000..96f09f1
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/services/intake/client/.project b/services/intake/client/.project
new file mode 100644 (file)
index 0000000..f44220e
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>javaee-addressbook-client</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+       </natures>
+</projectDescription>
diff --git a/services/intake/client/.settings/org.eclipse.jdt.core.prefs b/services/intake/client/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..8a8650d
--- /dev/null
@@ -0,0 +1,12 @@
+#Thu Mar 26 13:03:04 PDT 2009\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate\r
+org.eclipse.jdt.core.compiler.debug.localVariable=generate\r
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate\r
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
+org.eclipse.jdt.core.compiler.source=1.5\r
diff --git a/services/intake/client/.settings/org.maven.ide.eclipse.prefs b/services/intake/client/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..c6e4123
--- /dev/null
@@ -0,0 +1,8 @@
+#Thu Feb 26 16:30:28 PST 2009\r
+activeProfiles=\r
+eclipse.preferences.version=1\r
+fullBuildGoals=process-test-resources\r
+includeModules=false\r
+resolveWorkspaceProjects=true\r
+resourceFilterGoals=process-resources resources\:testResources\r
+version=1\r
diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
new file mode 100644 (file)
index 0000000..3a5b307
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.intake</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.intake.client</artifactId>\r
+    <version>1.0</version>\r
+    <name>services.intake.client</name>\r
+    \r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.client</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+        \r
+        <dependency>\r
+            <groupId>org.testng</groupId>\r
+            <artifactId>testng</artifactId>\r
+            <version>5.6</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-api</artifactId>\r
+            <version>1.5.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+            <version>1.5.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxrs</artifactId>\r
+            <version>1.0.2.GA</version>\r
+            <!-- filter out unwanted jars -->\r
+            <exclusions>\r
+                <exclusion>\r
+                    <groupId>tjws</groupId>\r
+                    <artifactId>webserver</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxb-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-multipart-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>commons-httpclient</groupId>\r
+            <artifactId>commons-httpclient</artifactId>\r
+            <version>3.1</version>\r
+        </dependency>\r
+    </dependencies>\r
+    \r
+    <build>\r
+        <finalName>collectionspace-services-intake-client</finalName>\r
+        <plugins>\r
+            <plugin>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <version>2.0.2</version>\r
+                <configuration>\r
+                    <source>1.5</source>\r
+                    <target>1.5</target>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+</project>\r
diff --git a/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java b/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java
new file mode 100644 (file)
index 0000000..cdc28e9
--- /dev/null
@@ -0,0 +1,94 @@
+package org.collectionspace.services.client;
+
+import javax.ws.rs.core.Response;
+
+import org.collectionspace.services.intake.Intake;
+import org.collectionspace.services.intake.IntakeList;
+
+import org.jboss.resteasy.client.ProxyFactory;
+import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
+import org.jboss.resteasy.client.ClientResponse;
+import org.jboss.resteasy.spi.ResteasyProviderFactory;
+
+/**
+ * A IntakeClient.
+
+ * @version $Revision:$
+ */
+public class IntakeClient extends CollectionSpaceClient {
+
+
+    /**
+     *
+     */
+    private static final IntakeClient instance = new IntakeClient();
+    /**
+     *
+     */
+    private IntakeProxy intakeProxy;
+
+    /**
+     *
+     * Default constructor for IntakeClient class.
+     *
+     */
+    private IntakeClient() {
+        ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
+        RegisterBuiltin.register(factory);
+        intakeProxy = ProxyFactory.create(IntakeProxy.class, getBaseURL());
+    }
+
+    /**
+     * FIXME Comment this
+     *
+     * @return
+     */
+    public static IntakeClient getInstance() {
+        return instance;
+    }
+
+    /**
+     * @return
+     * @see org.collectionspace.hello.client.IntakeProxy#getIntake()
+     */
+    public ClientResponse<IntakeList> getIntakeList() {
+        return intakeProxy.getIntakeList();
+    }
+
+    /**
+     * @param csid
+     * @return
+     * @see org.collectionspace.hello.client.IntakeProxy#getIntake(java.lang.String)
+     */
+    public ClientResponse<Intake> getIntake(String csid) {
+        return intakeProxy.getIntake(csid);
+    }
+
+    /**
+     * @param intake
+     * @return
+     * @see org.collectionspace.hello.client.IntakeProxy#createIntake(org.collectionspace.hello.Intake)
+     */
+    public ClientResponse<Response> createIntake(Intake intake) {
+        return intakeProxy.createIntake(intake);
+    }
+
+    /**
+     * @param csid
+     * @param intake
+     * @return
+     * @see org.collectionspace.hello.client.IntakeProxy#updateIntake(java.lang.Long, org.collectionspace.hello.Intake)
+     */
+    public ClientResponse<Intake> updateIntake(String csid, Intake intake) {
+        return intakeProxy.updateIntake(csid, intake);
+    }
+
+    /**
+     * @param csid
+     * @return
+     * @see org.collectionspace.hello.client.IntakeProxy#deleteIntake(java.lang.Long)
+     */
+    public ClientResponse<Response> deleteIntake(String csid) {
+        return intakeProxy.deleteIntake(csid);
+    }
+}
diff --git a/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeProxy.java b/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeProxy.java
new file mode 100644 (file)
index 0000000..7a5abee
--- /dev/null
@@ -0,0 +1,46 @@
+package org.collectionspace.services.client;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+import org.collectionspace.services.intake.Intake;
+import org.collectionspace.services.intake.IntakeList;
+import org.jboss.resteasy.client.ClientResponse;
+
+/**
+ * @version $Revision:$
+ */
+@Path("/intakes/")
+@Produces({"application/xml"})
+@Consumes({"application/xml"})
+public interface IntakeProxy {
+
+    @GET
+    ClientResponse<IntakeList> getIntakeList();
+
+    //(C)reate
+    @POST
+    ClientResponse<Response> createIntake(Intake co);
+
+    //(R)ead
+    @GET
+    @Path("/{csid}")
+    ClientResponse<Intake> getIntake(@PathParam("csid") String csid);
+
+    //(U)pdate
+    @PUT
+    @Path("/{csid}")
+    ClientResponse<Intake> updateIntake(@PathParam("csid") String csid, Intake co);
+
+    //(D)elete
+    @DELETE
+    @Path("/{csid}")
+    ClientResponse<Response> deleteIntake(@PathParam("csid") String csid);
+}
\ No newline at end of file
diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java
new file mode 100644 (file)
index 0000000..d3ba413
--- /dev/null
@@ -0,0 +1,150 @@
+package org.collectionspace.services.client.test;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import org.jboss.resteasy.client.ClientResponse;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.collectionspace.services.intake.Intake;
+import org.collectionspace.services.intake.IntakeList;
+import org.collectionspace.services.client.IntakeClient;
+
+/**
+ * A IntakeNuxeoServiceTest.
+ * 
+ * @version $Revision:$
+ */
+public class IntakeServiceTest {
+
+    private IntakeClient intakeClient = IntakeClient.getInstance();
+    private String updateId = null;
+    private String deleteId = null;
+
+    @Test
+    public void createIntake() {
+       long identifier = this.createIdentifier();
+       
+       Intake intake = createIntake(identifier);
+        ClientResponse<Response> res = intakeClient.createIntake(intake);
+        Assert.assertEquals(res.getStatus(), Response.Status.CREATED.getStatusCode());
+        
+        //store updateId locally for "update" test
+        if (updateId == null) {
+               updateId = extractId(res);
+        } else {
+               deleteId = extractId(res);
+               System.out.println("Set deleteId: " + deleteId);
+        }
+    }
+
+    @Test(dependsOnMethods = {"createIntake"})
+    public void updateIntake() {
+       ClientResponse<Intake> res = intakeClient.getIntake(updateId);
+        Intake intake = res.getEntity();
+        verbose("Got Intake to update with ID: " + updateId,
+                       intake, Intake.class);
+        
+        //intake.setCsid("updated-" + updateId);
+        intake.setEntryNumber("updated-" + intake.getEntryNumber());
+        intake.setEntryDate("updated-" + intake.getEntryDate());
+        
+        // make call to update service
+        res = intakeClient.updateIntake(updateId, intake);
+        
+        // check the response
+        Intake updatedIntake = res.getEntity();        
+        Assert.assertEquals(updatedIntake.getEntryDate(), intake.getEntryDate());
+        verbose("updateIntake: ", updatedIntake, Intake.class);
+        
+        return;
+    }
+
+    @Test(dependsOnMethods = {"createIntake"})
+    public void createCollection() {
+       for (int i = 0; i < 3; i++) {
+               this.createIntake();
+       }
+    }
+    
+    @Test(dependsOnMethods = {"createCollection"})
+    public void getIntakeList() {
+        //the resource method is expected to return at least an empty list
+        IntakeList coList = intakeClient.getIntakeList().getEntity();
+        List<IntakeList.IntakeListItem> coItemList = coList.getIntakeListItem();
+        int i = 0;
+        for(IntakeList.IntakeListItem pli : coItemList) {
+            verbose("getIntakeList: list-item[" + i + "] csid=" + pli.getCsid());
+            verbose("getIntakeList: list-item[" + i + "] objectNumber=" + pli.getEntryNumber());
+            verbose("getIntakeList: list-item[" + i + "] URI=" + pli.getUri());
+            i++;
+        }
+    }
+
+    @Test(dependsOnMethods = {"createCollection"})
+    public void deleteIntake() {
+       System.out.println("Calling deleteIntake:" + deleteId);
+        ClientResponse<Response> res = intakeClient.deleteIntake(deleteId);
+        verbose("deleteIntake: csid=" + deleteId);
+        verbose("deleteIntake: status = " + res.getStatus());
+        Assert.assertEquals(res.getStatus(), Response.Status.NO_CONTENT.getStatusCode());
+    }
+
+    private Intake createIntake(long identifier) {
+       Intake intake = createIntake("objectNumber-" + identifier,
+                       "objectName-" + identifier);            
+
+        return intake;
+    }
+
+    private Intake createIntake(String entryNumber, String entryDate) {
+       Intake intake = new Intake();
+       
+       intake.setEntryNumber(entryNumber);
+       intake.setEntryDate(entryDate);
+
+        return intake;
+    }
+
+    private String extractId(ClientResponse<Response> res) {
+        MultivaluedMap mvm = res.getMetadata();
+        String uri = (String) ((ArrayList) mvm.get("Location")).get(0);
+        String[] segments = uri.split("/");
+        String id = segments[segments.length - 1];
+        verbose("id=" + id);
+        return id;
+    }
+
+    private void verbose(String msg) {
+        System.out.println("Intake Test: " + msg);
+    }
+
+    private void verbose(String msg, Object o, Class clazz) {
+        try{
+            verbose(msg);
+            JAXBContext jc = JAXBContext.newInstance(clazz);
+            Marshaller m = jc.createMarshaller();
+            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
+                    Boolean.TRUE);
+            m.marshal(o, System.out);
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    private void verboseMap(MultivaluedMap map) {
+        for(Object entry : map.entrySet()){
+            MultivaluedMap.Entry mentry = (MultivaluedMap.Entry) entry;
+            verbose("    name=" + mentry.getKey() + " value=" + mentry.getValue());
+        }
+    }
+    
+    private long createIdentifier() {
+       long identifier = System.currentTimeMillis();
+       return identifier;
+    }
+}
diff --git a/services/intake/client/src/test/resources/log4j.xml b/services/intake/client/src/test/resources/log4j.xml
new file mode 100644 (file)
index 0000000..52121cb
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+       <appender name="console" class="org.apache.log4j.ConsoleAppender">
+               <param name="Target" value="System.out" />
+               <layout class="org.apache.log4j.TTCCLayout">
+                       <param name="DateFormat" value="ISO8601" />
+               </layout>
+       </appender>
+
+
+       <appender name="unit-tests"
+               class="org.apache.log4j.RollingFileAppender">
+               <param name="File" value="./target/unit-tests.log" />
+               <param name="MaxFileSize" value="10240KB" />
+               <param name="MaxBackupIndex" value="6" />
+               <layout class="org.apache.log4j.TTCCLayout">
+                       <param name="DateFormat" value="ISO8601" />
+               </layout>
+       </appender>
+
+       <logger name="org.apache.commons.httpclient" additivity="false">
+               <level value="warn" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </logger>
+
+       <logger name="httpclient.wire" additivity="false">
+               <level value="info" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </logger>
+
+       <root>
+               <priority value="debug" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </root>
+
+</log4j:configuration>
+
+
+
+
diff --git a/services/intake/client/temp-testng-customsuite.xml b/services/intake/client/temp-testng-customsuite.xml
new file mode 100644 (file)
index 0000000..9f24806
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="javaee-addressbook-client">
+  <test verbose="2" name="org.jboss.resteasy.examples.addressbook.client.AddressBookTest" annotations="JDK">
+    <classes>
+      <class name="org.jboss.resteasy.examples.addressbook.client.AddressBookTest"/>
+    </classes>
+  </test>
+</suite>
diff --git a/services/intake/jaxb/.classpath b/services/intake/jaxb/.classpath
new file mode 100644 (file)
index 0000000..a92b24a
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/services/intake/jaxb/.project b/services/intake/jaxb/.project
new file mode 100644 (file)
index 0000000..db1c789
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>javaee-addressbook-jaxb</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+       </natures>
+</projectDescription>
diff --git a/services/intake/jaxb/.settings/org.eclipse.jdt.core.prefs b/services/intake/jaxb/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..8780c51
--- /dev/null
@@ -0,0 +1,5 @@
+#Thu Feb 26 16:32:52 PST 2009\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
+org.eclipse.jdt.core.compiler.source=1.5\r
diff --git a/services/intake/jaxb/.settings/org.maven.ide.eclipse.prefs b/services/intake/jaxb/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..c6e4123
--- /dev/null
@@ -0,0 +1,8 @@
+#Thu Feb 26 16:30:28 PST 2009\r
+activeProfiles=\r
+eclipse.preferences.version=1\r
+fullBuildGoals=process-test-resources\r
+includeModules=false\r
+resolveWorkspaceProjects=true\r
+resourceFilterGoals=process-resources resources\:testResources\r
+version=1\r
diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
new file mode 100644 (file)
index 0000000..59a61d8
--- /dev/null
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <artifactId>org.collectionspace.services.intake</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.intake.jaxb</artifactId>
+    <version>1.0</version>
+    <name>services.intake.jaxb</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jvnet.jaxb2-commons</groupId>
+            <artifactId>property-listener-injector</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jvnet.jaxb2_commons</groupId>
+            <artifactId>runtime</artifactId>
+            <version>0.4.1.4</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>collectionspace-services-intake-jaxb</finalName>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+               <!-- javax.activation.DataSource provider is required by spec -->
+                    <dependency>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                        <version>1.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                        <version>2.1.2</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <args>
+                        <arg>-XtoString</arg>
+                        <arg>-Xinject-listener-code</arg>
+
+                     <!-- <arg>-Xcollection-setter-injector</arg>
+                                <arg>-Xfluent-api</arg> -->
+                    </args>
+                    <plugins>
+                        <plugin>
+                            <groupId>
+                           org.jvnet.jaxb2_commons
+                            </groupId>
+                            <artifactId>basic</artifactId>
+                            <version>0.4.1</version>
+                        </plugin>
+                        <plugin>
+                            <groupId>
+                           org.jvnet.jaxb2-commons
+                            </groupId>
+                            <artifactId>
+                           property-listener-injector
+                            </artifactId>
+                            <version>1.0</version>
+                        </plugin>
+
+                    </plugins>
+                    <!--generatePackage>
+                     org.collectionspace.hello
+                    </generatePackage-->
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeJAXBSchema.java b/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeJAXBSchema.java
new file mode 100644 (file)
index 0000000..def5f25
--- /dev/null
@@ -0,0 +1,23 @@
+/**\r
+ * \r
+ */\r
+package org.collectionspace.services;\r
+\r
+/**\r
+ * @author remillet\r
+ *\r
+ */\r
+public interface IntakeJAXBSchema {\r
+       final static String CURRENT_OWNER = "currentOwner";\r
+       final static String DEPOSITOR = "depositor";\r
+       final static String DEPOSITORS_REQUIREMENTS = "depositorsRequirements";\r
+       final static String ENTRY_DATE = "entryDate";\r
+       final static String ENTRY_METHOD = "entryMethod";\r
+       final static String ENTRY_NOTE = "entryNote";\r
+       final static String ENTRY_NUMBER = "entryNumber";\r
+       final static String ENTRY_REASON = "entryReason";\r
+       final static String PACKING_NOTE = "packingNote";\r
+       final static String RETURN_DATE = "returnDate";\r
+}\r
+\r
+\r
diff --git a/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java b/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java
new file mode 100644 (file)
index 0000000..22fbe87
--- /dev/null
@@ -0,0 +1,7 @@
+package org.collectionspace.services;\r
+\r
+public interface IntakeListItemJAXBSchema {\r
+       final static String ENTRY_NUMBER = "entryNumber";\r
+       final static String CSID = "csid";\r
+       final static String URI = "url";\r
+}\r
diff --git a/services/intake/jaxb/src/main/resources/intake.xsd b/services/intake/jaxb/src/main/resources/intake.xsd
new file mode 100644 (file)
index 0000000..a65b93c
--- /dev/null
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:ns="http://collectionspace.org/intake"
+  xmlns="http://collectionspace.org/intake"
+  targetNamespace="http://services.collectionspace.org/intake"
+  version="0.1"
+>
+
+
+<!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
+<!-- See http://wiki.collectionspace.org/display/collectionspace/Intake+Schema -->    
+    
+    <!-- intake  -->
+    <xs:element name="intake">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="csid" type="xs:string" />
+                
+                <!--  Object Entry Information Group -->
+                <xs:element name="currentOwner" type="xs:string"/>
+                <xs:element name="depositor" type="xs:string"/>
+                <xs:element name="depositorsRequirements" type="xs:string"/>
+                <xs:element name="entryDate" type="xs:string"/>
+                <xs:element name="entryMethod" type="xs:string"/>
+                <xs:element name="entryNote" type="xs:string"/>
+                <xs:element name="entryNumber" type="xs:string"/>
+                <xs:element name="entryReason" type="xs:string"/>
+                <xs:element name="packingNote" type="xs:string"/>
+                <xs:element name="returnDate" type="xs:string"/>
+                
+                <!--  Date Information Group -->
+                <xs:element name="associationDate" type="xs:string"/>
+                <xs:element name="earliestDate" type="xs:string"/>
+                <xs:element name="earliestDateCertainty" type="xs:string"/>
+                <xs:element name="earliestDateQualifier" type="xs:string"/>
+                <xs:element name="latestDate" type="xs:string"/>
+                <xs:element name="latestDateCertainty" type="xs:string"/>
+                <xs:element name="latestDateQualifier" type="xs:string"/>
+                <xs:element name="datePeriod" type="xs:string"/>
+                <xs:element name="dateText" type="xs:string"/>
+                
+                <!--  Object Collection Information Group -->
+                <xs:element name="fieldCollectionDate" type="xs:string"/>
+                <xs:element name="fieldCollectionEventName" type="xs:string"/>
+                <xs:element name="fieldCollectionEventRefNumber" type="xs:string"/>
+                <xs:element name="fieldCollectionMethod" type="xs:string"/>
+                <xs:element name="fieldCollectionNote" type="xs:string"/>
+                <xs:element name="fieldCollectionNumber" type="xs:string"/>
+                <xs:element name="fieldCollectionPlace" type="xs:string"/>
+                <xs:element name="fieldCollectionSource" type="xs:string"/>
+                <xs:element name="fieldCollector" type="xs:string"/>
+                <xs:element name="geologicalComplexName" type="xs:string"/>
+                <xs:element name="habitat" type="xs:string"/>
+                <xs:element name="habitatNote" type="xs:string"/>
+                <xs:element name="stratigraphicUnitName" type="xs:string"/>
+                <xs:element name="stratigraphicUnitType" type="xs:string"/>
+                <xs:element name="stratigraphicUnitNote" type="xs:string"/>
+                
+                <!-- Valuation Information Group -->
+                <xs:element name="ValuationReferenceNumber" type="xs:string"/>
+                <xs:element name="Valuer" type="xs:string"/>
+                
+                <!-- Insurance Information Group -->
+                <xs:element name="insuranceNote" type="xs:string"/>
+                <xs:element name="insurancePolicyNumber" type="xs:string"/>
+                <xs:element name="InsuranceReferenceNumber" type="xs:string"/>
+                <xs:element name="insuranceRenewalDate" type="xs:string"/>
+                <xs:element name="insurer" type="xs:string"/>
+                
+                <!-- Object Location Information Group -->
+                <xs:element name="currentLocation" type="xs:string"/>
+                <xs:element name="currentLocationFitness" type="xs:string"/>
+                <xs:element name="currentLocationNote" type="xs:string"/>
+                <xs:element name="locationDate" type="xs:string"/>
+                <xs:element name="normalLocation" type="xs:string"/>
+                
+                <!-- Condition Check/Technical Assessment Information Group -->
+                <xs:element name="conditionCheckDate" type="xs:string"/>
+                <xs:element name="conditionCheckMethod" type="xs:string"/>
+                <xs:element name="conditionCheckNote" type="xs:string"/>
+                <xs:element name="conditionCheckReason" type="xs:string"/>
+                <xs:element name="conditionCheckReferenceNumber" type="xs:string"/>
+                <xs:element name="conditionCheckAssesor" type="xs:string"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    
+    <!-- intake records, as in nuxeo repository -->
+    <xs:element name="intake-list">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="intake-list-item" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="entryNumber" type="xs:string"
+                                minOccurs="1" />
+                            <!-- uri to retrive intake details -->
+                            <xs:element name="uri" type="xs:anyURI"
+                                minOccurs="1" />
+                            <xs:element name="csid" type="xs:string"
+                                minOccurs="1" />
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    
+</xs:schema>
+
diff --git a/services/intake/pom.xml b/services/intake/pom.xml
new file mode 100644 (file)
index 0000000..fb3b3f3
--- /dev/null
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <version>1.0</version>\r
+    <artifactId>org.collectionspace.services.intake</artifactId>\r
+    <packaging>pom</packaging>\r
+    <name>services.intake</name>\r
+\r
+    <properties>\r
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
+    </properties>\r
+\r
+    <modules>\r
+        <module>jaxb</module>\r
+        <module>service</module>\r
+        <module>3rdparty</module>\r
+        <module>client</module>\r
+    </modules>\r
+\r
+    <build>\r
+        <pluginManagement>\r
+            <plugins>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-compiler-plugin</artifactId>\r
+                    <configuration>\r
+                        <source>1.5</source>\r
+                        <target>1.5</target>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-site-plugin</artifactId>\r
+                    <configuration>\r
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-war-plugin</artifactId>\r
+                    <version>2.0.1</version>\r
+                    <configuration>\r
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
+                        <archive>\r
+                            <manifest>\r
+                                <addClasspath>true</addClasspath>\r
+\r
+                            </manifest>\r
+                        </archive>\r
+                    </configuration>\r
+                </plugin>\r
+            </plugins>\r
+        </pluginManagement>\r
+    </build>\r
+</project>\r
diff --git a/services/intake/service/.classpath b/services/intake/service/.classpath
new file mode 100644 (file)
index 0000000..96f09f1
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/services/intake/service/.project b/services/intake/service/.project
new file mode 100644 (file)
index 0000000..1c6ac6d
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.collectionspace.services.intake.service</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.maven.ide.eclipse.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+       </natures>\r
+</projectDescription>\r
diff --git a/services/intake/service/.settings/org.eclipse.jdt.core.prefs b/services/intake/service/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..b81e78b
--- /dev/null
@@ -0,0 +1,5 @@
+#Mon Jun 29 14:28:26 PDT 2009\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
+org.eclipse.jdt.core.compiler.source=1.5\r
diff --git a/services/intake/service/.settings/org.maven.ide.eclipse.prefs b/services/intake/service/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..0f12a7e
--- /dev/null
@@ -0,0 +1,8 @@
+#Mon Jun 29 14:27:15 PDT 2009\r
+activeProfiles=\r
+eclipse.preferences.version=1\r
+fullBuildGoals=process-test-resources\r
+includeModules=false\r
+resolveWorkspaceProjects=true\r
+resourceFilterGoals=process-resources resources\:testResources\r
+version=1\r
diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
new file mode 100644 (file)
index 0000000..abc9dc1
--- /dev/null
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.intake</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    \r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.intake.service</artifactId>\r
+    <packaging>jar</packaging>\r
+    <version>1.0</version>\r
+    <name>services.intake.service</name>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+        \r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+            <version>4.1</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.testng</groupId>\r
+            <artifactId>testng</artifactId>\r
+            <version>5.6</version>\r
+        </dependency>\r
+        \r
+\r
+      <!-- javax -->\r
+\r
+\r
+        <dependency>\r
+            <groupId>javax.security</groupId>\r
+            <artifactId>jaas</artifactId>\r
+            <version>1.0.01</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+\r
+        <dependency>\r
+            <groupId>dom4j</groupId>\r
+            <artifactId>dom4j</artifactId>\r
+            <version>1.6.1</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+        \r
+        <!-- jboss -->\r
+\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxrs</artifactId>\r
+            <version>1.0.2.GA</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <groupId>tjws</groupId>\r
+                    <artifactId>webserver</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxb-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-multipart-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        \r
+        <!-- nuxeo -->\r
+\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-api</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <artifactId>jboss-remoting</artifactId>\r
+                    <groupId>jboss</groupId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+\r
+        <dependency>\r
+            <groupId>org.restlet</groupId>\r
+            <artifactId>org.restlet</artifactId>\r
+            <version>1.0.7</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.noelios.restlet</groupId>\r
+            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
+            <version>1.0.7</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.noelios.restlet</groupId>\r
+            <artifactId>com.noelios.restlet</artifactId>\r
+            <version>1.0.7</version>\r
+        </dependency>\r
+\r
+    </dependencies>\r
+    \r
+    <build>\r
+        <finalName>collectionspace-services-commonobject</finalName>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>jboss-maven-plugin</artifactId>\r
+                <configuration>\r
+                    <jbossHome>${jboss.dir}</jbossHome>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <configuration>\r
+                    <source>1.5</source>\r
+                    <target>1.5</target>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+</project>\r
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/IntakeResource.java b/services/intake/service/src/main/java/org/collectionspace/services/IntakeResource.java
new file mode 100644 (file)
index 0000000..906aef0
--- /dev/null
@@ -0,0 +1,275 @@
+package org.collectionspace.services;
+
+import java.util.Iterator;
+import java.util.List;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+
+import org.collectionspace.services.IntakeService;
+import org.collectionspace.services.intake.*;
+import org.collectionspace.services.intake.IntakeList.*;
+import org.collectionspace.services.IntakeJAXBSchema;
+
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Path("/intakes")
+@Consumes("application/xml")
+@Produces("application/xml")
+public class IntakeResource {
+
+       final Logger logger = LoggerFactory
+                       .getLogger(IntakeResource.class);
+
+       // This should be a DI wired by a container like Spring, Seam, or EJB3
+       final static IntakeService service = new IntakeServiceNuxeoImpl();
+
+       public IntakeResource() {
+               // do nothing
+       }
+
+       @GET
+       public IntakeList getIntakeList(@Context UriInfo ui) {
+               IntakeList p = new IntakeList();
+               try {
+                       Document document = service.getIntakeList();
+                       Element root = document.getRootElement();
+
+                       // debug
+                       System.err.println(document.asXML());
+
+                       List<IntakeList.IntakeListItem> list = p
+                                       .getIntakeListItem();
+                       for (Iterator i = root.elementIterator(); i.hasNext();) {
+                               Element element = (Element) i.next();
+                               // debug
+                               System.err.println();
+                               element.asXML();
+
+                               // set the Intake list item entity elements
+                               IntakeListItem pli = new IntakeListItem();
+                               pli.setEntryNumber(element.attributeValue("entryNumber"));
+                               pli.setUri(element.attributeValue("url"));
+                               pli.setCsid(element.attributeValue("id"));
+                               list.add(pli);
+                       }
+
+               } catch (Exception e) {
+                       e.printStackTrace();
+               }
+
+               return p;
+       }
+
+       @POST
+       public Response createIntake(Intake intake) {
+               
+               String csid = null;
+               try {
+                       Document document = service.postIntake(intake);
+                       Element root = document.getRootElement();
+                       for (Iterator i = root.elementIterator(); i.hasNext();) {
+                               Element element = (Element) i.next();
+                               if ("docRef".equals(element.getName())) {
+                                       csid = (String) element.getData();
+                                       intake.setCsid(csid);
+                               }
+                       }
+               } catch (Exception e) {
+                       Response response = Response.status(Response.Status.NOT_FOUND)
+                                       .entity("Create failed").type("text/plain").build();
+                       throw new WebApplicationException(response);
+               }
+
+               verbose("createIntake: ", intake);
+               UriBuilder path = UriBuilder
+                               .fromResource(IntakeResource.class);
+               path.path("" + csid);
+               Response response = Response.created(path.build()).build();
+
+               return response;
+       }
+
+       @GET
+       @Path("{csid}")
+       public Intake getIntake(@PathParam("csid") String csid) {
+
+               Intake intake = null;
+               try {
+                       Document document = service.getIntake(csid);
+                       Element root = document.getRootElement();
+                       intake = new Intake();
+
+                       // TODO: recognize schema thru namespace uri
+                       // Namespace ns = new Namespace("intake",
+                       // "http://collectionspace.org/intake");
+
+                       Iterator<Element> siter = root.elementIterator("schema");
+                       while (siter.hasNext()) {
+
+                               Element schemaElement = siter.next();
+                               System.err
+                                               .println("Intake.getIntake() called.");
+
+                               // TODO: recognize schema thru namespace uri
+                               if (IntakeService.INTAKE_SCHEMA_NAME.equals(schemaElement.attribute("name")
+                                               .getValue())) {
+                                       Element ele = schemaElement
+                                                       .element(IntakeJAXBSchema.CURRENT_OWNER);
+                                       if (ele != null) {
+                                               intake.setCurrentOwner((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.DEPOSITOR);
+                                       if (ele != null) {
+                                               intake.setDepositor((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.DEPOSITORS_REQUIREMENTS);
+                                       if (ele != null) {
+                                               intake.setDepositorsRequirements((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.ENTRY_DATE);
+                                       if (ele != null) {
+                                               intake.setEntryDate((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.ENTRY_METHOD);
+                                       if (ele != null) {
+                                               intake.setEntryMethod((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.ENTRY_NOTE);
+                                       if (ele != null) {
+                                               intake.setEntryNote((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.ENTRY_NUMBER);
+                                       if (ele != null) {
+                                               intake.setEntryNumber((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.ENTRY_REASON);
+                                       if (ele != null) {
+                                               intake.setEntryReason((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.PACKING_NOTE);
+                                       if (ele != null) {
+                                               intake.setPackingNote((String) ele.getData());
+                                       }
+                                       ele = schemaElement
+                                                       .element(IntakeJAXBSchema.RETURN_DATE);
+                                       if (ele != null) {
+                                               intake.setReturnDate((String) ele.getData());
+                                       }
+                               }
+                       }
+               } catch (Exception e) {
+                       e.printStackTrace();
+                       Response response = Response.status(
+                                       Response.Status.INTERNAL_SERVER_ERROR).entity("Get failed")
+                                       .type("text/plain").build();
+                       throw new WebApplicationException(response);
+               }
+               if (intake == null) {
+                       Response response = Response.status(Response.Status.NOT_FOUND)
+                                       .entity(
+                                                       "Get failed, the requested Intake CSID:"
+                                                                       + csid + ": was not found.").type(
+                                                       "text/plain").build();
+                       throw new WebApplicationException(response);
+               }
+               verbose("getIntake: ", intake);
+
+               return intake;
+       }
+
+       @PUT
+       @Path("{csid}")
+       public Intake updateIntake(
+                       @PathParam("csid") String csid, Intake theUpdate) {
+
+               verbose("updateIntake with input: ", theUpdate);
+
+               String status = null;
+               try {
+
+                       Document document = service.putIntake(csid, theUpdate);
+                       Element root = document.getRootElement();
+                       for (Iterator i = root.elementIterator(); i.hasNext();) {
+                               Element element = (Element) i.next();
+                               if ("docRef".equals(element.getName())) {
+                                       status = (String) element.getData();
+                                       verbose("updateIntake response: " + status);
+                               }
+                       }
+               } catch (Exception e) {
+                       // FIXME: NOT_FOUND?
+                       Response response = Response.status(Response.Status.NOT_FOUND)
+                                       .entity("Update failed ").type("text/plain").build();
+                       throw new WebApplicationException(response);
+               }
+
+               return theUpdate;
+       }
+
+       @DELETE
+       @Path("{csid}")
+       public void deleteIntake(@PathParam("csid") String csid) {
+
+               verbose("deleteIntake with csid=" + csid);
+               try {
+                       
+                       Document document = service.deleteIntake(csid);
+                       Element root = document.getRootElement();
+                       for (Iterator i = root.elementIterator(); i.hasNext();) {
+                               Element element = (Element) i.next();
+                               if ("docRef".equals(element.getName())) {
+                                       String status = (String) element.getData();
+                                       verbose("deleteIntaket response: " + status);
+                               }
+                       }
+               } catch (Exception e) {
+                       // FIXME: NOT_FOUND?
+                       Response response = Response.status(Response.Status.NOT_FOUND)
+                                       .entity("Delete failed ").type("text/plain").build();
+                       throw new WebApplicationException(response);
+               }
+
+       }
+
+       private void verbose(String msg, Intake intake) {
+               try {
+                       verbose(msg);
+                       JAXBContext jc = JAXBContext.newInstance(Intake.class);
+
+                       Marshaller m = jc.createMarshaller();
+                       m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+                       m.marshal(intake, System.out);
+               } catch (Exception e) {
+                       e.printStackTrace();
+               }
+       }
+
+       private void verbose(String msg) {
+               System.out.println("IntakeResource. " + msg);
+       }
+
+}
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/IntakeService.java b/services/intake/service/src/main/java/org/collectionspace/services/IntakeService.java
new file mode 100644 (file)
index 0000000..b972bae
--- /dev/null
@@ -0,0 +1,38 @@
+/**\r
+ * \r
+ */\r
+package org.collectionspace.services;\r
+\r
+import java.io.IOException;\r
+import org.dom4j.Document;\r
+import org.dom4j.DocumentException;\r
+\r
+import org.collectionspace.services.intake.Intake;\r
+\r
+/**\r
+ * @author remillet\r
+ * \r
+ */\r
+public interface IntakeService {\r
+\r
+       public final static String INTAKE_SCHEMA_NAME = "intake";\r
+\r
+       // Create\r
+       Document postIntake(Intake co)\r
+                       throws DocumentException, IOException;\r
+\r
+       // Read single object\r
+       Document getIntake(String csid) throws DocumentException,\r
+                       IOException;\r
+\r
+       // Read a list of objects\r
+       Document getIntakeList() throws DocumentException, IOException;\r
+\r
+       // Update\r
+       Document putIntake(String csid, Intake theUpdate)\r
+                       throws DocumentException, IOException;\r
+\r
+       // Delete\r
+       Document deleteIntake(String csid) throws DocumentException,\r
+                       IOException;\r
+}\r
diff --git a/services/intake/service/src/main/java/org/collectionspace/services/IntakeServiceNuxeoImpl.java b/services/intake/service/src/main/java/org/collectionspace/services/IntakeServiceNuxeoImpl.java
new file mode 100644 (file)
index 0000000..4bc1f43
--- /dev/null
@@ -0,0 +1,206 @@
+/**\r
+ * \r
+ */\r
+package org.collectionspace.services;\r
+\r
+import java.io.ByteArrayInputStream;\r
+import java.io.IOException;\r
+import java.util.ArrayList;\r
+import java.util.Arrays;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
+\r
+import org.collectionspace.services.nuxeo.NuxeoRESTClient;\r
+import org.collectionspace.services.nuxeo.CollectionSpaceServiceNuxeoImpl;\r
+import org.collectionspace.services.intake.Intake;\r
+import org.collectionspace.services.IntakeJAXBSchema;\r
+\r
+import org.dom4j.Document;\r
+import org.dom4j.DocumentException;\r
+import org.dom4j.io.SAXReader;\r
+import org.restlet.resource.Representation;\r
+\r
+/**\r
+ * @author remillet\r
+ * \r
+ */\r
+public class IntakeServiceNuxeoImpl extends\r
+               CollectionSpaceServiceNuxeoImpl implements IntakeService {\r
+\r
+       final static String INTAKE_NUXEO_DOCTYPE = "Intake";\r
+       final static String INTAKE_NUXEO_SCHEMA_NAME = "intake";\r
+       final static String INTAKE_NUXEO_DC_TITLE = "CollectionSpace-Intake";\r
+\r
+       // replace WORKSPACE_UID for resource workspace\r
+       static String CS_INTAKE_WORKSPACE_UID = "c04210c4-9426-475f-b4ee-aa3d6aa4b97c";\r
+\r
+       public Document deleteIntake(String csid)\r
+                       throws DocumentException, IOException {\r
+\r
+               NuxeoRESTClient nxClient = getClient();\r
+               List<String> pathParams = new ArrayList<String>();\r
+               Map<String, String> queryParams = new HashMap<String, String>();\r
+\r
+               pathParams.add("default");\r
+               pathParams.add(csid);\r
+               pathParams.add("deleteDocumentRestlet");\r
+               Representation res = nxClient.get(pathParams, queryParams);\r
+               SAXReader reader = new SAXReader();\r
+               Document document = reader.read(res.getStream());\r
+               \r
+               return document;\r
+       }\r
+\r
+       public Document getIntake(String csid) throws DocumentException,\r
+                       IOException {\r
+               List<String> pathParams = new ArrayList<String>();\r
+               Map<String, String> queryParams = new HashMap<String, String>();\r
+\r
+               pathParams.add("default");\r
+               pathParams.add(csid);\r
+               pathParams.add("export");\r
+               queryParams.put("format", "XML");\r
+\r
+               NuxeoRESTClient nxClient = getClient();\r
+               Representation res = nxClient.get(pathParams, queryParams);\r
+\r
+               SAXReader reader = new SAXReader();\r
+               Document document = reader.read(res.getStream());\r
+\r
+               return document;\r
+       }\r
+\r
+       public Document getIntakeList() throws DocumentException,\r
+                       IOException {\r
+               Document result = null;\r
+\r
+               NuxeoRESTClient nxClient = getClient();\r
+               List<String> pathParams = new ArrayList<String>();\r
+               Map<String, String> queryParams = new HashMap<String, String>();\r
+               pathParams = Arrays.asList("default",\r
+                               CS_INTAKE_WORKSPACE_UID, "browse");\r
+               Representation res = nxClient.get(pathParams, queryParams);\r
+               SAXReader reader = new SAXReader();\r
+               result = reader.read(res.getStream());\r
+\r
+               return result;\r
+       }\r
+\r
+       public Document postIntake(Intake co)\r
+                       throws DocumentException, IOException {\r
+               NuxeoRESTClient nxClient = getClient();\r
+\r
+               List<String> pathParams = new ArrayList<String>();\r
+               Map<String, String> queryParams = new HashMap<String, String>();\r
+               pathParams.add("default");\r
+               pathParams.add(CS_INTAKE_WORKSPACE_UID);\r
+               pathParams.add("createDocument");\r
+               queryParams.put("docType", INTAKE_NUXEO_DOCTYPE);\r
+\r
+               // a default title for the Dublin Core schema\r
+               queryParams.put("dublincore:title", INTAKE_NUXEO_DC_TITLE);\r
+\r
+               // Intake core values\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.CURRENT_OWNER, co\r
+                               .getCurrentOwner());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.DEPOSITOR, co.getDepositor());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.DEPOSITORS_REQUIREMENTS, co\r
+                               .getDepositorsRequirements());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.ENTRY_DATE, co.getEntryDate());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.ENTRY_METHOD, co\r
+                               .getEntryMethod());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.ENTRY_NOTE, co.getEntryNote());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.ENTRY_NUMBER, co\r
+                               .getEntryNumber());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.ENTRY_REASON, co.getEntryReason());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.PACKING_NOTE, co.getPackingNote());\r
+               queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                               + IntakeJAXBSchema.RETURN_DATE, co.getReturnDate());\r
+\r
+               ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);\r
+               Representation res = nxClient.post(pathParams, queryParams, bais);\r
+\r
+               SAXReader reader = new SAXReader();\r
+               Document document = reader.read(res.getStream());\r
+\r
+               return document;\r
+       }\r
+\r
+       public Document putIntake(String csid, Intake theUpdate)\r
+                       throws DocumentException, IOException {\r
+               List<String> pathParams = new ArrayList<String>();\r
+               Map<String, String> queryParams = new HashMap<String, String>();\r
+               pathParams.add("default");\r
+               pathParams.add(csid);\r
+               pathParams.add("updateDocumentRestlet");\r
+\r
+               // todo: intelligent merge needed\r
+               if (theUpdate.getCurrentOwner() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.CURRENT_OWNER, theUpdate.getCurrentOwner());\r
+               }\r
+\r
+               if (theUpdate.getDepositor() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.DEPOSITOR, theUpdate.getDepositor());\r
+               }\r
+\r
+               if (theUpdate.getDepositorsRequirements() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.DEPOSITORS_REQUIREMENTS, theUpdate.getDepositorsRequirements());\r
+               }\r
+\r
+               if (theUpdate.getEntryDate() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.ENTRY_DATE, theUpdate.getEntryDate());\r
+               }\r
+\r
+               if (theUpdate.getEntryMethod() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.ENTRY_METHOD, theUpdate.getEntryMethod());\r
+               }\r
+\r
+               if (theUpdate.getEntryNote() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.ENTRY_NOTE, theUpdate.getEntryNote());\r
+               }\r
+\r
+               if (theUpdate.getEntryNumber() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.ENTRY_NUMBER, theUpdate.getEntryNumber());\r
+               }\r
+\r
+               if (theUpdate.getEntryReason() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.ENTRY_REASON, theUpdate.getEntryReason());\r
+               }\r
+\r
+               if (theUpdate.getPackingNote() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.PACKING_NOTE, theUpdate.getPackingNote());\r
+               }\r
+\r
+               if (theUpdate.getReturnDate() != null) {\r
+                       queryParams.put(INTAKE_NUXEO_SCHEMA_NAME + ":"\r
+                                       + IntakeJAXBSchema.RETURN_DATE, theUpdate.getReturnDate());\r
+               }\r
+\r
+               NuxeoRESTClient nxClient = getClient();\r
+               Representation res = nxClient.get(pathParams, queryParams);\r
+               SAXReader reader = new SAXReader();\r
+               Document document = reader.read(res.getStream());\r
+\r
+               return document;\r
+       }\r
+\r
+}\r
diff --git a/services/intake/service/src/test/java/org/collectionspace/services/test/IntakeServiceTest.java b/services/intake/service/src/test/java/org/collectionspace/services/test/IntakeServiceTest.java
new file mode 100644 (file)
index 0000000..eb297ce
--- /dev/null
@@ -0,0 +1,13 @@
+package org.collectionspace.services.test;
+
+//import org.collectionspace.services.intake.Intake;
+//import org.collectionspace.services.intake.IntakeList;
+
+/**
+ * A IntakeServiceTest.
+ * 
+ * @version $Revision:$
+ */
+public class IntakeServiceTest {
+       //empty
+}
diff --git a/services/intake/service/src/test/resources/log4j.xml b/services/intake/service/src/test/resources/log4j.xml
new file mode 100644 (file)
index 0000000..52121cb
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+       <appender name="console" class="org.apache.log4j.ConsoleAppender">
+               <param name="Target" value="System.out" />
+               <layout class="org.apache.log4j.TTCCLayout">
+                       <param name="DateFormat" value="ISO8601" />
+               </layout>
+       </appender>
+
+
+       <appender name="unit-tests"
+               class="org.apache.log4j.RollingFileAppender">
+               <param name="File" value="./target/unit-tests.log" />
+               <param name="MaxFileSize" value="10240KB" />
+               <param name="MaxBackupIndex" value="6" />
+               <layout class="org.apache.log4j.TTCCLayout">
+                       <param name="DateFormat" value="ISO8601" />
+               </layout>
+       </appender>
+
+       <logger name="org.apache.commons.httpclient" additivity="false">
+               <level value="warn" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </logger>
+
+       <logger name="httpclient.wire" additivity="false">
+               <level value="info" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </logger>
+
+       <root>
+               <priority value="debug" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </root>
+
+</log4j:configuration>
+
+
+
+