]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-1832: All CSpace specific Nuxeo document types now contain new "core" document...
authorRichard Millet <richard.millet@berkeley.edu>
Sat, 15 May 2010 00:24:06 +0000 (00:24 +0000)
committerRichard Millet <richard.millet@berkeley.edu>
Sat, 15 May 2010 00:24:06 +0000 (00:24 +0000)
38 files changed:
3rdparty/nuxeo/build.xml
3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/core-types-contrib.xml
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/ecm-types-contrib.xml
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/layouts-contrib.xml
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd [deleted file]
3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd [new file with mode: 0644]
3rdparty/nuxeo/pom.xml
3rdparty/pom.xml
services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/PerformanceTest.java
services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/META-INF/MANIFEST.MF
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/core-types-contrib.xml
services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/core-types-contrib.xml
services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml
services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/core-types-contrib.xml
services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/core-types-contrib.xml
services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/core-types-contrib.xml
services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/core-types-contrib.xml
services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/person/sample/sample/pom.xml
services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/ecm-types-contrib.xml
services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml
services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/ecm-types-contrib.xml

index 7bf63d8bc5216ee787a198bea93bf666692de0ea..625438c272aa851f9ad8a65ff55fbee1e92636d3 100644 (file)
                 <include name="*.jar"/>\r
             </fileset>\r
         </copy>\r
+        <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
     description="undeploy nuxeo client libs from ${jboss.server.cspace}">\r
         <delete dir="${jboss.server.cspace}/nuxeo-client"/>\r
+        <ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="dist"\r
index e26e09c584ec9478a4fb5bfb851f09c8575a4c6e..c02b71cadcc6277714ce55502749f16ff0a4077f 100644 (file)
-<?xml version="1.0"?>
-<project name="nuxeo cs" default="all" basedir=".">
-
-    <!-- enviornment should be declared before reading build.properties -->
-    <property environment="env" />
-  <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>
+<project name="nuxeo-platform-cs-collectionspace_core" default="package" basedir=".">
+  <description>
+    CollectionSpace Core Nuxeo document type
+  </description>
+  <!-- set global properties for this build -->
+  <property name="services.trunk" value="../../.."/>
+  <!-- environment should be declared before reading build.properties -->
+  <property environment="env" />
+  <property file="${services.trunk}/build.properties" />
+  <property name="mvn.opts" value="" />
+  <property name="src" location="src"/>
+  <property name="build" location="build"/>
+  <property name="dist"  location="dist"/>
+  <property name="nuxeo.collectionspace_core.jar"
+    value="org.collectionspace.services.3rdparty.nuxeo.collectionspace_core-${cspace.release}.jar"/>
+  <property name="nuxeo.collectionspace_core.jars.all"
+    value="nuxeo-platform-collectionspace_core-*.jar"/>
+  
+  <condition property="osfamily-unix">
+    <os family="unix" />
+  </condition>
+  <condition property="osfamily-windows">
+    <os family="windows" />
+  </condition>
+  
+  <target name="init" >
+    <!-- Create the time stamp -->
+    <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+    <mkdir dir="${build}"/>
   </target>
