CSPACE-2902: Some of the changes necessary for a upgrade to Nuxeo 5.3.

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
index bf803dd35d0eaab740539907452f2cb0f7bd80b3..5e4db4b53aec5f13fe824c70590d40d96ff8b8a9 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/pom.xml
@@ -5,7 +5,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
   </parent>\r
 \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
index 2c0df61dd83122dde8cdba5e6cc6d35730ae9cdc..68d7e9bbf166168c7571506e2b0715bf822bd80f 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/META-INF/MANIFEST.MF
@@ -6,19 +6,12 @@ Bundle-Version: 1.0.0
 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
+ org.nuxeo.ecm.core,\r
+ org.nuxeo.ecm.webapp.core\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
- OSGI-INF/querymodel-contrib.xml\r
+ OSGI-INF/layouts-contrib.xml\r
 \r
 \r

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/deployment-fragment.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/deployment-fragment.xml
index 88b94ffd1dba31e899fd8dc1abd291fb1b8550cc..226075b98d5cc6418a9ce5ee3688ac7e83fc4b2c 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/deployment-fragment.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/src/main/resources/OSGI-INF/deployment-fragment.xml
@@ -1,408 +1,10 @@
-<?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>
-
+<?xml version="1.0"?>\r
+<fragment>\r
+\r
+  <extension target="application#MODULE">\r
+    <module>\r
+      <java>${bundle.fileName}</java>\r
+    </module>\r
+  </extension>\r
+  \r
+</fragment>\r

diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 8be6d671a1539db1be056c32155f1de1c8e9c125..ee8e92eb2ae101c6923a31e892d279cdb7eb97e4 100644 (file)
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.3rdparty</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index a62572bf4850454ef7a7c1c283425bda8ede5882..bf2e18226e3cc4cf3f76a03f65d646be5e32c2a7 100644 (file)
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/build.properties b/build.properties
index da2dfffb9c41b24ae7936eb24da3ba01ff40ab3c..5ae8363b7a4d783bbebe92ffcc2ff591d9f04924 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 host=127.0.0.1\r
 #cspace\r
-cspace.release=0.9-SNAPSHOT\r
+cspace.release=0.9.1-SNAPSHOT\r
 cspace.services.release=cspace-services-${cspace.release}\r
 cspace.services.war=cspace-services.war\r
 domain.cspace=cspace\r
@@ -8,7 +8,7 @@ domain.nuxeo=default
 \r
 #nuxeo\r
 #nuxeo.release=5.2.M4\r
-nuxeo.release=5.2.GA\r
+nuxeo.release=5.3.2\r
 nuxeo.ear=nuxeo.ear\r
 nuxeo.system=${nuxeo.ear}/system\r
 nuxeo.plugins=${nuxeo.ear}/plugins\r

diff --git a/pom.xml b/pom.xml
index 029bc736962b48ffb58cffa14427cd593f6a9317..6934da8610e7dd278266ff5a13d53dfa294c78b7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services</artifactId>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
     <packaging>pom</packaging>\r
     <name>services</name>\r
 \r
@@ -14,10 +14,10 @@
         <jboss.version>4.2.3.GA</jboss.version>\r
         <jboss.ejb.version>3.0</jboss.ejb.version>\r
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <nuxeo.version.5.2>5.2.1-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5.1-SNAPSHOT</nuxeo.version.1.5>\r
-        <cspace.services.version>0.9-SNAPSHOT</cspace.services.version>\r
-        <cspace.services.client.version>0.9-SNAPSHOT</cspace.services.client.version>\r
+        <nuxeo.platform.version>5.3.2</nuxeo.platform.version>\r
+        <nuxeo.core.version>1.6.2</nuxeo.core.version>\r
+        <cspace.services.version>0.9.1-SNAPSHOT</cspace.services.version>\r
+        <cspace.services.client.version>0.9.1-SNAPSHOT</cspace.services.client.version>\r
     </properties>\r
 \r
     <distributionManagement>\r

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 169831dbf35cade93db77d652b29caaef9988198..fd106622a27aec87725f31590e41817578a59614 100644 (file)
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 3140db16635eaef70cb69db79c885307eb8a2396..865a3ff5132e5ff8d198b23c6ccbba8753704f89 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -278,48 +278,48 @@
         <dependency>\r
             <groupId>org.nuxeo.common</groupId>\r
             <artifactId>nuxeo-common</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
             <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
             <artifactId>nuxeo-runtime</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-client</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-query</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-schema</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-io</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-facade</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
             <artifactId>nuxeo-runtime-osgi</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+                                               <version>${nuxeo.core.version}</version>            \r
         </dependency>\r
         <dependency>\r
             <groupId>org.osgi</groupId>\r

diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml
index c6a19b3f56b27584c2d697035d55cc06f4eeda46..97019268bf5ccca3e595edbe48b7898586b81496 100644 (file)
--- a/services/PerformanceTests/pom.xml
+++ b/services/PerformanceTests/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index efcc63970f19ef3656733ab2710da1dfa4cd40b2..d9eb67326bab5cb437292a90461a87448864311e 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 7dba4845de39c8558d3e2836a8fed660168b2ff7..b312641b492345f2b1429596da976f41b2ead38c 100644 (file)
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.account</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/account/pom.xml b/services/account/pom.xml
index d64efe56352ef426a5100236bf03ed655241fcfb..064acf283e66ef53c3adcdac55e89e81f05f8bd9 100644 (file)
--- a/services/account/pom.xml
+++ b/services/account/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 060d1654dd7ee10b93d9fd9d6f35fa771734e1af..1b2c3f47e8546ad55ed7e255a28f55e621c64d25 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml
index 824d8a86efd6f7d61ddbd640079339f1109e6e0a..10c81c9c8fa642bcf416e269ff6b86418bbd29c2 100644 (file)
--- a/services/account/service/pom.xml
+++ b/services/account/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.account</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
index 6458da8f02eb26fcbfef8559f7696a34074a9a5d..0c48abed0b3ee685e9ea6ce45ffa019677dcbbfc 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/META-INF/MANIFEST.MF b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/META-INF/MANIFEST.MF
index 15b4aa9838d815f0915974637f7805a25f7d33ce..0d1c26f2b89087bb7e7d22a4ed05edf81a1df070 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.acquisition\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/acquisition/3rdparty/pom.xml b/services/acquisition/3rdparty/pom.xml
index b29e6e5c2271d88ac80d926ffa40951674502484..1dd19e00a1cf288c971eda2c0d3420eca4489fb4 100644 (file)
--- a/services/acquisition/3rdparty/pom.xml
+++ b/services/acquisition/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-        <version>0.9-SNAPSHOT</version> \r
+        <version>0.9.1-SNAPSHOT</version> \r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index d01b7cd0a93e7df3282fccd20257389769bb9205..386c6802f958e485e2e3b8c9f760e7a0bc39fbc0 100644 (file)
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml
index 923a2db923d5413101f727dd82707cc66da5a544..3dd3dfa92e1a8a1279feb3e73b2be8707872eaca 100644 (file)
--- a/services/acquisition/jaxb/pom.xml
+++ b/services/acquisition/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.acquisition</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml
index b619823efc46bebfe5cdd602a207fa268156302b..7a44d285f4176bd8f26b30728b77e49577f6b3ee 100644 (file)
--- a/services/acquisition/pom.xml
+++ b/services/acquisition/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml
index 93be32da1858332ac3481a171201925bb5768263..00ba3aedfc19038f180a28242792e6ee97cc5e70 100644 (file)
--- a/services/acquisition/service/pom.xml
+++ b/services/acquisition/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.acquisition</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml
index 55e17a3109069cc48f2fdaafb537699487216404..1811559e362d81ceb4cf6a126066f4dbc6385b08 100644 (file)
--- a/services/authentication/client/pom.xml
+++ b/services/authentication/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authentication</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 1f5f43b6fdf09d4e53be0e9bc6233e7afa6a44aa..a0f08e98a48f6f04284a5787685ac42746871c90 100644 (file)
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authentication</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml
index f04c55e810562365d3e02bd3aa1d4c7052176a1a..79e6906789a27fcfb127565e9633f73334abb7f5 100644 (file)
--- a/services/authentication/pom.xml
+++ b/services/authentication/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/pstore/pom.xml b/services/authentication/pstore/pom.xml
index 5867c3daf98835c31319a59fc18285738dbba871..07f0524f2f0340c585d7cf590c114a836b6bc807 100644 (file)
--- a/services/authentication/pstore/pom.xml
+++ b/services/authentication/pstore/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authentication</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml
index aada329eeb89233fc86e8e198cf3019718a6ce25..f452db7a7ac8e7f405cc262584ab0510b7cb164c 100644 (file)
--- a/services/authentication/service/pom.xml
+++ b/services/authentication/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.authentication</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index 955e684eb17b4450f757652d6ab9bfad2a6d95f5..efa8dd3cf8e45dea831aa51c5dedd31d8d1d0cbc 100644 (file)
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml
index 79035f3de252b2d7ba30270fe201055aac5eb1b2..53c3ff95e638f1f407250d625ffa08e510c09c64 100644 (file)
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml
index 7c078c98f99514059c800e025e55a3b682eaebb2..f79ac754ade99c8928bfb862ee6f490d501e0b0c 100644 (file)
--- a/services/authorization-mgt/pom.xml
+++ b/services/authorization-mgt/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.collectionspace.services</groupId>

diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index ab436b391812db2ad873c811961d0e1d87975a75..8e99627a2dafc1921087ca0790e04c3f395e2ca3 100644 (file)
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>\r

diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index 7f8a13dab425039b8ba3bbc9c87375402bb2412d..d00d095085989cd1013496d3615855b014258cb2 100644 (file)
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization/pom.xml b/services/authorization/pom.xml
index f01ef6b2420c8db59a3a3b472508d9db793ab891..84173b6032a175abe52b753f0efa7ed66b76d29d 100644 (file)
--- a/services/authorization/pom.xml
+++ b/services/authorization/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization</artifactId>

diff --git a/services/authorization/pstore/pom.xml b/services/authorization/pstore/pom.xml
index 4f71c011f22605ca0fbee90f905d18c65f8e1eb8..9d9d3e3b2de702d78362575a52ee4b151e00c833 100644 (file)
--- a/services/authorization/pstore/pom.xml
+++ b/services/authorization/pstore/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.authorization</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml
index b58ea7ed71abce3fd36770ab461366f876c47d14..14a6e6af6be4bcb5d35aeb918a9b2cfbc9b47ce9 100644 (file)
--- a/services/authorization/service/pom.xml
+++ b/services/authorization/service/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>org.collectionspace.services.authorization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.authorization.service</artifactId>

diff --git a/services/client/pom.xml b/services/client/pom.xml
index 6989d2ad5a883fa6a894175dfbb9fe0f75132d8e..d4a3e386ec9c877fd95be789af5734f204111bb5 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index 748466a8e1d5956cf0d681d4da3b6c3c47fedc11..6e96edcfe00b4f33fcf07cdf3333391057337141 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/README.txt b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/README.txt
index fa8d43880d64eef7a1a395b3f211233d650c5cc4..c1768552b288b8b5e26e8125948eef7fc55fc199 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/README.txt
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/README.txt
@@ -1,6 +1,6 @@
 Copy the following Nuxeo field type declarations to the ..\nuxeo.ear\config\default-repository-config.xml file.  Insert into the existing <schema> element.\r
 \r
- <!-- CollectionObject fields -->\r
+          <!-- CollectionObject fields -->\r
           <field type="largetext">collectionobjects_common:objectNumber</field>\r
           <field type="largetext">collectionobjects_common:otherNumber</field>\r
           <field type="largetext">collectionobjects_common:otherNumberType</field>\r
@@ -102,4 +102,4 @@ Copy the following Nuxeo field type declarations to the ..\nuxeo.ear\config\defa
           <field type="largetext">collectionobjects_common:ownershipExchangePriceValue</field>\r
           <field type="largetext">collectionobjects_common:ownershipPlace</field>\r
           <field type="largetext">collectionobjects_common:usage</field>\r
-          <field type="largetext">collectionobjects_common:usageNote</field>
\ No newline at end of file
+          <field type="largetext">collectionobjects_common:usageNote</field>\r

diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
index b6fdf4de2da4f3d7c44a559258da856f3ced4eb8..e144a09830f6ad1854dca1b24295659ada17bc96 100644 (file)
--- a/services/collectionobject/3rdparty/pom.xml
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 2a5f14547ab7de57f00f3ed527864414fc877ced..571e15eb22e3c44d518f1603b3097faf16938fbf 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index f5c7d3d8c983eb5febd04a06f972ba33e4893302..65e6fc9801e1bacc0d35a405211be60d26f137e2 100644 (file)
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.collectionobject</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
index 3da1c0b9db0c10b297c78a13ddc79270d088453b..58df0561eca768d904eff2f969be59c7b0a55f1b 100644 (file)
--- a/services/collectionobject/pom.xml
+++ b/services/collectionobject/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>        \r
+        <version>0.9.1-SNAPSHOT</version>        \r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/collectionobject/sample/pom.xml b/services/collectionobject/sample/pom.xml
index 47a59b3403986ef3c6cb525622860f95cf9cd2f3..3f8a386922c8850d07886dfaa15058477e34ee04 100644 (file)
--- a/services/collectionobject/sample/pom.xml
+++ b/services/collectionobject/sample/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.collectionobject.client.samples</artifactId>
     <packaging>pom</packaging>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
     <name>collectionobject.client.samples</name>
 
     <modules>

diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index c747c880bc55f4591987fd74a8b403d912f6fc8f..5540df7d20f88b6478f4a842466e22b448f19792 100644 (file)
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.collectionobject.client.sample</artifactId>
     <packaging>jar</packaging>
     <name>collectionobject.client.sample</name>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
     
     <dependencies>
         <!-- keep slf4j dependencies on the top -->

diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
index 9fd0452cd54ab6466af0a507222c847f6d678e7a..7a321744ad0a5f488d291b556f1dbc45705b5586 100644 (file)
--- a/services/collectionobject/service/pom.xml
+++ b/services/collectionobject/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -114,7 +114,6 @@
         <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

diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
index 8712eb75cd6223bef8a3c66dd55034fcbde81fb8..ba36b87243479e0915d7c0d947d6c473967a9bdd 100644 (file)
--- a/services/common-test/pom.xml
+++ b/services/common-test/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.common-test</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
     <name>services.common-test</name>
     <url>http://maven.apache.org</url>
     <packaging>jar</packaging>

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 1fc0686724b31d6d94d514b888e820aa2c0f561f..a9b93074d292bab67cb79ab7d9fa08616ab69d30 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -169,53 +169,53 @@
            <dependency>\r
              <groupId>org.nuxeo.ecm.platform</groupId>\r
              <artifactId>nuxeo-platform-imaging-api</artifactId>\r
-             <version>${nuxeo.version.5.2}</version>\r
+             <version>${nuxeo.platform.version}</version>\r
            </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.common</groupId>\r
             <artifactId>nuxeo-common</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
             <scope>provided</scope>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
             <artifactId>nuxeo-runtime</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-client</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-query</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-schema</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-io</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-facade</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
             <artifactId>nuxeo-runtime-osgi</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
+            <version>${nuxeo.core.version}</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.osgi</groupId>\r

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
index e1010bc4065bfaf42dd7e662c8a615354458bbba..7e8f199ef50f9f5bf2d875c68b9c2481c37d1494 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/META-INF/MANIFEST.MF b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/META-INF/MANIFEST.MF
index 1e07ceba73dfb69cd22adeaef53d661ff1434bac..adad8971ed8313da2741f71214d2f1932517e571 100644 (file)
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  org.nuxeo.ecm.platform.versioning.api,
  org.nuxeo.ecm.platform.ui,
  org.nuxeo.ecm.platform.forms.layout.client,
- org.nuxeo.ecm.platform.publishing.api,
- org.nuxeo.ecm.platform.ws 
+ org.nuxeo.ecm.platform.ws,
+ org.collectionspace.collectionspace_core 
 Provide-Package: org.collectionspace.contact
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,
  OSGI-INF/ecm-types-contrib.xml,

diff --git a/services/contact/3rdparty/pom.xml b/services/contact/3rdparty/pom.xml
index c8825f2297f9c6379b4146728f896de7048b8922..8d8a1f2614d2d5839d574c7000932774beded0de 100644 (file)
--- a/services/contact/3rdparty/pom.xml
+++ b/services/contact/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml
index 86c96299fb41c8b02f1793e716ae996628bc1576..155ae214c3f19cff8ef05f72e9dc6954f5176a40 100644 (file)
--- a/services/contact/client/pom.xml
+++ b/services/contact/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index 66b9e5a84827cad76e1bcec4beabcfcdc4692319..83fc82c2749f7b27fb90fbe2b7179d2c08d88cc4 100644 (file)
--- a/services/contact/jaxb/pom.xml
+++ b/services/contact/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.contact</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/pom.xml b/services/contact/pom.xml
index abbc0e909bd50ace432e52cb33126a400a9b2b1e..6e787de785393f9a934b82f71e8d7b9c06b00b2d 100644 (file)
--- a/services/contact/pom.xml
+++ b/services/contact/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml
index 54405bbacf32031916f46aecbf2443c4b3471cc8..96b3dd209b98d49309163d2dda87505b33419ddf 100644 (file)
--- a/services/contact/service/pom.xml
+++ b/services/contact/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>org.collectionspace.services.contact</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -72,7 +72,6 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>${nuxeo.version.1.5}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
index 7818fae8a120474cb19c1ab0a658069a4d5163a9..c07eb5a527419a933be8e3be185cd3cd82968c92 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
index 78c47df0c99b7b745f098a6c04563676ff58de3d..4f1e9dad3d052a704a5813735a7d389b9e2e88ad 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/META-INF/MANIFEST.MF
@@ -6,15 +6,9 @@ Bundle-Version: 1.0.0
 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
+ org.nuxeo.ecm.core,\r
+ org.nuxeo.ecm.webapp.core,\r
  org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.dimension\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r

diff --git a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml
index 88b94ffd1dba31e899fd8dc1abd291fb1b8550cc..226075b98d5cc6418a9ce5ee3688ac7e83fc4b2c 100644 (file)
--- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml
+++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/src/main/resources/OSGI-INF/deployment-fragment.xml
@@ -1,408 +1,10 @@
-<?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>
-
+<?xml version="1.0"?>\r
+<fragment>\r
+\r
+  <extension target="application#MODULE">\r
+    <module>\r
+      <java>${bundle.fileName}</java>\r
+    </module>\r
+  </extension>\r
+  \r
+</fragment>\r

diff --git a/services/dimension/3rdparty/pom.xml b/services/dimension/3rdparty/pom.xml
index 1db901c2add62609f7e5a4ee6a2501340576ee4e..c44846d40513fe492b160ccb38a95297f177368c 100644 (file)
--- a/services/dimension/3rdparty/pom.xml
+++ b/services/dimension/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index 4a81cc8366a256ad41548b2d2fb4b1773805420c..40ac673e0a0411410f51aa162730b40d6ea9d5b3 100644 (file)
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index 1b397bd13265af99d3145541632f2222a5ded286..502b48c69b4e62f9e9f00a76d75335cdcc8a908c 100644 (file)
--- a/services/dimension/jaxb/pom.xml
+++ b/services/dimension/jaxb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.dimension</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml
index 4f109c80259d610dd495ce8bf719d738cb464b20..deb169101f194dc904f5e8c655e8519c5b81d106 100644 (file)
--- a/services/dimension/pom.xml
+++ b/services/dimension/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml
index 4abf06ca17a8e4df615d173bb1576a48e20d34a5..f77032e892fcd91ee8798df4e309a001f728c3d7 100644 (file)
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.dimension</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -79,7 +79,7 @@
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
+            <version>${nuxeo.core.version}</version>\r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r

diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml
index 07cbbd9fd0e9aebd6a0a50370fe7312dccb7a9ad..18a43f3cf84b4fbc891f0fc5ea6ea96df84a0eb3 100644 (file)
--- a/services/hyperjaxb/pom.xml
+++ b/services/hyperjaxb/pom.xml
@@ -26,7 +26,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.main</artifactId>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
   </parent>\r
   \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml
index 7921d4abea40b702ae66203fbe2691f401f70ad3..1417424f149c36acf7f1616bdac23cd851cd3555 100644 (file)
--- a/services/id/3rdparty/pom.xml
+++ b/services/id/3rdparty/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.id</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
         
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml
index 642e3228c1bbea826a9aa55ca36f70da7ce996dc..8ff0044995478f950be05550dc7a254d31bb653e 100644 (file)
--- a/services/id/client/pom.xml
+++ b/services/id/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.id</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index d6d3a70a8ee685e90e2e7be889b95ed8cc473ac7..c08292a421d8560e481d336c99f477820d5ed36a 100644 (file)
--- a/services/id/jaxb/pom.xml
+++ b/services/id/jaxb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.id</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/pom.xml b/services/id/pom.xml
index 7a314405c962d429628cc519b284eaa99c27cb09..035a8d55f396a4633745113b88bba64bee82c3ae 100644 (file)
--- a/services/id/pom.xml
+++ b/services/id/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.main</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 9d2cf58ee9879a7527f63c8dbe672d6bff4ffa8b..a1d2f2ab129b4d86dcaf53b1fb378fd2970d884e 100644 (file)
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>org.collectionspace.services.id</artifactId>
     <groupId>org.collectionspace.services</groupId>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
index fd9edfe4ced233774160b1d12bc0661654edc306..eadfc6d61d73b6ebdc09dfc680e54fa6256da6e9 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

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
index 653a89146783e7bfd503f62ace8cc75ca1a18604..e6dca8069d9703a251772d3336777dfeafc03b13 100644 (file)
--- 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
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.intake\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/intake/3rdparty/pom.xml b/services/intake/3rdparty/pom.xml
index 47aee15ef75c6bc0cb722fdac674cd7185f23517..d23d34dd69e5056e83d17fc6870fad321a2a0d42 100644 (file)
--- a/services/intake/3rdparty/pom.xml
+++ b/services/intake/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index 0b5a2886c42b04c281444acc643821e111a4e458..676a8675cdcd780d3139235efa584dede4589f8e 100644 (file)
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.intake</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index 4e330f4fcba49f3081dc788074d780d4cef7034a..31b88fce4de4abbd682ad6fe29e9bc9a642ce8f6 100644 (file)
--- a/services/intake/jaxb/pom.xml
+++ b/services/intake/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.intake</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/intake/pom.xml b/services/intake/pom.xml
index 25034ac51cd5127fe588878630e003c486738a0f..fc993c09d109c03484d175c9d352fdf1a74bf33a 100644 (file)
--- a/services/intake/pom.xml
+++ b/services/intake/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index 98ee9f9889e382e5ef401d4582fd59886f5778d0..4041b8f5e3bfab1453f92355b92c51e0d29eec3a 100644 (file)
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.intake</artifactId>        \r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -84,7 +84,7 @@
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
+            <version>${nuxeo.core.version}</version>       \r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r

diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index 4ce8af4ab66776af67d9e19becad635c09d597e3..e19a0b7033c37bf841ffddb2d59be0c5fc078508 100644 (file)
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -26,7 +26,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.main</artifactId>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
   </parent>\r
   \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