-
+  
+  <target name="package" depends="package-unix,package-windows"
+    description="Package CollectionSpace Services" />
+  <target name="package-unix" if="osfamily-unix">
+    <exec executable="mvn" failonerror="true">
+      <arg value="package" />
+      <arg value="-Dmaven.test.skip=true" />
+      <arg value="-f" />
+      <arg value="${basedir}/pom.xml" />
+      <arg value="-N" />
+      <arg value="${mvn.opts}" />
+    </exec>
+  </target>
+  <target name="package-windows" if="osfamily-windows">
+    <exec executable="cmd" failonerror="true">
+      <arg value="/c" />
+      <arg value="mvn.bat" />
+      <arg value="package" />
+      <arg value="-Dmaven.test.skip=true" />
+      <arg value="-f" />
+      <arg value="${basedir}/pom.xml" />
+      <arg value="-N" />
+      <arg value="${mvn.opts}" />
+    </exec>
+  </target>
+  
+  <target name="install" depends="install-unix,install-windows"
+    description="Install" />
+  <target name="install-unix" if="osfamily-unix">
+    <exec executable="mvn" failonerror="true">
+      <arg value="install" />
+      <arg value="-Dmaven.test.skip=true" />
+      <arg value="-f" />
+      <arg value="${basedir}/pom.xml" />
+      <arg value="-N" />
+      <arg value="${mvn.opts}" />
+    </exec>
+  </target>
+  <target name="install-windows" if="osfamily-windows">
+    <exec executable="cmd" failonerror="true">
+      <arg value="/c" />
+      <arg value="mvn.bat" />
+      <arg value="install" />
+      <arg value="-Dmaven.test.skip=true" />
+      <arg value="-f" />
+      <arg value="${basedir}/pom.xml" />
+      <arg value="-N" />
+      <arg value="${mvn.opts}" />
+    </exec>
+  </target>
+  
+  <target name="deploy" depends="install"
+    description="deploy dimension doctype in ${jboss.server.nuxeo}">
+    <copy file="${basedir}/target/${nuxeo.collectionspace_core.jar}"
+      todir="${jboss.deploy.nuxeo.plugins}"/>
+  </target>
+  
+  <target name="undeploy"
+    description="undeploy dimension doctype from ${jboss.server.nuxeo}">
+    <delete>
+      <fileset dir="${jboss.deploy.nuxeo.plugins}">
+        <include name="${nuxeo.collectionspace_core.jars.all}"/>
+      </fileset>
+      <!-- Legacy deployment location through release 0.6 -->
+      <fileset dir="${jboss.deploy.nuxeo.system}">
+        <include name="${nuxeo.collectionspace_core.jars.all}"/>
+      </fileset>
+    </delete>
+  </target>
+  
 </project>
index e1bab3098e9f815d68c0eeee9b7591326ab59476..acf219ccad8bb2fc156e9210ea78e042aa3a7f99 100644 (file)
@@ -10,9 +10,8 @@
 \r
   <modelVersion>4.0.0</modelVersion>\r
   <groupId>org.collectionspace.services</groupId>\r
-  <artifactId>nuxeo-platform-collectionspace</artifactId>\r
-  <packaging>pom</packaging>\r
-  <name>Nuxeo CS extensions</name>\r
+  <artifactId>org.collectionspace.services.3rdparty.nuxeo.collectionspace_core</artifactId>\r
+  <name>Nuxeo CollectionSpace core extension</name>\r
   <description> Nuxeo Enterprise Platform: CS extensions </description>\r
 \r
   <build>\r
@@ -23,7 +22,7 @@
         <version>2.2</version>\r
         <configuration>\r
           <archive>\r
-            <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>\r
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>\r
             <manifestEntries>\r
               <Bundle-Version>${eclipseVersion}</Bundle-Version>\r
               <Bundle-ManifestVersion>2</Bundle-ManifestVersion>\r
index 91c534186b8d44abcf7e4dc3a168b89b158f3850..716581666a5946e8ca278fae39320475dc163796 100644 (file)
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0 \r
 Bundle-ManifestVersion: 1 \r
-Bundle-Name: NuxeoCS\r
-Bundle-SymbolicName: org.collectionspace.collectionobject;singleton:=true \r
+Bundle-Name: org.collectionspace.collectionspace_core\r
+Bundle-SymbolicName: org.collectionspace.collectionspace_core;singleton:=true \r
 Bundle-Version: 1.0.0\r
 Bundle-Localization: plugin\r
-Bundle-Vendor: Nuxeo \r
+Bundle-Vendor: Nuxeo\r
 Require-Bundle: org.nuxeo.runtime, \r
  org.nuxeo.ecm.core.api, \r
  org.nuxeo.ecm.core,\r
@@ -15,7 +15,7 @@ Require-Bundle: org.nuxeo.runtime,
  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.collectionobject\r
+Provide-Package: org.collectionspace.collectionspace_core\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r
  OSGI-INF/layouts-contrib.xml\r
index 72aa5ef1968ac7dc8383ce137f3f3fab9f6c1b31..c19ad0ad2dfac2202c410381285edba77276f89d 100644 (file)
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.coreTypes">
+<component name="org.collectionspace.collectionspace_core.coreTypes">
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="collectionobject" prefix="collectionobject" src="schemas/collectionobject.xsd"/>
+    <schema name="collectionspace_core" prefix="collectionspace_core" src="schemas/collectionspace_core.xsd"/>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="CollectionObject" extends="Document">
+    <doctype name="CollectionSpace_Core" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
-      <schema name="collectionobject"/>
+      <schema name="collectionspace_core"/>
     </doctype>
   </extension>
 </component>
index 541251f1ec1d85f9aac9fd42a1361b46522b8371..687a5a239f7f777196561cbb748d331b41e1402a 100644 (file)
@@ -1,28 +1,27 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.collectionobject.ecm.types">
+<component name="org.collectionspace.collectionspace_core.ecm.types">
   <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="CollectionObject" coretype="CollectionObject">
-      <label>org.collectionspace.collectionobject</label>
+    <type id="CollectionSpace_Core" coretype="CollectionSpace_Core">
+      <label>org.collectionspace.collectionspace_core</label>
       <!--icon>/icons/file.gif</icon-->
       <default-view>view_documents</default-view>
 
       <layouts mode="any">
         <layout>heading</layout>
-        <layout>collectionobject</layout>
+        <layout>collectionspace_core</layout>
       </layouts>        
     </type>
 
     <type id="Folder" coretype="Folder">
       <subtypes>
-        <type>CollectionObject</type>
+        <type>CollectionSpace_Core</type>
       </subtypes>
     </type>
     
     <type id="Workspace" coretype="Workspace">
       <subtypes>
-        <type>CollectionObject</type>
+        <type>CollectionSpace_Core</type>
       </subtypes>
     </type>
-
   </extension>
 </component>
index ee35a77d43fbaefd020ff02d0157aeb860dd4682..279de155309e76aa8cba8030fe3a3e05113939bf 100644 (file)
 <?xml version="1.0"?>
 
-<component name="org.collectionspace.collectionobject.layouts.webapp">
+<component name="org.collectionspace.collectionspace_core.layouts.webapp">
 
   <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
     point="layouts">
 
-    <layout name="collectionobject">
+    <layout name="collectionspace_core">
       <templates>
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
       <rows>
-        <row><widget>objectNumber</widget></row>
-        <row><widget>otherNumber</widget></row>
-        <row><widget>briefDescription</widget></row>
-        <row><widget>comments</widget></row>
-        <row><widget>distFeatures</widget></row>
-        <row><widget>objectName</widget></row>
-        <row><widget>responsibleDept</widget></row>
-        <row><widget>title</widget></row>
+        <row><widget>tenantId</widget></row>
       </rows>
 
-      <widget name="objectNumber" type="text">
+      <widget name="tenantId" type="text">
         <labels>
-          <label mode="any">objectNumber</label>
+          <label mode="any">tenantId</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="collectionobject">objectNumber</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="otherNumber" type="text">
-        <labels>
-          <label mode="any">otherNumber</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">otherNumber</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="briefDescription" type="text">
-        <labels>
-          <label mode="any">briefDescription</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">briefDescription</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="comments" type="text">
-        <labels>
-          <label mode="any">comments</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">comments</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="distFeatures" type="text">
-        <labels>
-          <label mode="any">distFeatures</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">distFeatures</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="objectName" type="text">
-        <labels>
-          <label mode="any">objectName</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">objectName</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="responsibleDept" type="text">
-        <labels>
-          <label mode="any">responsibleDept</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">responsibleDept</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-
-      <widget name="title" type="text">
-        <labels>
-          <label mode="any">title</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="collectionobject">title</field>
+          <field schema="collectionspace_core">tenantId</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionobject.xsd
deleted file mode 100644 (file)
index 651013c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-\r
-<!--\r
-    Older (?) CollectionObject Schema for Nuxeo EP\r
-\r
-    $LastChangedRevision$\r
-    $LastChangedDate$\r
--->\r
-\r
-<xs:schema \r
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-    xmlns:ns="http://collectionspace.org/collectionobject/"\r
-    xmlns="http://collectionspace.org/collectionobject/"\r
-    targetNamespace="http://collectionspace.org/collectionobject/"\r
-    version="0.1">\r
-\r
-    <xs:element name="objectNumber" type="xs:string"/>\r
-    <xs:element name="otherNumber" type="xs:string"/>\r
-    <xs:element name="briefDescription" type="xs:string"/>\r
-    <xs:element name="comments" type="xs:string"/>\r
-    <xs:element name="distinguishingFeatures" type="xs:string"/>\r
-    <xs:element name="objectName" type="xs:string"/>\r
-    <xs:element name="responsibleDepartment" type="xs:string"/>\r
-    <xs:element name="title" type="xs:string"/>\r
-    \r
-</xs:schema>\r
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/schemas/collectionspace_core.xsd
new file mode 100644 (file)
index 0000000..c7f45ea
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+\r
+<!--\r
+    Older (?) CollectionObject Core Schema for Nuxeo EP\r
+\r
+    $LastChangedRevision$\r
+    $LastChangedDate$\r
+-->\r
+\r
+<xs:schema \r
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+    xmlns:ns="http://collectionspace.org/collectionspace_core/"\r
+    xmlns="http://collectionspace.org/collectionspace_core/"\r
+    targetNamespace="http://collectionspace.org/collectionspace_core/"\r
+    version="0.1">\r
+\r
+    <xs:element name="tenantId" type="xs:string"/>    \r
+</xs:schema>\r
index 09b6d94b0e68b65e848a0fb6eb17c2320a3d4836..2b62c2d31a70db289b571b7995272f13dae28b23 100644 (file)
             <version>2.2.2.SP8</version>\r
             <scope>provided</scope>\r
         </dependency>\r