index 9748a4d406fc4a221e92f32a7d3c8b8f6e24b63f..7db785a8d37de2c5e0ea911e1754ab80106daf0d 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/META-INF/MANIFEST.MF b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/META-INF/MANIFEST.MF
index 72d9e5949372dac873c9ac043a003f9add6752cd..9e4a8f670ea445dd1bb0fb6153635424067265a6 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.loanin\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/loanin/3rdparty/pom.xml b/services/loanin/3rdparty/pom.xml
index 86a574f75868ff342c8bc064103abc6f807eb524..1d41f49c675e04c1fe97c5b6e9cae2eb755a426c 100644 (file)
--- a/services/loanin/3rdparty/pom.xml
+++ b/services/loanin/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanin</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml
index 103b598aed5f2ad0bcd96d8d82118fdaadd03d80..f0ed76a0eb776302755fcc42a260b616a8b5e3a2 100644 (file)
--- a/services/loanin/client/pom.xml
+++ b/services/loanin/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml
index 4ca2c0762a08620b399252776c6c87b610f72876..f492dfb93356011687b2bb27843671ff6a696eca 100644 (file)
--- a/services/loanin/jaxb/pom.xml
+++ b/services/loanin/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanin</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml
index da936b745b24474f3523c1b28ba9a03c3e72d7a1..75b05dde21b1daac84dd409f671b346f9382d196 100644 (file)
--- a/services/loanin/pom.xml
+++ b/services/loanin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml
index 8709eabd3809db14ee9b1e149f4661e0322312e5..16c3ab1b6017bd1862ba7cf10db06aec0d314e4f 100644 (file)
--- a/services/loanin/service/pom.xml
+++ b/services/loanin/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanin</artifactId>        
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>${nuxeo.core.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
index 710ae4ea132e84a009ed9a18d23a82739e00afe2..80aafbf53a958e7eccc59359a6a2463b65b9a1f6 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/META-INF/MANIFEST.MF b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/META-INF/MANIFEST.MF
index 69f1fdf21796aa770fd92af973d27dc634c07b80..252625c1b9c44e9027a2f7a7b23d737aa4af91ca 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.loanout\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/loanout/3rdparty/pom.xml b/services/loanout/3rdparty/pom.xml
index f1022bce7ba94c2413e92d664e5da1ef5ce40456..bf1eb0c46ace709e12eb80b5a4e79555da2a92ea 100644 (file)
--- a/services/loanout/3rdparty/pom.xml
+++ b/services/loanout/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanout</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml
index c6e7b6fe00c50ad13d63095688c0b256ffb3d86d..e5e5b0e12e694040862b208df5e2596034ab4d84 100644 (file)
--- a/services/loanout/client/pom.xml
+++ b/services/loanout/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml
index 1ceacf7661e9a0b8f2a0e5b2453487894e2e4ead..e2a84515eee97f9a8c3cefb8f5f30cf848497b6d 100644 (file)
--- a/services/loanout/jaxb/pom.xml
+++ b/services/loanout/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.loanout</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml
index c5d82b5f5837103339dae123caa192c0c7c7710f..63493b722fcb8c7c4302db0c4992c3a66ccd3327 100644 (file)
--- a/services/loanout/pom.xml
+++ b/services/loanout/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml
index 943f885c12e3add3ce282074e531e927e9d7675b..4a07d31644b085cc8894fcb326a50c7b85be0f3c 100644 (file)
--- a/services/loanout/service/pom.xml
+++ b/services/loanout/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.loanout</artifactId>        
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>${nuxeo.core.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>

diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
index a67b66bdac00c176a214950ba392c09d89c50067..19e4631217e53aa749b557c5c86a5bd146d21a49 100644 (file)
--- a/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/META-INF/MANIFEST.MF b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/META-INF/MANIFEST.MF
index d16df5ae43828a2bb5b2698add635ecc684bf118..90e1a23caeb4a42ebcffea0bebc37c37b20f2fcf 100644 (file)
--- a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.location\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/location/3rdparty/pom.xml b/services/location/3rdparty/pom.xml
index a78fe20282bfde103f1e46ec9ff9680212c09765..8881c58d85ee542ce42f4818ce299e84aee8d761 100644 (file)
--- a/services/location/3rdparty/pom.xml
+++ b/services/location/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml
index f641f0a45c4a87eb19725fec318300be220bdd6c..cacbb80a207ad3832ab7bb22aac51a54f53bedcd 100644 (file)
--- a/services/location/client/pom.xml
+++ b/services/location/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/import/pom.xml b/services/location/import/pom.xml
index 7029242b77c9618d5cd056ff97523bc7e5b29dad..736ea157a5c4f9227bd1c3f4390c1ef071e55ce0 100644 (file)
--- a/services/location/import/pom.xml
+++ b/services/location/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml
index dc2d5f6719964dadbe3908b4222ef499698ea264..b253e0614eb8473370e6f58a20434dac2bd30996 100644 (file)
--- a/services/location/jaxb/pom.xml
+++ b/services/location/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.location</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/location/pom.xml b/services/location/pom.xml
index b9601b158c8b97db25d02a6936999a7d79cf3152..4a8f1f346426c6f8f9ce0c24704e828ad9680583 100644 (file)
--- a/services/location/pom.xml
+++ b/services/location/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/location/service/pom.xml b/services/location/service/pom.xml
index de57333680a962e929eb181ff11fa77ebfe63b4d..a0f8d27c2eb932ef75d8579deed2425a12e7ef31 100644 (file)
--- a/services/location/service/pom.xml
+++ b/services/location/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.location</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -105,7 +105,6 @@
         <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

diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
index 70a81939a446df3236cc5f8accec68314e653b1c..fef326751a397b045e806d1ac4bf9b771f4a2c6b 100644 (file)
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/3rdparty/nuxeo-platform-cs-movement/src/main/resources/META-INF/MANIFEST.MF b/services/movement/3rdparty/nuxeo-platform-cs-movement/src/main/resources/META-INF/MANIFEST.MF
index f7e87c2892cea3b39029a66dbac198e0f356aa85..c42ef54d4ceb8a275a6887086faf0ffc2b86fb4f 100644 (file)
--- a/services/movement/3rdparty/nuxeo-platform-cs-movement/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/src/main/resources/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: org.nuxeo.runtime,
  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
  org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.movement\r

diff --git a/services/movement/3rdparty/pom.xml b/services/movement/3rdparty/pom.xml
index 67a17bd9c42deda0517410b447ddf203334fc453..d101c62d2e9de383bf9a9c5e0f3bce9f9d5c6f2d 100644 (file)
--- a/services/movement/3rdparty/pom.xml
+++ b/services/movement/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.movement</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/client/pom.xml b/services/movement/client/pom.xml
index bbc2e396c8e98675c46a1726b8fe76099fed0bac..6986c8a81adec34e08839e5875407a8b856813f0 100644 (file)
--- a/services/movement/client/pom.xml
+++ b/services/movement/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml
index 826b9c2582731df48aa220fa7fc8e841a1c71e0c..12597e30da44a226885608879cf28abde4b9e87a 100644 (file)
--- a/services/movement/jaxb/pom.xml
+++ b/services/movement/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.movement</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/pom.xml b/services/movement/pom.xml
index 49efb0b90d99eb88c5730558ce84fa39dc6fba06..62a0adb031b9bcb3f67c7627a24ae3325ae525ff 100644 (file)
--- a/services/movement/pom.xml
+++ b/services/movement/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/movement/service/pom.xml b/services/movement/service/pom.xml
index 5b5c8cd4311ff1df4e8b365547b5cd27682e9579..374f01d7f67094ed91630380ad772037681eb8a7 100644 (file)
--- a/services/movement/service/pom.xml
+++ b/services/movement/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.movement</artifactId>        
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>${nuxeo.core.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>

diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
index 2495a0d9d46bcc0059e721fd1f1af4a96233a3f1..fc22083b73fa085775b99f06d3efb93af357e65e 100644 (file)
--- a/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.note.3rdparty</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/META-INF/MANIFEST.MF b/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/META-INF/MANIFEST.MF
index bfac8ce58a526433ade15f167f1db38c1b660250..50d35a9dc37b79d65c0c9633afa2c81066ad2c6b 100644 (file)
--- a/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/note/3rdparty/nuxeo-platform-cs-note/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.note\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/note/3rdparty/pom.xml b/services/note/3rdparty/pom.xml
index e2be2ba21de5707b4ff97086898cc5199720af73..54d58ef38fff5e13ff2560a12adb0f2d4418ecda 100644 (file)
--- a/services/note/3rdparty/pom.xml
+++ b/services/note/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/client/pom.xml b/services/note/client/pom.xml
index 2f749b6783a50d0fe2870fad87b1b55cab622055..62f08642df1a0bf23c41054a48db1b5eaec716c2 100644 (file)
--- a/services/note/client/pom.xml
+++ b/services/note/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml
index 76da07f29cd1ddb85b106304b9d4931924cd7945..d5f3131a967493c7c2c07cedaf15a765ed58c8d4 100644 (file)
--- a/services/note/jaxb/pom.xml
+++ b/services/note/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/pom.xml b/services/note/pom.xml
index efd4473a86feaf01c037266878cdf083d374bd91..3d73777c44538cd3a2367c15e941265ba1d6762c 100644 (file)
--- a/services/note/pom.xml
+++ b/services/note/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/note/service/pom.xml b/services/note/service/pom.xml
index 4025946928717b96888f14d1285d96aa6e419d8b..2e01693e243692957609abe32fdec22a854579ac 100644 (file)
--- a/services/note/service/pom.xml
+++ b/services/note/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.note</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -72,7 +72,6 @@
         <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

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
index f5b81d3d70f0d0c23271a04a0af66182fa585f06..20982f0c43b0327cb5945b31a736b0783040704e 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF
index 8f3c23e5d5b23aae7d3e9c23498b3c4fbee29573..7f0f3243e1a8f0bf6396a6a6edb5374263ac84b1 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.objectexit\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/objectexit/3rdparty/pom.xml b/services/objectexit/3rdparty/pom.xml
index c97a0e5edd62ca1afae98810ddedd305a63afe1f..f034ad2a848384b8ebb544535c1ba68fa8d47bbf 100644 (file)
--- a/services/objectexit/3rdparty/pom.xml
+++ b/services/objectexit/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/client/pom.xml b/services/objectexit/client/pom.xml
index 485e07a0ec0bf13110db0ca069ab9050df726919..6c9041a7a709c55038cd3479757002f770c095b1 100644 (file)
--- a/services/objectexit/client/pom.xml
+++ b/services/objectexit/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml
index 34dd42db2f3a97efb916a6c887545a280d446061..730f390c7be658892c072a56464bed35fc648915 100644 (file)
--- a/services/objectexit/jaxb/pom.xml
+++ b/services/objectexit/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.objectexit</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/pom.xml b/services/objectexit/pom.xml
index ad8043b1ebbdcf44e480ac53e4b7480ffb42ed5a..5f44ae24c59f851e49a47cb48d6e1c6b1ddb3dee 100644 (file)
--- a/services/objectexit/pom.xml
+++ b/services/objectexit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.main</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/objectexit/service/pom.xml b/services/objectexit/service/pom.xml
index 1f4f5d2879b4ad8521c55f4b32be58d40d784efb..766183aebc9d80f38f16a029caaefd0e982d2cf5 100644 (file)
--- a/services/objectexit/service/pom.xml
+++ b/services/objectexit/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.objectexit</artifactId>        
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>${nuxeo.core.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
index 30bb558c07b2b936827452cbb5ff7e50d630e4f0..45c5c6fbc7bcc4cd9b0a8e25151dc06979129867 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.organization.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/META-INF/MANIFEST.MF b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/META-INF/MANIFEST.MF
index 8113da6c17127093b8ac0324b623b7975d953f42..1a657f7967e8f990fbeb1118f1b911ae581dff10 100644 (file)
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.organization\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/organization/3rdparty/pom.xml b/services/organization/3rdparty/pom.xml
index 0f47efc26348f60c5955adfca8d888a36ac3ae54..443744684106e759e4a53b75dd4b5e2fbe15a625 100644 (file)
--- a/services/organization/3rdparty/pom.xml
+++ b/services/organization/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml
index 3420dbb4fd2c7f20a70fdff1b5a8d4e6a3568c15..76b44fd609026fbf4183a350ebb72592035d1300 100644 (file)
--- a/services/organization/client/pom.xml
+++ b/services/organization/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml
index b92a9adefb2b1f7a1d3e470d1c16c415b2eeb640..aff107142f676f5863e56475b0ab9bd774e46667 100644 (file)
--- a/services/organization/import/pom.xml
+++ b/services/organization/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index f2ab25e5b0f2ddd67e4736a85224b9896ef86859..3baf31dc2709295c38886d415f526698b4a9610c 100644 (file)
--- a/services/organization/jaxb/pom.xml
+++ b/services/organization/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.organization</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/organization/pom.xml b/services/organization/pom.xml
index d65ffd7e8c5bb519d4a502294112c47e0eae5c3c..5bebc129484bfb307946b8c5f654ba606a62b18a 100644 (file)
--- a/services/organization/pom.xml
+++ b/services/organization/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/organization/sample/sample/pom.xml b/services/organization/sample/sample/pom.xml
index 062cfd7454625b177294d96e4cb8e8f98f579a14..1b400012f7defdaee6d3d743ca437d9deaf2d26b 100644 (file)
--- a/services/organization/sample/sample/pom.xml
+++ b/services/organization/sample/sample/pom.xml
@@ -11,17 +11,17 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.jaxb</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.organization.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
     </dependencies>\r
     \r

diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml
index cc10a20447866157e20512c827f24d64fbfcc71f..1c834ed364d694219f26dec0f029306da65ad04b 100644 (file)
--- a/services/organization/service/pom.xml
+++ b/services/organization/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.organization</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -105,7 +105,6 @@
         <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

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
index e703d0c84d04345f628049e34ef9ae8bad265259..552cfc55593b4cfb3a0123ac669e830ffd12fdcd 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.person.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/META-INF/MANIFEST.MF b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/META-INF/MANIFEST.MF
index a1c679336190727590e405eb1c1636bc72b07817..153d0c20ccffaaf9fbd39812523c97ab46715748 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.person\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/person/3rdparty/pom.xml b/services/person/3rdparty/pom.xml
index c0adc6e89064a5eac62c7e879ce1786beb5da840..bbba1b598d221e19c734128f37aa1c6aaa81621b 100644 (file)
--- a/services/person/3rdparty/pom.xml
+++ b/services/person/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml
index e17f28ac2e6170efe53a9ff5675a796969eceeef..aebccf1675a9a67e38b7085a3949d027253af1b0 100644 (file)
--- a/services/person/client/pom.xml
+++ b/services/person/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml
index c386241bc0bfc287f41fd7573ae04737f098ba3e..4504489de7e5d61e574ecfed367c6c5cc77e8ccd 100644 (file)
--- a/services/person/import/pom.xml
+++ b/services/person/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index 2c2ae77f1a592f9dbcf36ff6e8b302b51ac24947..19271e08ab3efcb005770799bf4f3a6cbb12d4b9 100644 (file)
--- a/services/person/jaxb/pom.xml
+++ b/services/person/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.person</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/person/pom.xml b/services/person/pom.xml
index fe46d849e58c4f86b376962fa07f5aaa6499d524..99c85ccffdbbd539982edad0d24094f48dbf219e 100644 (file)
--- a/services/person/pom.xml
+++ b/services/person/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/person/sample/sample/pom.xml b/services/person/sample/sample/pom.xml
index c76ed73e47403c05c8e2a45b51727a87f4ef4e91..4e0d015d46aa5c52d9975e63c55e127bdb765850 100644 (file)
--- a/services/person/sample/sample/pom.xml
+++ b/services/person/sample/sample/pom.xml
@@ -11,17 +11,17 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
     </dependencies>\r
     \r

diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml
index 474d7fdc156ca9c99c205ad1f3d3f28ab267e634..526f4f1f17d93c21212f32005faf88ab69a81d64 100644 (file)
--- a/services/person/service/pom.xml
+++ b/services/person/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.person</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -105,7 +105,6 @@
         <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

diff --git a/services/pom.xml b/services/pom.xml
index e8b6497797c8305628640b151a257331d94187c8..5ee84607959af4e688d9bce137209ae4921f753b 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -228,6 +228,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+                       <dependency>
+                   <groupId>org.nuxeo.ecm.core</groupId>
+                   <artifactId>nuxeo-core-api</artifactId>
+                   <version>${nuxeo.core.version}</version>            
+            </dependency>
             <dependency>
                 <groupId>net.java.dev.jaxb2-commons</groupId>
                 <artifactId>jaxb-fluent-api</artifactId>

diff --git a/services/query/pom.xml b/services/query/pom.xml
index d361b070ceaf3a5bd7d71f9722613f8f6a932190..31a7f5fecdfeac9d789f12340ced2de09397a155 100644 (file)
--- a/services/query/pom.xml
+++ b/services/query/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml
index 7ef87b8534d6eede98890b0dc4e0ec91c9cefa82..47564a4202cdc960159939a9f82c767f5a158407 100644 (file)
--- a/services/query/service/pom.xml
+++ b/services/query/service/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.query</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
index af14831ee0f8783be996a001cf5709d84823d998..31917a86d3ccd7e622ac74019a2e95ff59ce84ca 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>org.collectionspace.services</groupId>\r
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
   </parent>\r
 \r
   <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/META-INF/MANIFEST.MF b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/META-INF/MANIFEST.MF
index bb28362a3b38a4dcadab99a14194bc6b0c7b85fa..da60069061f5ec5783e9ab08310221ba1593a2fd 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.relation\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/relation/3rdparty/pom.xml b/services/relation/3rdparty/pom.xml
index 9079da84c706939a7141b7d330713686f3cb5952..ddd9683b1d41959b9074de8f92509e0f4ae18f93 100644 (file)
--- a/services/relation/3rdparty/pom.xml
+++ b/services/relation/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.relation</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index cce3d0b9098eb8a1e86f76c11b35da1b33f3d099..b6779a1fb0508a48ce09825bc2f8c30fbcecb1ed 100644 (file)
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.relation</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/pom.xml b/services/relation/pom.xml
index 9a074584cdddaafd612b58a845cb5de0223ae3ef..7c28e0bb12877b9dd5e214a43241e9826f14840f 100644 (file)
--- a/services/relation/pom.xml
+++ b/services/relation/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml
index eca93a63489e1edbb0c54be9848a9b6645ab921e..f979ff0bd68e76e7609655341c47492c8c8fbfca 100644 (file)
--- a/services/relation/service/pom.xml
+++ b/services/relation/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.relation</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -80,7 +80,6 @@
         <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

diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
index 770570ce2653190417a3b8ec51e13e3965814555..90fab5fd026d41350224715f88d707e71e04ccea 100644 (file)
--- a/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.report.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/META-INF/MANIFEST.MF b/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/META-INF/MANIFEST.MF
index bd8a413c4302c8dd41bb906eee2824801f210f0a..bb46db007ba765d134bc8cc0f850ea8177dc4e7c 100644 (file)
--- a/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/report/3rdparty/nuxeo-platform-cs-report/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.report\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/report/3rdparty/pom.xml b/services/report/3rdparty/pom.xml
index 2cb1c17ea9fd531893b31d140f3fcef16e003043..4a6a6c384bfe5ec1c8d7657cd4f6b8da636bc688 100644 (file)
--- a/services/report/3rdparty/pom.xml
+++ b/services/report/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.report</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/client/pom.xml b/services/report/client/pom.xml
index b2839b70993aad0005eef9efa97b73dc1540d72c..7de851e31314f780c693321666c4d7345149a63b 100644 (file)
--- a/services/report/client/pom.xml
+++ b/services/report/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.report</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml
index f4c3421e20309dcdc5110f35216919a687947b08..a32162e942f69417485cccd7dd8f1c3a887c5171 100644 (file)
--- a/services/report/jaxb/pom.xml
+++ b/services/report/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.collectionspace.services.report</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/report/pom.xml b/services/report/pom.xml
index e45371541887583acf1b8e7bc692a7cf24082bb4..9ec49a1ecba17ab4e348bfaca62138c8f6a92dc1 100644 (file)
--- a/services/report/pom.xml
+++ b/services/report/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/report/service/pom.xml b/services/report/service/pom.xml
index 3b0e7969031f4c2979411e7aa625b805cc466fc6..bded0af524872469df2ecfe399760ccd00add64d 100644 (file)
--- a/services/report/service/pom.xml
+++ b/services/report/service/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.report</artifactId>        \r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -84,7 +84,7 @@
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
-            <version>1.5.1-SNAPSHOT</version>\r
+            <version>${nuxeo.core.version}</version>\r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r

diff --git a/services/sdk/pom.xml b/services/sdk/pom.xml
index 97e231a1d506345578bfd742ccfe36f5e2950d5a..255566919d7f955933a6b81fb8707ed7409b9503 100644 (file)
--- a/services/sdk/pom.xml
+++ b/services/sdk/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>org.collectionspace.services.sdk</artifactId>\r
     <packaging>pom</packaging>\r
     <name>services.sdk</name>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
     \r
     <distributionManagement>\r
         <repository>\r

diff --git a/services/sdk/sample/pom.xml b/services/sdk/sample/pom.xml
index 372e6d1762dbda2d30463ca3a77af77b89d10b16..9f43c8a65bc74d3d84cb26c4ce0fc745c8f06526 100644 (file)
--- a/services/sdk/sample/pom.xml
+++ b/services/sdk/sample/pom.xml
@@ -5,13 +5,13 @@
     <artifactId>org.collectionspace.services.client.sample</artifactId>\r
     <packaging>jar</packaging>\r
     <name>client.sample</name>\r
-    <version>0.9-SNAPSHOT</version>\r
+    <version>0.9.1-SNAPSHOT</version>\r
     \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r

diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml
index 195028625e8e642b2118a27421293d522c264eca..31672c601d84284d73eb220dd560e4792d376473 100644 (file)
--- a/services/security/client/pom.xml
+++ b/services/security/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.security</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/security/pom.xml b/services/security/pom.xml
index d745e9b9c92d0250129b5eef44e6efe7a72dd880..a376ccd16de5f1cd59fd9be901102971495b2733 100644 (file)
--- a/services/security/pom.xml
+++ b/services/security/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
index 0e8a1eeaa7c17906b3e6a5295fa6bc86d249eb07..a3c23cb402db2624740ad7a5f4f5353c2584213e 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/META-INF/MANIFEST.MF b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/META-INF/MANIFEST.MF
index dc2b0b1ee53fe42a37927b7919812fef595dfc7c..58e102b0f3e4a023f1fd6c6db820d5e75612e8e7 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/META-INF/MANIFEST.MF
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.nuxeo.runtime,
  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
+ org.nuxeo.ecm.platform.ws,\r
+ org.collectionspace.collectionspace_core\r
 Provide-Package: org.collectionspace.vocabulary\r
 Nuxeo-Component: OSGI-INF/core-types-contrib.xml,\r
  OSGI-INF/ecm-types-contrib.xml,\r

diff --git a/services/vocabulary/3rdparty/pom.xml b/services/vocabulary/3rdparty/pom.xml
index 6b0239f7df3ce826e85d3faad99050d834e265b2..2d9afbd03391608033a9ead092ca89e361406ba5 100644 (file)
--- a/services/vocabulary/3rdparty/pom.xml
+++ b/services/vocabulary/3rdparty/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml
index 72e55e5b0a4b0bc55d7555d0e9720bd0f9c5423f..dc0e4bea1cb375bb607e0a05009296b54b4fa0f3 100644 (file)
--- a/services/vocabulary/client/pom.xml
+++ b/services/vocabulary/client/pom.xml
@@ -6,7 +6,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml
index d9621a5f8e4d67f0a411f84b056761b9f62ce104..3698598f915eef4b935000958201fa19a40fc95c 100644 (file)
--- a/services/vocabulary/import/pom.xml
+++ b/services/vocabulary/import/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index bb222abc2ee8241a258be1c432b6c5c658b8156c..b29c46ca265a35d969b3e0ae07a9c3e899d67223 100644 (file)
--- a/services/vocabulary/jaxb/pom.xml
+++ b/services/vocabulary/jaxb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.collectionspace.services</groupId>
         <artifactId>org.collectionspace.services.vocabulary</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.9.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml
index 2ec45ab9df7019a9b11d4b47d1dc88203cc7a15e..b3ef9682769b1beea3c99d7bfb8acd573f173ef2 100644 (file)
--- a/services/vocabulary/pom.xml
+++ b/services/vocabulary/pom.xml
@@ -5,7 +5,7 @@
     <parent>\r
         <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
 \r
     <modelVersion>4.0.0</modelVersion>\r

diff --git a/services/vocabulary/sample/sample/pom.xml b/services/vocabulary/sample/sample/pom.xml
index 03a83ea602af94fa031def2c8edcd144869a0876..b0f38b9f8ec06ea16f90bcfe686c16f4a29e2d35 100644 (file)
--- a/services/vocabulary/sample/sample/pom.xml
+++ b/services/vocabulary/sample/sample/pom.xml
@@ -11,17 +11,17 @@
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.jaxb</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.vocabulary.client</artifactId>\r
-            <version>0.9-SNAPSHOT</version>\r
+            <version>0.9.1-SNAPSHOT</version>\r
         </dependency>\r
     </dependencies>\r
     \r

diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml
index 116330d9245f7ef5c3e427c78b4ac156c318e7d1..24131b211ae1c0a443ff88c4d21f1c8243e32d9e 100644 (file)
--- a/services/vocabulary/service/pom.xml
+++ b/services/vocabulary/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>\r
         <groupId>org.collectionspace.services</groupId>\r
         <artifactId>org.collectionspace.services.vocabulary</artifactId>\r
-        <version>0.9-SNAPSHOT</version>\r
+        <version>0.9.1-SNAPSHOT</version>\r
     </parent>\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
@@ -100,7 +100,6 @@
         <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