-        <!-- Nuxeo -->\r
-        <!-- Nuxeo Dependencies with versions\r
-        <dependency>\r
-            <groupId>org.nuxeo.common</groupId>\r
-            <artifactId>nuxeo-common</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.runtime</groupId>\r
-            <artifactId>nuxeo-runtime</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.runtime</groupId>\r
-            <artifactId>nuxeo-runtime-osgi</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-api</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-client</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-query</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-schema</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-io</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-facade</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
-        </dependency> -->\r
     </dependencies>\r
 \r
 </project>\r
index 50224fe0de710bee356f349ffecaba76bc9dd057..f8c12e689e1ae052d295d925822e82a859c699f6 100644 (file)
@@ -22,6 +22,7 @@
     </dependencyManagement>
 
     <build>
+<!--
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -34,6 +35,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+-->        
     </build>
 
 </project>
index 0706ccc6dfbbdbbcac078ac6d53818797847ce4c..c9d6821095f839d1c2180f60c681cd713d2a3447 100644 (file)
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;
 import org.jboss.resteasy.plugins.providers.multipart.OutputPart;
+import org.jboss.resteasy.util.HttpResponseCodes;
 
 import org.collectionspace.services.jaxb.AbstractCommonList;
 import org.collectionspace.services.client.CollectionObjectClient;
@@ -65,19 +66,19 @@ public class PerformanceTest extends CollectionSpacePerformanceTest {
        // Get clients for the CollectionSpace services
        //
        /** The MA x_ records. */
-       private static int MAX_RECORDS = 1000;
+       private static int MAX_RECORDS = 1;
 
        /**
         * Performance test.
         */
        @Test
        public void performanceTest() {
-               roundTripOverhead(10);
-               deleteCollectionObjects();
+//             roundTripOverhead(MAX_RECORDS);
+//             deleteCollectionObjects();
                String[] coList = this.createCollectionObjects(MAX_RECORDS);
-               this.searchCollectionObjects(MAX_RECORDS);
-               this.deleteCollectionObjects(coList);
-               roundTripOverhead(10);
+//             this.searchCollectionObjects(MAX_RECORDS);
+//             this.deleteCollectionObjects(coList);
+//             roundTripOverhead(10);
        }
        
        /**
@@ -91,9 +92,15 @@ public class PerformanceTest extends CollectionSpacePerformanceTest {
                CollectionObjectClient collectionObjectClient = new CollectionObjectClient();
                
                long totalTime = 0;
+               ClientResponse<Response> response;
                for (int i = 0; i < numOfCalls; i++) {
-                       Date startTime = new Date();
-                       collectionObjectClient.roundtrip().releaseConnection();
+                       Date startTime = new Date();                    
+                       response = collectionObjectClient.roundtrip();
+                       try {
+                               Assert.assertEquals(response.getStatus(), HttpResponseCodes.SC_OK);
+                       } finally {
+                               response.releaseConnection();
+                       }
                        Date stopTime = new Date();
                        totalTime = totalTime + (stopTime.getTime() - startTime.getTime());
                        System.out.println("Overhead roundtrip time is: " + (stopTime.getTime() - startTime.getTime()));
index e2b0c7c7392757d222abcec9e0b243448a40f481..f2673da1398b41bc3b68a284180b5a7e0a794c67 100644 (file)
@@ -7,6 +7,7 @@
     <doctype name="Acquisition" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="acquisitions_common"/>
     </doctype>
   </extension>
index 77fb0fa7090ca6971c273a00b1676074a91c0d80..3e01a2208effb9bbe1e8432ad0a7a4d735b918a4 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>acquisition</layout>
       </layouts>        
     </type>
index dc146afc8984ef8d94180a81acd981f77e5ef775..d668330b0607790c1d51efa3825ea8f9ac90d52a 100644 (file)
     <description>
         CollectionObject Nuxeo document type
     </description>
-    
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
+<!--                     <includes>
+                               <include>mydog.xml</include>
+                               </includes> -->
                     <archive>
                         <manifestFile> src/main/resources/META-INF/MANIFEST.MF </manifestFile>
                         <manifestEntries>
index 91c534186b8d44abcf7e4dc3a168b89b158f3850..9103c7a00ae7b63d1ca99487117b80251f81aaf6 100644 (file)
@@ -14,7 +14,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.collectionobject\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r
index 9b58b6ea7572995c86a03cd96ab3d56d00829fff..0c7d8a64bb36c276598e16ad87a0e77b02957f21 100644 (file)
@@ -8,6 +8,7 @@
         <doctype name="CollectionObject" extends="Document">
             <schema name="common"/>
             <schema name="dublincore"/>
+            <schema name="collectionspace_core"/>
             <schema name="collectionobjects_common"/>
             <schema name="collectionobjects_naturalhistory"/>
         </doctype>
index 541251f1ec1d85f9aac9fd42a1361b46522b8371..1627222b9260ed09deb84c5da0eba79c3531909f 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>collectionobject</layout>
       </layouts>        
     </type>
@@ -23,6 +24,5 @@
         <type>CollectionObject</type>
       </subtypes>
     </type>
-
   </extension>
 </component>
index 7a4993769a5a4b689f50e08c0a09e4d3bf384129..d9abcdb9cec76b0d47fedfbd96156d07dd136d7a 100644 (file)
@@ -7,6 +7,7 @@
     <doctype name="Contact" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="contacts_common"/>
     </doctype>
   </extension>
index e7aed962022d5a3b7b4604f1b0ada5d43fca9584..f7388999a956c8c5de2e9205aa4787710ebe055b 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>contact</layout>
       </layouts>        
     </type>
index 1d4f1d6ae4c390867d4814be2cc073037227c67e..78c47df0c99b7b745f098a6c04563676ff58de3d 100644 (file)
@@ -14,7 +14,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.dimension\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r
index 5459babc3a5c9bc62f7d53f4e153f5ba09cf3ade..dfc4193cb86603296072c43187dc64ceb8a9b929 100644 (file)
@@ -7,6 +7,7 @@
     <doctype name="Dimension" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="dimensions_common"/>
     </doctype>
   </extension>
index 2e4e78555a37fa303ea46fbfbfa4503372790583..ed2516fdd9ae2ef80c0266434bd7f6e7d46f5c64 100644 (file)
@@ -8,8 +8,9 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>dimension</layout>
-      </layouts>        
+      </layouts>
     </type>
 
     <type id="Folder" coretype="Folder">
@@ -23,6 +24,5 @@
         <type>Dimension</type>
       </subtypes>
     </type>
-
   </extension>
 </component>
index 98b355bb641d79a3a118533dc3616f7b45459026..5ffa7dd830d417900ad31dcee4941303627d354a 100644 (file)
@@ -7,6 +7,7 @@
     <doctype name="Intake" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="intakes_common"/>
     </doctype>
   </extension>
index 39d792cc30d833ddd8f6773896b8f6218985842a..e925cfb47e31925d9ce0165dd1258cec10fe90b9 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>        
         <layout>intake</layout>
       </layouts>        
     </type>
index 97f9fad17e60b4cf8e1ef7518fd146903479ec71..eac1f6ad95642da6cc5ebcbfeb790386b4b05f1c 100644 (file)
@@ -7,6 +7,7 @@
     <doctype name="Loanin" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="loansin_common"/>
     </doctype>
   </extension>
index b4ba6197121fe5a44bd59ab0619dfd07fd251276..4aa04a650938b5a899e0011acec338bd9dc357d2 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>loanin</layout>
       </layouts>        
     </type>
index 4d4171b0bb979e6559ef9e581c3441312fcedf29..a1b016595e190386b6664d46622dae8a94e5e2d8 100644 (file)
@@ -3,10 +3,12 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="loansout_common" prefix="loansout_common" src="schemas/loansout_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Loanout" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="loansout_common"/>
     </doctype>
   </extension>
index 3abdb6d6be71e979e06ed8d71bfbca0938915ac5..497add9f795257d86cc6cd370edc1f16853e7780 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>loanout</layout>
       </layouts>        
     </type>
index 43059a21f168fdb9e2d2ec8a49b9b937e89dcec1..37981944ad0998b5507de88ad2569eaddc5df429 100644 (file)
@@ -3,20 +3,25 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="orgauthorities_common" prefix="orgauthorities_common" src="schemas/orgauthorities_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="organizations_common" prefix="organizations_common" src="schemas/organizations_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Orgauthority" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="orgauthorities_common"/>
     </doctype>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Organization" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="organizations_common"/>
     </doctype>
   </extension>
index e96ec8d3b476e8f758bd6ae74d9650a4bd90654c..079d11c261d04815e342be4fad2b93370e161d44 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>csorgauthority</layout>
       </layouts>        
     </type>
@@ -33,6 +34,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>organization</layout>
       </layouts>        
     </type>
index e8eb9f719dd6d349413a82106113d2b3b2113195..bb073e447e1e0d223ba44ba278ec284829d07655 100644 (file)
@@ -3,20 +3,25 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="personauthorities_common" prefix="personauthorities_common" src="schemas/personauthorities_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="persons_common" prefix="persons_common" src="schemas/persons_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Personauthority" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="personauthorities_common"/>
     </doctype>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Person" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="persons_common"/>
     </doctype>
   </extension>
index 837f0887e1d2854260aa8c586012e494d3606934..39e7897f56da0c5af67454508a31939ccf11c0a4 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>cspersonauthority</layout>
       </layouts>        
     </type>
@@ -33,6 +34,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>person</layout>
       </layouts>        
     </type>
index e444091c5f28fe4541bc9e698b8c35bd8b0609b0..1b47064005d5c388d0d9acfd5c59ad2794566383 100644 (file)
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
-            <version>1.0</version>\r
+            <version>0.7-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>0.5-SNAPSHOT</version>\r
+            <version>0.7-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>0.5-SNAPSHOT</version>\r
+            <version>0.7-SNAPSHOT</version>\r
         </dependency>\r
     </dependencies>\r
     \r
index b017466495274ff73672c050d58ab00fe8e4215b..59033e59c1642660214e8c8a5587d08b23a562f7 100644 (file)
     Description:
         Nuxeo document core type for CollectionSpace Relation
 -->
+
 <component name="org.collectionspace.relation.coreTypes">
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="relations_common" prefix="relations_common" src="schemas/relations_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Relation" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="relations_common"/>
     </doctype>
   </extension>
index 73a5d8016e9c31b1428e8d6bd289dd880ef665eb..16af4920384108cf15b87433f8859bf9b62d8c6c 100644 (file)
@@ -23,6 +23,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>relation</layout>
       </layouts>
     </type>
index 16e331cc8cb93f5907c530114c68471c7415d2a4..bc3e90caaea276f2eade2bb6726963ef90c3bb97 100644 (file)
@@ -3,20 +3,25 @@
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="vocabularies_common" prefix="vocabularies_common" src="schemas/vocabularies_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
     <schema name="vocabularyitems_common" prefix="vocabularyitems_common" src="schemas/vocabularyitems_common.xsd"/>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Vocabulary" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="vocabularies_common"/>
     </doctype>
   </extension>
+  
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Vocabularyitem" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
+      <schema name="collectionspace_core"/>
       <schema name="vocabularyitems_common"/>
     </doctype>
   </extension>
index 754987a801871421723e5174eda59f06ca6ee536..5b10b8df48f552ae63d4326b74231a1a9583e04f 100644 (file)
@@ -8,6 +8,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>csvocabulary</layout>
       </layouts>        
     </type>
@@ -33,6 +34,7 @@
 
       <layouts mode="any">
         <layout>heading</layout>
+        <layout>collectionspace_core</layout>
         <layout>vocabularyitem</layout>
       </layouts>        
     </type>