<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
\r
<target name="deploy" depends="package"\r
description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
- <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
- <fileset dir="${basedir}/nuxeo-client/lib">\r
- <include name="*.jar"/>\r
- </fileset>\r
- <fileset dir="${basedir}/nuxeo-client/lib/${nuxeo.release}">\r
- <include name="*.jar"/>\r
- </fileset>\r
+ <copy todir="${jboss.server.cspace}/nuxeo-client">\r
+ <fileset dir="${basedir}/nuxeo-client/lib/${nuxeo.release}"/>\r
</copy>\r
<ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>\r
+ <!--\r
<ant antfile="nuxeo-platform-quote/build.xml" target="deploy" inheritall="false"/>\r
<ant antfile="nuxeo-platform-quote-api/build.xml" target="deploy" inheritall="false"/>\r
+ -->\r
<ant antfile="nuxeo-database-templates/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<groupId>org.collectionspace.services</groupId>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>jms</artifactId>\r
</dependency>\r
<dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jboss-j2ee</artifactId>\r
+ <groupId>org.jboss.javaee</groupId>\r
+ <artifactId>jboss-javaee</artifactId> \r
</dependency>\r
\r
<dependency>\r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-jcr-connector</artifactId>\r
- <version>${nuxeo.core.version}</version>\r
+ <version>1.6.2</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-jcr-connector-test</artifactId>\r
- <version>${nuxeo.core.version}</version>\r
+ <version>1.6.2</version>\r
<scope>test</scope>\r
</dependency>\r
<dependency>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</dependency>\r
<!-- jboss -->\r
<dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jboss-remoting</artifactId>\r
- <version>2.2.2.SP8</version>\r
- <scope>provided</scope>\r
+ <groupId>org.jboss.remoting</groupId>\r
+ <artifactId>jboss-remoting</artifactId>\r
+ <scope>provided</scope>\r
</dependency>\r
</dependencies>\r
\r
<parent>
<artifactId>org.collectionspace.services</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>\r
</repository>\r
\r
- <repository>\r
- <id>maven-restlet</id>\r
- <name>Public online Restlet repository</name>\r
- <url>http://maven.restlet.org</url>\r
- </repository>\r
- \r
<repository>\r
<id>cspace.local.nuxeo</id>\r
<url>${nuxeo.local.repo.dir}</url>\r
</dependency>\r
-->\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
<dependency>\r
<groupId>jaxen</groupId>\r
<artifactId>jaxen</artifactId>\r
host=127.0.0.1\r
#cspace\r
-release.version=1.12\r
+release.version=1.14\r
cspace.release=${release.version}-SNAPSHOT\r
cspace.services.release=cspace-services-${cspace.release}\r
cspace.services.war=cspace-services.war\r
\r
#nuxeo\r
#nuxeo.release=5.2.M4\r
-nuxeo.release=5.3.2\r
+#nuxeo.release=5.3.2\r
+nuxeo.release=5.4.2-HF05\r
nuxeo.ear=nuxeo.ear\r
-nuxeo.system=${nuxeo.ear}/system\r
+nuxeo.system=${nuxeo.ear}/bundles\r
nuxeo.plugins=${nuxeo.ear}/plugins\r
nuxeo.templates=templates\r
\r
\r
#jboss\r
#assumption: both nuxeo and cspace domains are using the same JBoss installation\r
-jboss.release=jboss-4.2.3.GA\r
+#jboss.release=jboss-4.2.3.GA\r
+jboss.release=jboss-5.1.0.GA\r
jboss.dir=${env.JBOSS_HOME}\r
jboss.home=${jboss.dir}\r
jboss.bin=${jboss.home}/bin\r
#database - select one or the other (not both!), and then uncomment the\r
# appropriate section below the common settings\r
#db=mysql|postgresql\r
-db=postgresql\r
+db=mysql\r
#For mysql, uncomment this, and comment out postgres section\r
-#db.port=3306\r
-#db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
-#db.jdbc.driver.class=com.mysql.jdbc.Driver\r
-#db.dialect=org.hibernate.dialect.MySQLDialect\r
-#db.typemapping=mySQL\r
-#db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
-#db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
-#db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
+db.port=3306\r
+db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
+db.jdbc.driver.class=com.mysql.jdbc.Driver\r
+db.dialect=org.hibernate.dialect.MySQLDialect\r
+db.typemapping=mySQL\r
+db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
+db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
+db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
\r
#For postgresql, uncomment this, and comment out mysql section\r
-db.port=5432\r
-db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar\r
-db.jdbc.driver.class=org.postgresql.Driver\r
-db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
-db.typemapping=PostgreSQL 8.0\r
+#db.port=5432\r
+#db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar\r
+#db.jdbc.driver.class=org.postgresql.Driver\r
+#db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
+#db.typemapping=PostgreSQL 8.0\r
# Should be org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter\r
# but current JBoss does not seem to include it...\r
-db.exceptionsorter= \r
-db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))\r
-db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))\r
+#db.exceptionsorter= \r
+#db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))\r
+#db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))\r
\r
+#Hibernate properties for Ant and Maven plugins\r
+hibernate.dialect=${db.dialect}\r
\r
#database common settings\r
db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
<packaging>pom</packaging>\r
<name>services</name>\r
\r
<properties>\r
- <jboss.version>4.2.3.GA</jboss.version>\r
+ <jboss.version>5.1.0.GA</jboss.version>\r
<jboss.ejb.version>3.0</jboss.ejb.version>\r
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
- <nuxeo.platform.version>5.3.2</nuxeo.platform.version>\r
- <nuxeo.core.version>1.6.2</nuxeo.core.version>\r
- <cspace.services.version>1.12-SNAPSHOT</cspace.services.version>\r
- <cspace.services.client.version>1.12-SNAPSHOT</cspace.services.client.version>\r
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> \r
+ <nuxeo.shell.version>5.4.2-HF05</nuxeo.shell.version>\r
+ <nuxeo.platform.version>5.4.2-HF05</nuxeo.platform.version>\r
+ <nuxeo.core.version>5.4.2-HF05</nuxeo.core.version>\r
+ <cspace.services.version>1.14-SNAPSHOT</cspace.services.version>\r
+ <cspace.services.client.version>1.14-SNAPSHOT</cspace.services.client.version>\r
</properties>\r
\r
<distributionManagement>\r
</snapshots>\r
</repository>-->\r
\r
- <repository>\r
- <id>maven-restlet</id>\r
- <name>Public online Restlet repository</name>\r
- <url>http://maven.restlet.org</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
-\r
<repository>\r
<id>jboss.org</id>\r
- <url>http://repository.jboss.org/maven2</url>\r
+ <url>https://repository.jboss.org/nexus</url>\r
<snapshots>\r
<enabled>false</enabled>\r
</snapshots>\r
<!-- some security binaries available under .com only perhaps due to licensing issues -->\r
<repository>\r
<id>jboss.com</id>\r
- <url>http://repository.jboss.com/maven2</url>\r
+ <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>\r
<snapshots>\r
<enabled>false</enabled>\r
</snapshots>\r
</releases>\r
<snapshots>\r
<enabled>false</enabled>\r
- <updatePolicy>never</updatePolicy>\r
+ <!--<updatePolicy>never</updatePolicy>-->\r
</snapshots>\r
</repository>\r
\r
<url>http://maven.nuxeo.org/public</url>\r
<!-- Nuxeo Releases Repository is disabled. -->\r
<releases>\r
- <enabled>false</enabled>\r
+ <enabled>true</enabled>\r
</releases>\r
<snapshots>\r
<enabled>false</enabled>\r
<version>1.1</version>\r
<scope>provided</scope>\r
</dependency>\r
- <dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jboss-annotations-ejb3</artifactId>\r
- <version>3.0-RC8</version>\r
- <scope>provided</scope>\r
- </dependency>\r
+ \r
+ <dependency>\r
+ <groupId>org.jboss.remoting</groupId>\r
+ <artifactId>jboss-remoting</artifactId>\r
+ <version>2.5.1</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>jboss</groupId>\r
+ <artifactId>jboss-annotations-ejb3</artifactId>\r
+ <version>3.0-RC8</version>\r
+ <scope>provided</scope>\r
+ </dependency> \r
+ <dependency>\r
+ <groupId>org.jboss.javaee</groupId>\r
+ <artifactId>jboss-javaee</artifactId>\r
+ <version>5.0.1.GA</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ \r
+ <!--\r
<dependency>\r
<groupId>jboss</groupId>\r
<artifactId>jboss-j2ee</artifactId>\r
<version>${jboss.version}</version>\r
<scope>provided</scope>\r
</dependency>\r
+ -->\r
<dependency>\r
<groupId>javax.ejb</groupId>\r
<artifactId>ejb-api</artifactId>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<version>${project.version}</version>\r
</dependency> \r
<!-- External dependencies -->\r
+ <dependency>\r
+ <groupId>commons-cli</groupId>\r
+ <artifactId>commons-cli</artifactId>\r
+ <version>1.2</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.testng</groupId>\r
<artifactId>testng</artifactId>\r
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<ns2:permission xmlns:ns2="http://collectionspace.org/services/authorization">\r
+<ns3:permission xmlns:ns2="http://collectionspace.org/services/hyperjaxb"\r
+ xmlns:ns3="http://collectionspace.org/services/authorization/perms">\r
<resourceName>dimensions</resourceName>\r
<action>\r
<name>READ</name>\r
</action>\r
<effect>PERMIT</effect>\r
-</ns2:permission>\r
-\r
+</ns3:permission>\r
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
- <groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.jaxrs.provider</artifactId>\r
<name>services.jaxrs.provider</name>\r
<packaging>war</packaging>\r
<artifactId>org.collectionspace.services.authorization.service</artifactId>\r
<version>${project.version}</version>\r
<scope>provided</scope>\r
+ <exclusions>\r
+ <exclusion>\r
+ <artifactId>jboss-logging-log4j</artifactId>\r
+ <groupId>org.jboss.logging</groupId>\r
+ </exclusion>\r
+ </exclusions>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.common</artifactId>\r
<version>${project.version}</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <artifactId>servlet-api-2.5</artifactId>\r
+ <groupId>org.mortbay.jetty</groupId>\r
+ </exclusion>\r
+ </exclusions>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>\r
<version>${project.version}</version>\r
<exclusions>\r
- <exclusion> <!-- declare the exclusion here -->\r
+ <exclusion>\r
+ <artifactId>jboss-logging-log4j</artifactId>\r
+ <groupId>org.jboss.logging</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt.import</artifactId>\r
</exclusion>\r
<dependency>\r
<groupId>org.jboss.resteasy</groupId>\r
<artifactId>resteasy-jaxrs</artifactId>\r
- <exclusions>\r
- <exclusion>\r
- <groupId>tjws</groupId>\r
- <artifactId>webserver</artifactId>\r
- </exclusion>\r
- </exclusions>\r
</dependency>\r
<dependency>\r
<groupId>org.jboss.resteasy</groupId>\r
<scope>provided</scope>\r
</dependency>\r
<!-- nuxeo -->\r
-\r
+ <dependency>\r
+ <groupId>org.nuxeo.shell</groupId>\r
+ <artifactId>nuxeo-shell-ejb-core</artifactId>\r
+ <version>${nuxeo.shell.version}</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <artifactId>jruby</artifactId>\r
+ <groupId>org.jruby</groupId>\r
+ </exclusion>\r
+ </exclusions>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.shell</groupId>\r
+ <artifactId>nuxeo-shell-ejb-servlet-handlers</artifactId>\r
+ <version>${nuxeo.shell.version}</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.nuxeo.common</groupId>\r
<artifactId>nuxeo-common</artifactId>\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.core.version}</version> \r
+ <version>${nuxeo.core.version}</version> \r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.core</groupId>\r
+ <artifactId>nuxeo-core</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <groupId>xerces</groupId>\r
+ <artifactId>xercesImpl</artifactId>\r
+ </exclusion>\r
+ </exclusions> \r
</dependency>\r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-api</artifactId>\r
- <version>${nuxeo.core.version}</version> \r
+ <version>${nuxeo.core.version}</version> \r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.core</groupId>\r
+ <artifactId>nuxeo-core-convert</artifactId>\r
+ <version>${nuxeo.core.version}</version> \r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.core</groupId>\r
+ <artifactId>nuxeo-core-storage-sql-extensions</artifactId>\r
+ <version>${nuxeo.core.version}</version> \r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.core</groupId>\r
+ <artifactId>nuxeo-core-storage-sql-ra</artifactId>\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.core.version}</version> \r
+ <version>${nuxeo.core.version}</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <groupId>org.jboss.jbossas</groupId>\r
+ <artifactId>jboss-as-jbossas-remoting</artifactId>\r
+ </exclusion>\r
+ </exclusions>\r
</dependency>\r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-io</artifactId>\r
- <version>${nuxeo.core.version}</version> \r
+ <version>${nuxeo.core.version}</version> \r
+ </dependency>\r
+<!-- \r
+ <dependency>\r
+ <groupId>org.nuxeo.runtime</groupId>\r
+ <artifactId>nuxeo-runtime-scripting</artifactId>\r
+ <version>${nuxeo.core.version}</version> \r
+ </dependency>\r
+ --> \r
+ <dependency>\r
+ <groupId>org.nuxeo.runtime</groupId>\r
+ <artifactId>nuxeo-runtime-jtajca</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.runtime</groupId>\r
+ <artifactId>nuxeo-runtime-datasource</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ <artifactId>nuxeo-platform-usermanager-api</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ <artifactId>nuxeo-platform-api</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ <artifactId>nuxeo-platform-login</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ <artifactId>nuxeo-platform-imaging-core</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ <artifactId>nuxeo-platform-imaging-preview</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <artifactId>jboss-seam-pdf</artifactId>\r
+ <groupId>org.jboss.seam</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>jboss-seam-rss</artifactId>\r
+ <groupId>org.jboss.seam</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>jboss-seam-excel</artifactId>\r
+ <groupId>org.jboss.seam</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>nuxeo-platform-ui-web</artifactId>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>xercesImpl</artifactId>\r
+ <groupId>xerces</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>servlet-api</artifactId>\r
+ <groupId>javax.servlet</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>oauth-httpclient3</artifactId>\r
+ <groupId>net.oauth.core</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>oauth-consumer</artifactId>\r
+ <groupId>net.oauth.core</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>oauth-provider</artifactId>\r
+ <groupId>net.oauth.core</groupId>\r
+ </exclusion>\r
+ <exclusion>\r
+ <artifactId>oauth</artifactId>\r
+ <groupId>net.oauth.core</groupId>\r
+ </exclusion>\r
+ </exclusions>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.nuxeo.ecm.platform</groupId>\r
+ <artifactId>nuxeo-platform-audit-api</artifactId>\r
+ <version>${nuxeo.core.version}</version>\r
+ </dependency>\r
+ <!-- \r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-facade</artifactId>\r
- <version>${nuxeo.core.version}</version> \r
+ <version>${nuxeo.core.version}</version>\r
+ <scope>provided</scope>\r
+ <exclusions>\r
+ <exclusion>\r
+ <groupId>xerces</groupId>\r
+ <artifactId>xercesImpl</artifactId>\r
+ </exclusion>\r
+ </exclusions> \r
</dependency>\r
+ -->\r
<dependency>\r
<groupId>org.nuxeo.runtime</groupId>\r
<artifactId>nuxeo-runtime-osgi</artifactId>\r
- <version>${nuxeo.core.version}</version> \r
+ <version>${nuxeo.core.version}</version> \r
</dependency>\r
<dependency>\r
<groupId>org.osgi</groupId>\r
<artifactId>testng</artifactId>\r
<version>5.6</version>\r
</dependency>\r
+ <!-- Possibly not needed. Please experiment and remove unnecessary artifacts -->\r
+ <dependency>\r
+ <groupId>javax.security</groupId>\r
+ <artifactId>jaas</artifactId>\r
+ <version>1.0.01</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>wutka-dtdparser</groupId>\r
+ <artifactId>dtdparser121</artifactId>\r
+ <version>1.2.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>oswego-concurrent</groupId>\r
+ <artifactId>concurrent</artifactId>\r
+ <version>1.3.4-jboss-update1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>trove</groupId>\r
+ <artifactId>trove</artifactId>\r
+ <version>2.1.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>qdox</groupId>\r
+ <artifactId>qdox</artifactId>\r
+ <version>1.6.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>apache-xerces</groupId>\r
+ <artifactId>xml-apis</artifactId>\r
+ <version>2.9.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache</groupId>\r
+ <artifactId>xmlsec</artifactId>\r
+ <version>1.4.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.bcel</groupId>\r
+ <artifactId>bcel</artifactId>\r
+ <version>5.1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.ant</groupId>\r
+ <artifactId>ant</artifactId>\r
+ <version>1.7.0</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.geronimo.components</groupId>\r
+ <artifactId>geronimo-transaction</artifactId>\r
+ <version>2.1.3-NX1</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.geronimo.components</groupId>\r
+ <artifactId>geronimo-connector</artifactId>\r
+ <version>2.1.3-NX1</version>\r
+ </dependency>\r
</dependencies>\r
\r
<build>\r
package org.collectionspace.services.jaxrs;\r
\r
+import javax.servlet.ServletContext;\r
import javax.servlet.ServletContextEvent;\r
\r
import org.jboss.resteasy.core.Dispatcher;\r
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;\r
import org.collectionspace.services.common.ResourceMap;\r
+import org.collectionspace.services.common.ServiceMain;\r
\r
public class CSpaceResteasyBootstrap extends ResteasyBootstrap {\r
\r
+// private static final String \r
public void contextInitialized(ServletContextEvent event) {\r
+ if (true) {\r
+ System.out.print("Pausing 1 seconds in RESTEasy bootstrap for you to attached the debugger");\r
+ long startTime, currentTime;\r
+ currentTime = startTime = System.currentTimeMillis();\r
+ long stopTime = startTime + 1 * 1000; //5 seconds\r
+ do {\r
+ if (currentTime % 1000 == 0) {\r
+ System.out.print(".");\r
+ }\r
+ currentTime = System.currentTimeMillis();\r
+ } while (currentTime < stopTime);\r
+ \r
+ System.out.println();\r
+ System.out.println("Resuming RESTEasy bootstrap initialization.");\r
+ }\r
+ \r
+ // Save a copy of the ServletContext inside our ServiceMain singleton\r
+ ServletContext servletContext = event.getServletContext();\r
+ ServiceMain.getInstance(servletContext); //First access causes initialization of the Services' main class\r
+ \r
+ // This call to super instantiates and initializes our JAX-RS application class (org.collectionspace.services.jaxrs.CollectionSpaceJaxRsApplication)\r
super.contextInitialized(event);\r
CollectionSpaceJaxRsApplication app = \r
(CollectionSpaceJaxRsApplication)deployment.getApplication();\r
//import org.collectionspace.services.query.QueryResource;
+import javax.servlet.ServletContext;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Context;
private Set<Object> singletons = new HashSet<Object>();
private Set<Class<?>> empty = new HashSet<Class<?>>();
private ResourceMap resourceMap = new ResourceMapImpl();
+ private ServletContext servletContext = null;
public CollectionSpaceJaxRsApplication() {
//
public ResourceMap getResourceMap() {
return resourceMap;
}
+
+ public void setServletContext(ServletContext servletContext) {
+ this.servletContext = servletContext;
+ }
+
+ public ServletContext getServletContext() {
+ return this.servletContext;
+ }
}
<class>org.collectionspace.services.account.AccountTenant</class>
<class>org.collectionspace.services.account.Status</class>
<class>org.collectionspace.services.authentication.User</class>
- <class>org.collectionspace.services.authorization.Permission</class>
- <class>org.collectionspace.services.authorization.PermissionAction</class>
+ <class>org.collectionspace.services.authorization.perms.Permission</class>
+ <class>org.collectionspace.services.authorization.perms.PermissionAction</class>
<class>org.collectionspace.services.authorization.PermissionRoleRel</class>
<class>org.collectionspace.services.authorization.Role</class>
<class>org.collectionspace.services.authorization.AccountRoleRel</class>
<?xml version="1.0" encoding="UTF-8"?>\r
<jboss-web>\r
- <!-- All secure web resources will use this security domain -->\r
+ <class-loading java2ClassLoadingCompliance="true"> \r
+ </class-loading>\r
+ <!-- All secure web resources will use this security domain -->\r
<security-domain>java:/jaas/cspace</security-domain>\r
<context-root>/cspace-services</context-root>\r
<!--resource-ref>\r
<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">\r
<!--\r
Document : web.xml\r
Created on : May 19, 2009, 1:31 PM\r
Description:\r
service layer web application\r
-->\r
-<web-app>\r
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> \r
<display-name>CollectionSpace Services</display-name>\r
<env-entry>\r
<description>Sets the logging context for the Tiger web-app</description>\r
<env-entry-name>cspace-logging-context</env-entry-name>\r
- <env-entry-value>CSpaceLoggingContext</env-entry-value>\r
<env-entry-type>java.lang.String</env-entry-type>\r
+ <env-entry-value>CSpaceLoggingContext</env-entry-value>\r
</env-entry>\r
\r
<context-param>\r
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.account</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>org.collectionspace.services.account.jaxb</artifactId>\r
<version>${project.version}</version>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <artifactId>org.collectionspace.services.hyperjaxb</artifactId>\r
+ <version>${project.version}</version>\r
+ </dependency> \r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization.jaxb</artifactId>\r
if (usePermId) {
ArrayList<AccountValue> pvs = new ArrayList<AccountValue>();
pvs.add(pv);
- accRole.setAccounts(pvs);
+ accRole.setAccount(pvs);
}
if (useRoleId) {
//FIXME is there a better way?
for (RoleValue rv : rvs) {
rvas.add(rv);
}
- accRole.setRoles(rvas);
+ accRole.setRole(rvas);
}
return accRole;
//import org.collectionspace.services.authorization.AccountRolesList;
import org.collectionspace.services.account.AccountsCommon;
import org.collectionspace.services.account.AccountsCommonList;
+import org.collectionspace.services.account.AccountListItem;
+
import org.collectionspace.services.authorization.AccountRole;
import org.collectionspace.services.authorization.AccountValue;
import org.collectionspace.services.authorization.Role;
Assert.assertEquals(statusCode, Response.Status.OK.getStatusCode());
AccountRole output = res.getEntity();
- String sOutput = objectAsXmlString(output, AccountRole.class);
if(logger.isDebugEnabled()) {
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ String sOutput = objectAsXmlString(objectFactory.createAccountRole(output), AccountRole.class);
logger.debug(testName + " received " + sOutput);
}
} finally {
AccountRole output = res.getEntity();
// Now verify that the role has 2 accounts associate to it.
- Assert.assertEquals(output.getAccounts().size(), 1);
+ Assert.assertEquals(output.getAccount().size(), 1);
String sOutput = objectAsXmlString(output, AccountRole.class);
if(logger.isDebugEnabled()) {
}
ClientResponse<Response> res = client.delete(
- toDelete.getAccounts().get(0).getAccountId(), toDelete);
+ toDelete.getAccount().get(0).getAccountId(), toDelete);
try {
int statusCode = res.getStatus();
Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
readResponse.releaseConnection();
}
- res = client.delete(toDelete.getAccounts().get(0).getAccountId());
+ res = client.delete(toDelete.getAccount().get(0).getAccountId());
try {
int statusCode = res.getStatus();
Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
if (logger.isDebugEnabled()) {
logger.debug("to be created, accRole common");
- logger.debug(objectAsXmlString(accRole, AccountRole.class));
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ logger.debug(objectAsXmlString(objectFactory.createAccountRole(accRole), AccountRole.class));
}
return accRole;
}
int statusCode = res.getStatus();
Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
- List<AccountsCommonList.AccountListItem> items = list.getAccountListItem();
+ List<AccountListItem> items = list.getAccountListItem();
Assert.assertEquals(1, items.size(), "Found more than one Admin account!");
- AccountsCommonList.AccountListItem item = items.get(0);
+ AccountListItem item = items.get(0);
prebuiltAdminCSID = item.getCsid();
if (logger.isDebugEnabled()) {
logger.debug("Found Admin Account with ID: " + prebuiltAdminCSID);
import org.collectionspace.services.client.CollectionSpaceClient;
import org.collectionspace.services.account.AccountsCommon;
import org.collectionspace.services.account.AccountsCommonList;
+import org.collectionspace.services.account.AccountListItem;
+
import org.collectionspace.services.account.Status;
import org.collectionspace.services.client.AccountFactory;
import org.collectionspace.services.client.test.AbstractServiceTestImpl;
int statusCode = res.getStatus();
Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
- List<AccountsCommonList.AccountListItem> items = list.getAccountListItem();
+ List<AccountListItem> items = list.getAccountListItem();
Assert.assertEquals(1, items.size(), "Found more than one Admin account!");
- AccountsCommonList.AccountListItem item = items.get(0);
+ AccountListItem item = items.get(0);
prebuiltAdminCSID = item.getCsid();
if (logger.isDebugEnabled()) {
logger.debug("Found Admin Account with ID: " + prebuiltAdminCSID);
* @param list the list
*/
private void printList(String testName, AccountsCommonList list) {
- List<AccountsCommonList.AccountListItem> items =
+ List<AccountListItem> items =
list.getAccountListItem();
int i = 0;
- for (AccountsCommonList.AccountListItem item : items) {
+ for (AccountListItem item : items) {
logger.debug(testName + ": list-item[" + i + "] csid="
+ item.getCsid());
logger.debug(testName + ": list-item[" + i + "] screenName="
<persistence-unit name="org.collectionspace.services.account">
<class>org.collectionspace.services.account.AccountsCommon</class>
<class>org.collectionspace.services.account.AccountsCommonList</class>
- <class>org.collectionspace.services.account.AccountsCommonList$AccountListItem</class>
+ <class>org.collectionspace.services.account.AccountListItem</class>
<class>org.collectionspace.services.account.Tenant</class>
<class>org.collectionspace.services.account.AccountTenant</class>
<class>org.collectionspace.services.account.Status</class>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.account</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.jaxb2-commons</groupId>
<artifactId>property-listener-injector</artifactId>
</dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- jaxb:version="1.0" elementFormDefault="unqualified"
+ jaxb:version="2.1" elementFormDefault="unqualified"
xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:ns="http://collectionspace.org/services/account"
See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
-->
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:globalBindings generateIsSetMethod="true" localScoping="toplevel">
+ <jaxb:serializable/>
+ </jaxb:globalBindings>
+ </xs:appinfo>
+ </xs:annotation>
+
+ <xs:element name="bar-common-list">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation>
+ AccountsCommonList contains information about one or more
+ accounts. An instance of this type could be returned on
+ index and search operations.
+ </xs:documentation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="abstractCommonList">
+ <xs:sequence>
+ <xs:element name="bar-list-item" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="screenName" type="xs:string" minOccurs="1"/>
+ <xs:element name="personRefName" type="xs:string" minOccurs="1" />
+ <xs:element name="email" type="xs:string" minOccurs="1" />
+ <!-- uri to retrive collection object details -->
+ <xs:element name="uri" type="xs:anyURI" minOccurs="1" />
+ <xs:element name="csid" type="xs:string" minOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
<!-- accounts-common -->
<!-- convention: <servicename>-common -->
<xs:element name="accounts_common">
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
- <parent>\r
- <artifactId>org.collectionspace.services.account</artifactId>\r
- <groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
- </parent>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+ <parent>\r
+ <artifactId>org.collectionspace.services.account</artifactId>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <version>1.14-SNAPSHOT</version>\r
+ </parent>\r
\r
- <modelVersion>4.0.0</modelVersion>\r
- <groupId>org.collectionspace.services</groupId>\r
- <artifactId>org.collectionspace.services.account.pstore</artifactId>\r
- <name>services.account.pstore</name>\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <groupId>org.collectionspace.services</groupId>\r
+
<artifactId>org.collectionspace.services.account.pstore</artifactId>
\r+ <name>services.account.pstore</name>\r
\r
- <properties>\r
- <sql.file>account.sql</sql.file>\r
- <sql.dir>${basedir}/src/main/resources/db</sql.dir>\r
- </properties>\r
+ <sql.file>account.sql</sql.file>\r
+ <sql.dir>${basedir}/src/main/resources/db</sql.dir>\r
+ </properties>\r
\r
- <dependencies>\r
- <dependency>\r
- <groupId>com.sun.xml.bind</groupId>\r
- <artifactId>jaxb-impl</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2-commons</groupId>\r
- <artifactId>property-listener-injector</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
- </dependency>\r
- <!-- External dependencies -->\r
- <dependency>\r
- <groupId>mysql</groupId>\r
- <artifactId>mysql-connector-java</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
- <artifactId>postgresql</artifactId>\r
- </dependency>\r
- <!-- CollectionSpace dependencies -->\r
- <dependency>\r
- <groupId>org.collectionspace.services</groupId>\r
- <artifactId>org.collectionspace.services.account.jaxb</artifactId>\r
- <version>${project.version}</version>\r
- </dependency>\r
- </dependencies>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>com.sun.xml.bind</groupId>\r
+ <artifactId>jaxb-impl</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.jvnet.jaxb2-commons</groupId>\r
+ <artifactId>property-listener-injector</artifactId>\r
+ </dependency>\r
+ <!-- External dependencies -->\r
+ <dependency>\r
+ <groupId>mysql</groupId>\r
+ <artifactId>mysql-connector-java</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
+ </dependency>\r
+ <!-- CollectionSpace dependencies -->\r
+ <dependency>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <artifactId>org.collectionspace.services.account.jaxb</artifactId>\r
+ <version>${project.version}</version>\r
+ </dependency>\r
+ </dependencies>\r
\r
- <build>\r
- <finalName>collectionspace-services-account-pstore</finalName>\r
- <plugins>\r
- <plugin>\r
- <artifactId>maven-antrun-plugin</artifactId>\r
- <executions>\r
- <execution>\r
- <id>subs-hibernate-config</id>\r
- <phase>generate-test-resources</phase>\r
- <goals>\r
- <goal>run</goal>\r
- </goals>\r
- <configuration>\r
- <tasks>\r
- <property name="runtime-classpath" refid="maven.runtime.classpath"/>\r
- <ant target="setup_hibernate.cfg" inheritRefs="true"/>\r
- </tasks>\r
- </configuration>\r
- </execution>\r
- </executions>\r
- </plugin>\r
+ <build>\r
+ <finalName>collectionspace-services-account-pstore</finalName>\r
+
<artifactId>maven-antrun-plugin</artifactId>
\r+ <executions>\r
+ <execution>\r
+ <id>subs-hibernate-config</id>\r
+
<phase>generate-test-resources</phase>
\r+ <goals>\r
+ <goal>run</goal>\r
+ </goals>\r
+ <configuration>\r
+ <tasks>\r
+ <property name="runtime-classpath" refid="maven.runtime.classpath" />\r
+ <ant target="setup_hibernate.cfg" inheritRefs="true" />\r
+ </tasks>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
\r
- </plugins>\r
- </build>\r
- <profiles>\r
- <profile>\r
- <!-- use profile as this task is not needed for every build and test -->\r
- <id>ddl</id>\r
- <build>\r
- <plugins>\r
- <plugin>\r
- <groupId>org.codehaus.mojo</groupId>\r
- <artifactId>properties-maven-plugin</artifactId>\r
- <version>1.0-alpha-2</version>\r
- <executions>\r
- <execution>\r
- <phase>initialize</phase>\r
- <goals>\r
- <goal>read-project-properties</goal>\r
- </goals>\r
- <configuration>\r
- <files>\r
- <file>${basedir}/../../../build.properties</file>\r
- </files>\r
- </configuration>\r
- </execution>\r
- </executions>\r
- </plugin>\r
- <plugin>\r
- <groupId>org.codehaus.mojo</groupId>\r
- <artifactId>hibernate3-maven-plugin</artifactId>\r
- <version>2.2</version>\r
- <executions>\r
- <execution>\r
- <phase>process-test-resources</phase>\r
- <goals>\r
- <goal>hbm2ddl</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- <configuration>\r
- <components>\r
- <component>\r
- <name>hbm2ddl</name>\r
- </component>\r
- </components>\r
- <componentProperties>\r
- <outputfilename>${sql.file}</outputfilename>\r
- <implementation>jpaconfiguration</implementation>\r
- <drop>true</drop>\r
- <create>true</create>\r
- <export>true</export>\r
- <jdk5>true</jdk5>\r
- <ejb3>false</ejb3>\r
- <persistenceunit>org.collectionspace.services.account</persistenceunit>\r
- </componentProperties>\r
- </configuration>\r
- <dependencies>\r
- <dependency>\r
- <groupId>mysql</groupId>\r
- <artifactId>mysql-connector-java</artifactId>\r
- <version>5.1.5</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
- <artifactId>postgresql</artifactId>\r
- <version>8.4-702.jdbc4</version>\r
- </dependency>\r
- </dependencies>\r
- </plugin>\r
- <plugin>\r
- <artifactId>maven-antrun-plugin</artifactId>\r
- <executions>\r
- <execution>\r
- <phase>process-test-resources</phase>\r
- <configuration>\r
- <tasks>\r
- <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${db}/${sql.file}"/>\r
- </tasks>\r
- </configuration>\r
- <goals>\r
- <goal>run</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- </plugin>\r
+ </plugins>\r
+ </build>\r
+ <profiles>\r
+ <profile>\r
+ <!-- use profile as this task is not needed for every build and test -->\r
+ <id>ddl</id>\r
+ <build>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.codehaus.mojo</groupId>\r
+ <artifactId>properties-maven-plugin</artifactId>\r
+ <version>1.0-alpha-2</version>\r
+ <executions>\r
+ <execution>\r
+ <phase>initialize</phase>\r
+ <goals>\r
+ <goal>read-project-properties</goal>\r
+ </goals>\r
+ <configuration>\r
+ <files>\r
+ <file>${basedir}/../../../build.properties</file>\r
+ </files>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.codehaus.mojo</groupId>\r
+ <artifactId>hibernate3-maven-plugin</artifactId>\r
+ <version>2.2</version>\r
+ <executions>\r
+ <execution>\r
+ <phase>process-test-resources</phase>\r
+ <goals>\r
+ <goal>hbm2ddl</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ <configuration>\r
+ <components>\r
+ <component>\r
+ <name>hbm2ddl</name>\r
+ </component>\r
+ </components>\r
+ <componentProperties>\r
+ <outputfilename>${sql.file}</outputfilename>\r
+ <implementation>jpaconfiguration</implementation>\r
+ <drop>true</drop>\r
+ <create>true</create>\r
+ <export>true</export>\r
+ <jdk5>true</jdk5>\r
+ <ejb3>false</ejb3>\r
+ <persistenceunit>org.collectionspace.services.account</persistenceunit>\r
+ </componentProperties>\r
+ </configuration>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>mysql</groupId>\r
+ <artifactId>mysql-connector-java</artifactId>\r
+ <version>5.1.5</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
+ <version>8.4-702.jdbc4</version>\r
+ </dependency>\r
+ </dependencies>\r
+ </plugin>\r
+ <plugin>\r
+ <artifactId>maven-antrun-plugin</artifactId>\r
+ <executions>\r
+ <execution>\r
+ <phase>process-test-resources</phase>\r
+ <configuration>\r
+ <tasks>\r
+ <copy file="${basedir}/target/hibernate3/sql/${sql.file}"\r
+ tofile="${sql.dir}/${db}/${sql.file}" />\r
+ </tasks>\r
+ </configuration>\r
+ <goals>\r
+ <goal>run</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
\r
- </plugins>\r
- </build>\r
- </profile>\r
- </profiles>\r
+ </plugins>\r
+ </build>\r
+ </profile>\r
+ </profiles>\r
</project>\r
\r
drop table if exists accounts_common;
drop table if exists accounts_tenants;
drop table if exists tenants;
-create table accounts_common (csid varchar(128) not null, created_at datetime not null, email varchar(255) not null, mobile varchar(255), person_ref_name varchar(255), phone varchar(255), screen_name varchar(128) not null, status varchar(15) not null, updated_at datetime, userid varchar(128) not null, metadata_protection varchar(255), roles_protection varchar(255), primary key (csid));
+create table accounts_common (csid varchar(128) not null, created_at datetime not null, email varchar(255) not null, metadata_protection varchar(255), mobile varchar(255), person_ref_name varchar(255), phone varchar(255), roles_protection varchar(255), screen_name varchar(128) not null, status varchar(15) not null, updated_at datetime, userid varchar(128) not null, primary key (csid));
create table accounts_tenants (HJID bigint not null auto_increment, tenant_id varchar(128) not null, TENANTS_ACCOUNTSCOMMON_CSID varchar(128), primary key (HJID));
create table tenants (id varchar(128) not null, created_at datetime not null, name varchar(255) not null, updated_at datetime, primary key (id));
alter table accounts_tenants add index FKFDA649B05A9CEEB5 (TENANTS_ACCOUNTSCOMMON_CSID), add constraint FKFDA649B05A9CEEB5 foreign key (TENANTS_ACCOUNTSCOMMON_CSID) references accounts_common (csid);
<parent>\r
<artifactId>org.collectionspace.services.account</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
import org.collectionspace.services.authorization.AccountRoleRel;
import org.collectionspace.services.authorization.SubjectType;
import org.collectionspace.services.client.AccountClient;
+import org.collectionspace.services.client.PayloadOutputPart;
import org.collectionspace.services.common.SecurityResourceBase;
import org.collectionspace.services.common.ServiceMessages;
import org.collectionspace.services.common.context.RemoteServiceContextFactory;
@GET
@Produces("application/xml")
public AccountsCommonList getAccountList(@Context UriInfo ui) {
- return (AccountsCommonList)getList(ui, AccountsCommon.class);
+ AccountsCommonList result = (AccountsCommonList)getList(ui, AccountsCommon.class);
+ PayloadOutputPart ppo = new PayloadOutputPart(AccountsCommonList.class.getSimpleName(),
+ result);
+ System.out.println(ppo.asXML());
+ return result;
}
@PUT
//import org.collectionspace.services.authorization.AccountRolesList;
//import org.collectionspace.services.authorization.AccountRolesList.AccountRoleListItem;
import org.collectionspace.services.authorization.AccountRole;
-import org.collectionspace.services.authorization.AccountValue;
import org.collectionspace.services.authorization.AccountRoleRel;
-import org.collectionspace.services.authorization.Permission;
import org.collectionspace.services.authorization.Role;
import org.collectionspace.services.authorization.RoleValue;
import org.collectionspace.services.authorization.SubjectType;
//
//Preserve the original incoming list of roles
- List<RoleValue> inputRoleValues = input.getRoles();
+ List<RoleValue> inputRoleValues = input.getRole();
//Change the role list to be just the Spring role
List<RoleValue> springRoles = new ArrayList<RoleValue>();
- input.setRoles(springRoles);
+ input.setRole(springRoles);
RoleValue springAdminRole = new RoleValue();
springRoles.add(springAdminRole);
springAdminRole.setRoleId(AuthorizationCommon.ROLE_SPRING_ADMIN_ID);
if (logger.isTraceEnabled() == true) {
logger.trace(AuthorizationCommon.ROLE_SPRING_ADMIN_NAME +
" relationship already exists for account: " +
- input.getAccounts().get(0).getAccountId(), e);
+ input.getAccount().get(0).getAccountId(), e);
}
}
//
// Now we'll add the account relationships for the original incoming roles.
//
- input.setRoles(inputRoleValues);
+ input.setRole(inputRoleValues);
ServiceContext<AccountRole, AccountRole> ctx = createServiceContext(input, subject);
DocumentHandler handler = createDocumentHandler(ctx);
String bogusCsid = getStorageClient(ctx).create(ctx, handler);
import org.collectionspace.services.account.AccountTenant;
import org.collectionspace.services.account.AccountsCommon;
import org.collectionspace.services.account.AccountsCommonList;
-import org.collectionspace.services.account.AccountsCommonList.AccountListItem;
+import org.collectionspace.services.account.AccountListItem;
import org.collectionspace.services.account.Status;
import org.collectionspace.services.client.AccountClient;
AccountsCommonList accList = this.extractPagingInfo(new AccountsCommonList(), wrapDoc);
// AccountsCommonList accList = new AccountsCommonList();
- List<AccountsCommonList.AccountListItem> list = accList.getAccountListItem();
+ List<AccountListItem> list = accList.getAccountListItem();
for (Object obj : wrapDoc.getWrappedObject()) {
AccountsCommon account = (AccountsCommon) obj;
}
if (subject.equals(SubjectType.ROLE)) {
//FIXME: potential index out of bounds exception...negative test needed
- AccountValue av = ar.getAccounts().get(0);
+ AccountValue av = ar.getAccount().get(0);
- for (RoleValue rv : ar.getRoles()) {
+ for (RoleValue rv : ar.getRole()) {
AccountRoleRel arr = buildAccountRoleRel(av, rv, handleDelete);
arrl.add(arr);
}
} else if (SubjectType.ACCOUNT.equals(subject)) {
//FIXME: potential index out of bounds exception...negative test needed
- RoleValue rv = ar.getRoles().get(0);
- for (AccountValue av : ar.getAccounts()) {
+ RoleValue rv = ar.getRole().get(0);
+ for (AccountValue av : ar.getAccount()) {
AccountRoleRel arr = buildAccountRoleRel(av, rv, handleDelete);
arrl.add(arr);
}
if (SubjectType.ROLE.equals(subject)) {
List<AccountValue> avs = new ArrayList<AccountValue>();
- ar.setAccounts(avs);
+ ar.setAccount(avs);
AccountValue av = AuthorizationRoleRel.buildAccountValue(ar0);
if (av != null) {
avs.add(av);
//add roles
List<RoleValue> rvs = new ArrayList<RoleValue>();
- ar.setRoles(rvs);
+ ar.setRole(rvs);
for (AccountRoleRel arr : arrl) {
RoleValue rv = AuthorizationRoleRel.buildRoleValue(arr);
if (rv != null) {
} else if (SubjectType.ACCOUNT.equals(subject)) {
List<RoleValue> rvs = new ArrayList<RoleValue>();
- ar.setRoles(rvs);
+ ar.setRole(rvs);
RoleValue rv = AuthorizationRoleRel.buildRoleValue(ar0);
rvs.add(rv);
//add accounts
List<AccountValue> avs = new ArrayList<AccountValue>();
- ar.setAccounts(avs);
+ ar.setAccount(avs);
for (AccountRoleRel arr : arrl) {
AccountValue av = AuthorizationRoleRel.buildAccountValue(arr);
avs.add(av);
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.acquisition</artifactId>\r
- <version>1.12-SNAPSHOT</version> \r
+ <version>1.14-SNAPSHOT</version> \r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.acquisition</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.acquisition</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.acquisition.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.acquisition</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authentication</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authentication</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.jaxb2-commons</groupId>
<artifactId>property-listener-injector</artifactId>
</dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authentication</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</properties>\r
\r
<dependencies>\r
- <dependency>\r
- <groupId>com.sun.xml.bind</groupId>\r
- <artifactId>jaxb-impl</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2-commons</groupId>\r
- <artifactId>property-listener-injector</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
- </dependency>\r
<dependency>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
</dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
-
<artifactId>postgresql</artifactId>
\r+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
</dependency>\r
<!-- CollectionSpace -->\r
<dependency>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authentication</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>2.1.0.GA</version>
</dependency>
<dependency>
+ <!--
<groupId>jboss</groupId>
<artifactId>jbosssx</artifactId>
<version>4.2.3.GA</version>
+ -->
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
<scope>provided</scope>
+ <version>2.0.3.SP1</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
*/
package org.collectionspace.authentication;
+import javax.sql.DataSource;
+
import org.collectionspace.authentication.spi.AuthNContext;
import org.collectionspace.authentication.spring.SpringAuthNContext;
* volatile is used here to assume about ordering (post JDK 1.5)
*/
private static volatile AuthN self = new AuthN();
+ private static DataSource dataSource = null;
private AuthNContext authnContext;
private AuthN() {
public final static AuthN get() {
return self;
}
+
+ public static void setDataSource(DataSource dataSource) {
+ AuthN.dataSource = dataSource;
+ }
+
+ public static DataSource getDataSource() {
+ return AuthN.dataSource;
+ }
/**
* getAuthn returns authentication utilities
final public class CSpacePrincipal
implements Principal, java.io.Serializable {
- private String name;
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1357683611240908638L;
+ private String name;
private String tenantId;
public CSpacePrincipal(String name) {
}\r
return password;\r
}\r
+ \r
+ @Override\r
+ public boolean commit() throws LoginException {\r
+ boolean result;\r
+ result = super.commit();\r
+ return result;\r
+ }\r
+ \r
+ @Override\r
+ public boolean abort() throws LoginException {\r
+ boolean result;\r
+ result = super.abort();\r
+ return result;\r
+ }\r
\r
/** Execute the rolesQuery against the dsJndiName to obtain the roles for\r
the authenticated user.\r
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+
+import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.security.auth.login.FailedLoginException;
//import org.apache.commons.logging.Log;
//import org.apache.commons.logging.LogFactory;
+import org.collectionspace.authentication.AuthN;
import org.collectionspace.authentication.CSpaceTenant;
import org.collectionspace.authentication.realm.CSpaceRealm;
private Connection getConnection() throws LoginException, SQLException {
InitialContext ctx = null;
Connection conn = null;
+ String dataSourceName = getDataSourceName();
+ DataSource ds = null;
try {
ctx = new InitialContext();
- DataSource ds = (DataSource) ctx.lookup(getDataSourceName());
+ try {
+ ds = (DataSource) ctx.lookup(dataSourceName);
+ } catch (Exception e) {}
+
+ try {
+ Context envCtx = (Context) ctx.lookup("java:comp/env");
+ ds = (DataSource) envCtx.lookup(dataSourceName);
+ } catch (Exception e) {}
+
+ try {
+ Context envCtx = (Context) ctx.lookup("java:comp");
+ ds = (DataSource) envCtx.lookup(dataSourceName);
+ } catch (Exception e) {}
+
+ try {
+ Context envCtx = (Context) ctx.lookup("java:");
+ ds = (DataSource) envCtx.lookup(dataSourceName);
+ } catch (Exception e) {}
+
+ try {
+ Context envCtx = (Context) ctx.lookup("java");
+ ds = (DataSource) envCtx.lookup(dataSourceName);
+ } catch (Exception e) {}
+
+ try {
+ ds = (DataSource) ctx.lookup("java:/" + dataSourceName);
+ } catch (Exception e) {}
+
+ if (ds == null) {
+ ds = AuthN.getDataSource();
+ }
+
if (ds == null) {
- throw new IllegalArgumentException("datasource not found: " + getDataSourceName());
+ throw new IllegalArgumentException("datasource not found: " + dataSourceName);
}
+
conn = ds.getConnection();
+ if (conn == null) {
+ conn = AuthN.getDataSource().getConnection(); //FIXME:REM - This is the result of some type of JNDI mess. Should try to solve this problem and clean up this code.
+ }
return conn;
} catch (NamingException ex) {
- LoginException le = new LoginException("Error looking up DataSource from: " + getDataSourceName());
+ LoginException le = new LoginException("Error looking up DataSource from: " + dataSourceName);
le.initCause(ex);
throw le;
} finally {
try {
ctx.close();
} catch (Exception e) {
+ e.printStackTrace();
}
}
}
<parent>
<artifactId>org.collectionspace.services.authority</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.jaxb2-commons</groupId>
<artifactId>property-listener-injector</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>runtime</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authority</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.jvnet.jaxb2-commons</groupId>\r
<artifactId>property-listener-injector</artifactId>\r
</dependency>\r
+ <!--\r
<dependency>\r
<groupId>org.jvnet.jaxb2_commons</groupId>\r
<artifactId>runtime</artifactId>\r
</dependency>\r
+ -->\r
\r
<!-- jboss -->\r
<dependency>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
import javax.ws.rs.core.Response;
import org.jboss.resteasy.client.ClientResponse;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionsList;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionsList;
/**
* A PermissionClient.
import java.util.ArrayList;
import java.util.List;
-import org.collectionspace.services.authorization.ActionType;
-import org.collectionspace.services.authorization.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.ActionType;
+import org.collectionspace.services.authorization.perms.EffectType;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
permission.setResourceName(resourceName);
}
if (useAction) {
- permission.setActions(actionList);
+ permission.setAction(actionList);
}
if (useEffect) {
permission.setEffect(effect);
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionsList;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionsList;
import org.jboss.resteasy.client.ClientResponse;
/**
if (usePermId) {
ArrayList<PermissionValue> pvs = new ArrayList<PermissionValue>();
pvs.add(pv);
- permRole.setPermissions(pvs);
+ permRole.setPermission(pvs);
}
if (useRoleId) {
- permRole.setRoles(rvs);
+ permRole.setRole(rvs);
}
return permRole;
if (useRoleId) {
ArrayList<RoleValue> rvs = new ArrayList<RoleValue>();
rvs.add(rv);
- permRole.setRoles(rvs);
+ permRole.setRole(rvs);
}
if (usePermId) {
- permRole.setPermissions(pvs);
+ permRole.setPermission(pvs);
}
return permRole;
import javax.ws.rs.core.Response;
import org.collectionspace.services.jaxb.AbstractCommonList;
-import org.collectionspace.services.authorization.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.EffectType;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
}
ClientResponse<Response> res = client.delete(
- toDelete.getPermissions().get(0).getPermissionId(), toDelete);
+ toDelete.getPermission().get(0).getPermissionId(), toDelete);
try {
int statusCode = res.getStatus();
Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
readResponse.releaseConnection();
}
- res = client.delete(toDelete.getPermissions().get(0).getPermissionId());
+ res = client.delete(toDelete.getPermission().get(0).getPermissionId());
try {
int statusCode = res.getStatus();
Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
import java.util.List;
import javax.ws.rs.core.Response;
//import org.collectionspace.services.authorization.ActionType;
-import org.collectionspace.services.authorization.EffectType;
+import org.collectionspace.services.authorization.perms.EffectType;
import org.collectionspace.services.client.CollectionSpaceClient;
import org.collectionspace.services.client.PermissionClient;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
-import org.collectionspace.services.authorization.PermissionsList;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
+import org.collectionspace.services.authorization.perms.PermissionsList;
import org.collectionspace.services.client.PermissionFactory;
import org.collectionspace.services.client.test.AbstractServiceTestImpl;
import org.collectionspace.services.client.test.ServiceRequestType;
// Submit the request to the service and store the response.
PermissionClient client = new PermissionClient();
ClientResponse<PermissionsList> res = client.readList();
- PermissionsList list = res.getEntity();
+ PermissionsList list = res.getEntity(PermissionsList.class);
int statusCode = res.getStatus();
// Check the status code of the response: does it match
// Submit the request to the service and store the response.
PermissionClient client = new PermissionClient();
ClientResponse<PermissionsList> res = client.readSearchList("acquisition");
- PermissionsList list = res.getEntity();
+ PermissionsList list = res.getEntity(PermissionsList.class);
int statusCode = res.getStatus();
// Check the status code of the response: does it match
// the expected response(s)?
invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
int EXPECTED_ITEMS = 5; //seeded permissions
- int actual = list.getPermissions().size();
+ int actual = list.getPermission().size();
if (logger.isDebugEnabled()) {
logger.debug(testName + ": received = " + actual
+ " expected=" + EXPECTED_ITEMS);
}
// Optionally output additional data about list members for debugging.
boolean iterateThroughList = true;
- if ((iterateThroughList || (EXPECTED_ITEMS != list.getPermissions().size()))
+ if ((iterateThroughList || (EXPECTED_ITEMS != list.getPermission().size()))
&& logger.isDebugEnabled()) {
printList(testName, list);
}
- Assert.assertEquals(list.getPermissions().size(), EXPECTED_ITEMS);
+ Assert.assertEquals(list.getPermission().size(), EXPECTED_ITEMS);
}
logger.debug(testName + " no. of actions default=" + default_actions
+ " to update =" + toUpdate_actions);
}
- permToUpdate.setActions(actions);
+ permToUpdate.setAction(actions);
if (logger.isDebugEnabled()) {
logger.debug(testName + " updated object\n"
+ objectAsXmlString(permToUpdate, Permission.class));
Permission permUpdated = (Permission) res.getEntity();
Assert.assertNotNull(permUpdated);
- int updated_actions = permToUpdate.getActions().size();
+ int updated_actions = permToUpdate.getAction().size();
if (logger.isDebugEnabled()) {
logger.debug(testName + " no. of actions to update=" + toUpdate_actions
+ " updated =" + updated_actions);
int i = 0;
- for (Permission permission : list.getPermissions()) {
+ for (Permission permission : list.getPermission()) {
logger.debug(testName + " permission csid=" + permission.getCsid()
+ " name=" + permission.getResourceName()
+ " desc=" + permission.getDescription());
import java.util.Hashtable;
import java.util.List;
import javax.ws.rs.core.Response;
-import org.collectionspace.services.authorization.EffectType;
+import org.collectionspace.services.authorization.perms.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
PermissionRole toDelete = readResponse.getEntity();
readResponse.releaseConnection();
- rv = toDelete.getRoles().get(0);
+ rv = toDelete.getRole().get(0);
ClientResponse<Response> res = null;
try {
res = client.delete(
// Instance variables specific to this test.
/** The known resource id. */
private String knownResourceId = null;
- private String knownRoleName = "ROLE_USERS_TEST";
- private String knownRoleDisplayName = "ROLE_DISPLAYNAME_USERS_TEST";
+ private String knownRoleName = "ROLE_USERS_MOCK";
+ private String knownRoleDisplayName = "ROLE_DISPLAYNAME_USERS_MOCK";
private String verifyResourceId = null;
- private String verifyRoleName = "collections_manager_test";
+ private String verifyRoleName = "collections_manager_mock";
// private List<String> allResourceIdsCreated = new ArrayList<String>();
@Override
Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
int EXPECTED_ITEMS = 1;
if (logger.isDebugEnabled()) {
- logger.debug(testName + ": received = " + list.getRoles().size()
+ logger.debug(testName + ": received = " + list.getRole().size()
+ " expected=" + EXPECTED_ITEMS);
}
- Assert.assertEquals(EXPECTED_ITEMS, list.getRoles().size());
+ Assert.assertEquals(EXPECTED_ITEMS, list.getRole().size());
// Optionally output additional data about list members for debugging.
boolean iterateThroughList = true;
if (iterateThroughList && logger.isDebugEnabled()) {
roleToUpdate.setDescription("updated role description");
if (logger.isDebugEnabled()) {
logger.debug("updated object");
- logger.debug(objectAsXmlString(roleToUpdate,
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ logger.debug(objectAsXmlString(objectFactory.createRole(roleToUpdate),
Role.class));
}
RoleClient client = new RoleClient();
Assert.assertNotNull(roleUpdated);
if (logger.isDebugEnabled()) {
logger.debug(testName + "Updated role: ");
- logger.debug(objectAsXmlString(roleUpdated,Role.class));
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ logger.debug(objectAsXmlString(objectFactory.createRole(roleUpdated),
+ Role.class));
}
Assert.assertFalse(
roleToUpdate.setDisplayName("UPDATED-ROLE_USERS_TEST");
if (logger.isDebugEnabled()) {
logger.debug("updated object");
- logger.debug(objectAsXmlString(roleToUpdate,
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ logger.debug(objectAsXmlString(objectFactory.createRole(roleToUpdate),
Role.class));
}
RoleClient client = new RoleClient();
useRoleName);
if (logger.isDebugEnabled()) {
logger.debug("to be created, role");
- logger.debug(objectAsXmlString(role, Role.class));
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ logger.debug(objectAsXmlString(objectFactory.createRole(role),
+ Role.class));
}
return role;
int i = 0;
- for (Role role : list.getRoles()) {
+ for (Role role : list.getRole()) {
logger.debug(testName + " role csid=" + role.getCsid()
+ " name=" + role.getRoleName()
+ " desc=" + role.getDescription());
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
<artifactId>slf4j-api</artifactId>\r
+ <version>1.6.1</version>\r
</dependency>\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
<artifactId>slf4j-log4j12</artifactId>\r
+ <version>1.6.1</version>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
import java.util.HashSet;
import java.util.List;
import org.collectionspace.services.authorization.AuthZ;
-import org.collectionspace.services.authorization.Permission;
+import org.collectionspace.services.authorization.perms.Permission;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionRoleRel;
import org.collectionspace.services.authorization.Role;
import java.util.UUID;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
-import org.collectionspace.services.authorization.ActionType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.EffectType;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.ActionType;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.EffectType;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionActionUtil;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
-import org.collectionspace.services.authorization.PermissionsList;
+import org.collectionspace.services.authorization.perms.PermissionsList;
import org.collectionspace.services.authorization.PermissionsRolesList;
import org.collectionspace.services.client.RoleClient;
import org.collectionspace.services.authorization.Role;
perm.setActionGroup(ACTIONGROUP_CRUDL);
ArrayList<PermissionAction> pas = new ArrayList<PermissionAction>();
- perm.setActions(pas);
+ perm.setAction(pas);
PermissionAction permAction = PermissionActionUtil.create(perm, ActionType.CREATE);
pas.add(permAction);
perm.setActionGroup(ACTIONGROUP_RL);
ArrayList<PermissionAction> pas = new ArrayList<PermissionAction>();
- perm.setActions(pas);
+ perm.setAction(pas);
PermissionAction permAction = PermissionActionUtil.create(perm, ActionType.READ);
pas.add(permAction);
PermissionRole pr = new PermissionRole();
pr.setSubject(SubjectType.ROLE);
List<PermissionValue> permValues = new ArrayList<PermissionValue>();
- pr.setPermissions(permValues);
+ pr.setPermission(permValues);
PermissionValue permValue = new PermissionValue();
permValue.setPermissionId(perm.getCsid());
permValue.setResourceName(perm.getResourceName().toLowerCase());
// otherwise, return null;
//
if (roleValues.isEmpty() == false) {
- pr.setRoles(roleValues);
+ pr.setRole(roleValues);
result = pr;
}
List<Role> allRoleList = new ArrayList<Role>();
allRoleList.addAll(adminRoles);
allRoleList.addAll(readerRoles);
- rList.setRoles(allRoleList);
- toFile(rList, RolesList.class,
+ rList.setRole(allRoleList);
+ //
+ // Since it is missing the @XMLRootElement annotation, create a JAXBElement wrapper for the RoleList instance
+ // so we can have it marshalled it correctly.
+ //
+ org.collectionspace.services.authorization.ObjectFactory objectFactory = new org.collectionspace.services.authorization.ObjectFactory();
+ toFile(objectFactory.createRolesList(rList), RolesList.class,
fileName);
if (logger.isDebugEnabled()) {
logger.debug("exported roles to " + fileName);
List<Permission> allPermList = new ArrayList<Permission>();
allPermList.addAll(adminPermList);
allPermList.addAll(readerPermList);
- pcList.setPermissions(allPermList);
+ pcList.setPermission(allPermList);
+ org.collectionspace.services.authorization.ObjectFactory objectFactory =
+ new org.collectionspace.services.authorization.ObjectFactory();
toFile(pcList, PermissionsList.class,
+// toFile(objectFactory.createPermissionsList(pcList), PermissionsList.class,
fileName);
if (logger.isDebugEnabled()) {
logger.debug("exported permissions to " + fileName);
List<PermissionRole> allPermRoleList = new ArrayList<PermissionRole>();
allPermRoleList.addAll(adminPermRoleList);
allPermRoleList.addAll(readerPermRoleList);
- psrsl.setPermissionRoles(allPermRoleList);
+ psrsl.setPermissionRole(allPermRoleList);
toFile(psrsl, PermissionsRolesList.class,
fileName);
if (logger.isDebugEnabled()) {
import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import org.collectionspace.services.authorization.ActionType;
+import org.collectionspace.services.authorization.perms.ActionType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.collectionspace.services.authorization.AuthZ;
import org.collectionspace.services.authorization.CSpaceAction;
-import org.collectionspace.services.authorization.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.EffectType;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionException;
import org.collectionspace.services.authorization.PermissionRole;
-import org.collectionspace.services.authorization.PermissionsList;
+import org.collectionspace.services.authorization.perms.PermissionsList;
import org.collectionspace.services.authorization.PermissionsRolesList;
import org.collectionspace.services.authorization.RoleValue;
import org.collectionspace.services.authorization.URIResourceImpl;
* @throws Exception
*/
public void seedPermissions(String permFileName, String permRoleFileName) throws Exception {
- PermissionsList permList =
- (PermissionsList) fromFile(PermissionsList.class,
- permFileName);
- if (logger.isDebugEnabled()) {
- logger.debug("read permissions from " + permFileName);
- }
PermissionsRolesList permRoleList =
(PermissionsRolesList) fromFile(PermissionsRolesList.class,
permRoleFileName);
if (logger.isDebugEnabled()) {
logger.debug("read permissions-roles from " + permRoleFileName);
}
+ PermissionsList permList =
+ (PermissionsList) fromFile(PermissionsList.class,
+ permFileName);
+ if (logger.isDebugEnabled()) {
+ logger.debug("read permissions from " + permFileName);
+ }
seedPermissions(permList, permRoleList);
}
*/
public void seedPermissions(PermissionsList permList, PermissionsRolesList permRoleList)
throws Exception {
- for (Permission p : permList.getPermissions()) {
+ for (Permission p : permList.getPermission()) {
if (logger.isTraceEnabled()) {
logger.trace("adding permission for res=" + p.getResourceName() +
" for tenant=" + p.getTenantId());
}
- for (PermissionRole pr : permRoleList.getPermissionRoles()) {
- if (pr.getPermissions().get(0).getPermissionId().equals(p.getCsid())) {
+ for (PermissionRole pr : permRoleList.getPermissionRole()) {
+ if (pr.getPermission().get(0).getPermissionId().equals(p.getCsid())) {
addPermissionsForUri(p, pr);
}
}
private void addPermissionsForUri(Permission perm,
PermissionRole permRole) throws PermissionException {
List<String> principals = new ArrayList<String>();
- if (!perm.getCsid().equals(permRole.getPermissions().get(0).getPermissionId())) {
+ if (!perm.getCsid().equals(permRole.getPermission().get(0).getPermissionId())) {
throw new IllegalArgumentException("permission ids do not"
- + " match for role=" + permRole.getRoles().get(0).getRoleName()
- + " with permissionId=" + permRole.getPermissions().get(0).getPermissionId()
+ + " match for role=" + permRole.getRole().get(0).getRoleName()
+ + " with permissionId=" + permRole.getPermission().get(0).getPermissionId()
+ " for permission with csid=" + perm.getCsid());
}
- for (RoleValue roleValue : permRole.getRoles()) {
+ for (RoleValue roleValue : permRole.getRole()) {
principals.add(roleValue.getRoleName());
}
- List<PermissionAction> permActions = perm.getActions();
+ List<PermissionAction> permActions = perm.getAction();
for (PermissionAction permAction : permActions) {
CSpaceAction action = URIResourceImpl.getAction(permAction.getName());
URIResourceImpl uriRes = new URIResourceImpl(perm.getTenantId(),
<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<persistence-unit name="org.collectionspace.services.authorization">
- <class>org.collectionspace.services.authorization.Permission</class>
- <class>org.collectionspace.services.authorization.PermissionAction</class>
+ <class>org.collectionspace.services.authorization.perms.Permission</class>
+ <class>org.collectionspace.services.authorization.perms.PermissionAction</class>
<class>org.collectionspace.services.authorization.PermissionRoleRel</class>
<class>org.collectionspace.services.authorization.Role</class>
<class>org.collectionspace.services.authorization.AccountRoleRel</class>
log4j.logger.org.hibernate=WARN\r
log4j.logger.org.hibernate.cfg=WARN\r
log4j.logger.org.springframework=INFO\r
+log4j.logger.ch.elca.el4j.services.xmlmerge=INFO\r
+log4j.logger.com.sun.xml.bind.v2.runtime=DEBUG\r
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<parent>\r
<artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>\r
*/
package org.collectionspace.services.authorization;
+import org.collectionspace.services.authorization.perms.FooPermissionsList;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionsList;
import org.collectionspace.services.authorization.storage.AuthorizationDelegate;
+import org.collectionspace.services.client.PayloadOutputPart;
import org.collectionspace.services.client.PermissionClient;
import org.collectionspace.services.common.SecurityResourceBase;
import org.collectionspace.services.common.ServiceMessages;
@GET
@Produces("application/xml")
public PermissionsList getPermissionList(@Context UriInfo ui) {
- return (PermissionsList)getList(ui, Permission.class);
+ PermissionsList result = (PermissionsList)getList(ui, Permission.class);
+ PayloadOutputPart ppo = new PayloadOutputPart(PermissionsList.class.getName(), result);
+ System.out.println(ppo.asXML());
+
+ return result;
+ }
+
+ @GET
+ @Path("{csid}/foo")
+ @Produces("application/xml")
+ public FooPermissionsList getPermissionFooList(@Context UriInfo ui) {
+ FooPermissionsList result = new FooPermissionsList();
+ return result;
}
@PUT
*/
package org.collectionspace.services.authorization;
+import org.collectionspace.services.authorization.perms.Permission;
import org.collectionspace.services.authorization.storage.PermissionRoleDocumentHandler;
import org.collectionspace.services.common.AbstractCollectionSpaceResourceImpl;
import java.util.ArrayList;
import java.util.List;
-import org.collectionspace.services.authorization.ActionType;
+import org.collectionspace.services.authorization.perms.ActionType;
import org.collectionspace.services.authorization.AuthZ;
import org.collectionspace.services.authorization.CSpaceAction;
import org.collectionspace.services.authorization.CSpaceResource;
-import org.collectionspace.services.authorization.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.EffectType;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionException;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
SubjectType subject = PermissionRoleUtil.getRelationSubject(ctx, pr);
AuthZ authz = AuthZ.get();
if (subject.equals(SubjectType.ROLE)) {
- PermissionValue pv = pr.getPermissions().get(0);
+ PermissionValue pv = pr.getPermission().get(0);
Permission p = getPermission(pv.getPermissionId());
if (p == null) {
String msg = "addPermissions: No permission found for id=" + pv.getPermissionId();
throw new DocumentNotFoundException(msg);
}
CSpaceResource[] resources = getResources(p);
- String[] roles = getRoles(pr.getRoles());
+ String[] roles = getRoles(pr.getRole());
for (CSpaceResource res : resources) {
boolean grant = p.getEffect().equals(EffectType.PERMIT) ? true : false;
authz.addPermissions(res, roles, grant);
}
} else if (SubjectType.PERMISSION.equals(subject)) {
- RoleValue rv = pr.getRoles().get(0);
+ RoleValue rv = pr.getRole().get(0);
Role r = getRole(rv.getRoleId());
if (r == null) {
String msg = "addPermissions: No role found for id=" + rv.getRoleId();
//using r not rv ensures we're getting the "ROLE" prefix/qualified name
// This needs to use the qualified name, not the display name
String[] roles = {r.getRoleName()};
- for (PermissionValue pv : pr.getPermissions()) {
+ for (PermissionValue pv : pr.getPermission()) {
Permission p = getPermission(pv.getPermissionId());
if (p == null) {
String msg = "addPermissions: No permission found for id=" + pv.getPermissionId();
SubjectType subject = PermissionRoleUtil.getRelationSubject(ctx, pr);
AuthZ authz = AuthZ.get();
if (subject.equals(SubjectType.ROLE)) {
- List<PermissionValue> permissionValues = pr.getPermissions();
+ List<PermissionValue> permissionValues = pr.getPermission();
if (permissionValues != null & permissionValues.size() > 0) {
PermissionValue pv = permissionValues.get(0);
Permission p = getPermission(pv.getPermissionId());
throw new DocumentNotFoundException(msg);
}
CSpaceResource[] resources = getResources(p);
- String[] roles = getRoles(pr.getRoles());
+ String[] roles = getRoles(pr.getRole());
for (CSpaceResource res : resources) {
authz.deletePermissions(res, roles);
}
}
} else if (SubjectType.PERMISSION.equals(subject)) {
- List<RoleValue> roleValues = pr.getRoles();
+ List<RoleValue> roleValues = pr.getRole();
if (roleValues != null && roleValues.size() > 0) {
RoleValue rv = roleValues.get(0);
Role r = getRole(rv.getRoleId());
//using r not rv ensures we're getting the "ROLE" prefix/qualified name
// This needs to use the qualified name, not the display name
String[] roles = {r.getRoleName()};
- for (PermissionValue pv : pr.getPermissions()) {
+ for (PermissionValue pv : pr.getPermission()) {
Permission p = getPermission(pv.getPermissionId());
if (p == null) {
String msg = "deletePermissions: No permission found for id=" + pv.getPermissionId();
private static CSpaceResource[] getResources(Permission p) {
List<CSpaceResource> rl = new ArrayList<CSpaceResource>();
- for (PermissionAction pa : p.getActions()) {
+ for (PermissionAction pa : p.getAction()) {
CSpaceResource res = null;
if (p.getTenantId() == null) {
res = new URIResourceImpl(p.getResourceName(),
import java.util.List;
import java.util.UUID;
-import org.collectionspace.services.authorization.AccountRole;
-import org.collectionspace.services.authorization.AccountRoleRel;
-import org.collectionspace.services.authorization.ActionType;
-import org.collectionspace.services.authorization.AuthZ;
+import org.collectionspace.services.authorization.perms.ActionType;
import org.collectionspace.services.authorization.CSpaceAction;
-import org.collectionspace.services.authorization.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
-import org.collectionspace.services.authorization.PermissionActionUtil;
-import org.collectionspace.services.authorization.PermissionsList;
-import org.collectionspace.services.authorization.PermissionsRolesList;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
+import org.collectionspace.services.authorization.perms.PermissionsList;
import org.collectionspace.services.authorization.URIResourceImpl;
-import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl;
import org.collectionspace.services.common.document.BadRequestException;
import org.collectionspace.services.common.document.DocumentFilter;
import org.collectionspace.services.common.document.DocumentWrapper;
private void handlePermissionActions(Permission perm) {
//FIXME: REM - Having Java class loader issues with ActionType class. Not sure of the cause.
try {
- List<PermissionAction> permActions = perm.getActions();
+ List<PermissionAction> permActions = perm.getAction();
for (PermissionAction permAction : permActions) {
CSpaceAction action = getAction(permAction.getName());
URIResourceImpl uriRes = new URIResourceImpl(perm.getTenantId(),
if (from.getEffect() != null) {
to.setEffect(from.getEffect());
}
- List<PermissionAction> fromActions = from.getActions();
+ List<PermissionAction> fromActions = from.getAction();
if (!fromActions.isEmpty()) {
//override the whole list, no reconcilliation by design
- to.setActions(fromActions);
+ to.setAction(fromActions);
}
if (logger.isDebugEnabled()) {
PermissionsList permissionsList = new PermissionsList();
List<Permission> list = new ArrayList<Permission>();
- permissionsList.setPermissions(list);
+ permissionsList.setPermission(list);
for (Object obj : wrapDoc.getWrappedObject()) {
Permission permission = (Permission) obj;
sanitize(permission);
import java.util.ArrayList;
import java.util.List;
-import org.collectionspace.services.authorization.AccountRole;
-import org.collectionspace.services.authorization.AccountRoleRel;
-import org.collectionspace.services.authorization.Permission;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionRoleRel;
import org.collectionspace.services.authorization.PermissionValue;
-import org.collectionspace.services.authorization.PermissionsList;
import org.collectionspace.services.authorization.PermissionsRolesList;
import org.collectionspace.services.authorization.RoleValue;
import org.collectionspace.services.authorization.SubjectType;
import org.collectionspace.services.common.authorization_mgt.AuthorizationRoleRel;
-import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl;
import org.collectionspace.services.common.document.DocumentFilter;
import org.collectionspace.services.common.document.DocumentWrapper;
import org.collectionspace.services.common.storage.jpa.JpaDocumentHandler;
if (SubjectType.ROLE.equals(subject)) {
List<PermissionValue> pvs = new ArrayList<PermissionValue>();
- pr.setPermissions(pvs);
+ pr.setPermission(pvs);
PermissionValue pv = AuthorizationRoleRel.buildPermissionValue(prr0);
pvs.add(pv);
//add roles
List<RoleValue> rvs = new ArrayList<RoleValue>();
- pr.setRoles(rvs);
+ pr.setRole(rvs);
for (PermissionRoleRel prr : prrl) {
RoleValue rv = AuthorizationRoleRel.buildRoleValue(prr);
rvs.add(rv);
} else if (SubjectType.PERMISSION.equals(subject)) {
List<RoleValue> rvs = new ArrayList<RoleValue>();
- pr.setRoles(rvs);
+ pr.setRole(rvs);
RoleValue rv = AuthorizationRoleRel.buildRoleValue(prr0);
rvs.add(rv);
//add permssions
List<PermissionValue> pvs = new ArrayList<PermissionValue>();
- pr.setPermissions(pvs);
+ pr.setPermission(pvs);
for (PermissionRoleRel prr : prrl) {
PermissionValue pv = AuthorizationRoleRel.buildPermissionValue(prr);
pvs.add(pv);
import org.collectionspace.services.common.storage.jpa.JpaRelationshipStorageClient;
import org.collectionspace.services.common.storage.jpa.JpaStorageUtils;
-import org.collectionspace.services.authorization.Permission;
+import org.collectionspace.services.authorization.perms.Permission;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionRoleRel;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
-import org.collectionspace.services.authorization.RoleResource;
import org.collectionspace.services.authorization.RoleValue;
import org.collectionspace.services.authorization.SubjectType;
boolean handleDelete)
throws DocumentNotFoundException {
if (subject.equals(SubjectType.ROLE)) {
- List<PermissionValue> permissionValues = pr.getPermissions();
+ List<PermissionValue> permissionValues = pr.getPermission();
if (permissionValues != null && permissionValues.size() > 0) {
PermissionValue pv = permissionValues.get(0);
- for (RoleValue rv : pr.getRoles()) {
+ for (RoleValue rv : pr.getRole()) {
PermissionRoleRel prr = buildPermissonRoleRel(pv, rv, subject, handleDelete);
prrl.add(prr);
}
}
} else if (subject.equals(SubjectType.PERMISSION)) {
- List<RoleValue> roleValues = pr.getRoles();
+ List<RoleValue> roleValues = pr.getRole();
if (roleValues != null && roleValues.size() > 0) {
RoleValue rv = roleValues.get(0);
- for (PermissionValue pv : pr.getPermissions()) {
+ for (PermissionValue pv : pr.getPermission()) {
PermissionRoleRel prr = buildPermissonRoleRel(pv, rv, subject, handleDelete);
prrl.add(prr);
}
package org.collectionspace.services.authorization.storage;
import org.collectionspace.services.common.document.DocumentNotFoundException;
-import org.collectionspace.services.authorization.Permission;
+import org.collectionspace.services.authorization.perms.Permission;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
if (action.equals(Action.CREATE)) {
- for (PermissionValue pv : permRole.getPermissions()) {
+ for (PermissionValue pv : permRole.getPermission()) {
if (isPermissionInvalid(pv.getPermissionId(), msgBldr)) {
invalid = true;
}
}
- for (RoleValue rv : permRole.getRoles()) {
+ for (RoleValue rv : permRole.getRole()) {
if (isRoleInvalid(rv.getRoleId(), msgBldr)) {
invalid = true;
}
package org.collectionspace.services.authorization.storage;
-import org.collectionspace.services.authorization.Permission;
+import org.collectionspace.services.authorization.perms.Permission;
import org.collectionspace.services.common.ServiceMessages;
import org.collectionspace.services.common.context.ServiceContext;
import org.collectionspace.services.common.document.DocumentHandler.Action;
}
// Note that we do not allow update of locks
if (logger.isDebugEnabled()) {
- logger.debug("merged role=" + JaxbUtils.toString(to, Role.class));
+ org.collectionspace.services.authorization.ObjectFactory objectFactory =
+ new org.collectionspace.services.authorization.ObjectFactory();
+ logger.debug("merged role=" + JaxbUtils.toString(objectFactory.createRole(to) ,Role.class));
}
return to;
}
RolesList rolesList = new RolesList();
List<Role> list = new ArrayList<Role>();
- rolesList.setRoles(list);
+ rolesList.setRole(list);
for (Object obj : wrapDoc.getWrappedObject()) {
Role role = (Role) obj;
sanitize(role);
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<artifactId>org.collectionspace.services.authorization</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>property-listener-injector</artifactId>\r
</dependency>\r
<dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
+ <groupId>javax.persistence</groupId>\r
+ <artifactId>persistence-api</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-entitymanager</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.jvnet.hyperjaxb3</groupId>\r
+ <artifactId>hyperjaxb3-ejb-runtime</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <artifactId>org.collectionspace.services.hyperjaxb</artifactId>\r
+ <version>${project.version}</version>\r
+ </dependency> \r
+<!-- \r
<dependency>\r
<groupId>javax.persistence</groupId>\r
<artifactId>persistence-api</artifactId>\r
<groupId>org.hibernate</groupId>\r
<artifactId>hibernate-entitymanager</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <artifactId>org.collectionspace.services.hyperjaxb</artifactId>\r
+ <version>${project.version}</version>\r
+ <exclusions>\r
+ <exclusion>\r
+ <artifactId>jaxb-impl</artifactId>\r
+ <groupId>com.sun.xml.bind</groupId>\r
+ </exclusion>\r
+ </exclusions>\r
+ </dependency>\r
+-->\r
</dependencies>\r
\r
<build>\r
<defaultGoal>install</defaultGoal>\r
<plugins>\r
<plugin>\r
- <!-- maven-hyperjaxb3-plugin generates jaxb + jpa bindings -->\r
<groupId>org.jvnet.hyperjaxb3</groupId>\r
<artifactId>maven-hyperjaxb3-plugin</artifactId>\r
</plugin>\r
jaxb:extensionBindingPrefixes="hj orm xjc"\r
>\r
\r
- <!--\r
- Avoid XmlRootElement nightmare:\r
- See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html\r
- -->\r
-\r
- <!--xs:annotation>\r
- Note that roles.xsd already defines global bindings for the authorization namespace\r
- so, it is not necessary to give the bindingings here because all the xsds are compiled\r
- at once for this namespace\r
- <xs:appinfo>\r
- <jaxb:globalBindings>\r
- <xjc:simple />\r
- </jaxb:globalBindings>\r
- </xs:appinfo>\r
- </xs:annotation-->\r
-\r
<xs:include schemaLocation="authorization_common.xsd"/>\r
\r
<xs:element name="account_permission" type="account_permission"/>\r
jaxb:extensionBindingPrefixes="hj orm xjc"
>
- <!--
- Avoid XmlRootElement nightmare:
- See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
<!--
Notes for MySQL
MySQL puts key length limit of 1000 bytes
hbm2ddl makes column length >= 256 as long text, such as column cannot be used
in defining a key (pk, fk or constraint)
-->
- <!--xs:annotation>
- Note that roles.xsd already defines global bindings for the authorization namespace
- so, it is not necessary to give the bindingings here because all the xsds are compiled
- at once for this namespace
- <xs:appinfo>
- <jaxb:globalBindings>
- <xjc:simple />
- </jaxb:globalBindings>
- </xs:appinfo>
- </xs:annotation-->
<xs:include schemaLocation="authorization_common.xsd"/>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="1.0" elementFormDefault="unqualified"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns="http://collectionspace.org/services/authorization"
targetNamespace="http://collectionspace.org/services/authorization"
version="0.1"
- jaxb:version="1.0"
jaxb:extensionBindingPrefixes="hj orm xjc"
>
- <!--
- see http://weblogs.java.net/blog/2006/03/03/why-does-jaxb-put-xmlrootelement-sometimes-not-always
- for more details behind xjc:simple
- -->
- <!--xs:annotation>
- Note that roles.xsd already defines global bindings for the authorization namespace
- so, it is not necessary to give the bindings here because all the xsds are compiled
- at once for this namespace
- <xs:appinfo>
- <jaxb:globalBindings>
- <xjc:simple />
- </jaxb:globalBindings>
- </xs:appinfo>
- </xs:annotation-->
-
<xs:complexType name="account_value" >
<xs:annotation>
<xs:documentation>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
- CollectionSpace default (security) authorization provider schema (XSD)
-
- Entity(s) : permission
- Used for:
-
- $LastChangedRevision: 916 $
- $LastChangedDate: 2009-11-05 16:59:20 -0800 (Thu, 05 Nov 2009) $
--->
-
-<xs:schema
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:ns="http://collectionspace.org/services/authorization"
- xmlns="http://collectionspace.org/services/authorization"
- targetNamespace="http://collectionspace.org/services/authorization"
- version="0.1"
- jaxb:version="1.0"
- jaxb:extensionBindingPrefixes="hj orm xjc"
- >
-
- <!--
- Avoid XmlRootElement nightmare:
- See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
-
- <!--
- see http://weblogs.java.net/blog/2006/03/03/why-does-jaxb-put-xmlrootelement-sometimes-not-always
- for more details behind xjc:simple
- -->
- <!--xs:annotation>
- Note that roles.xsd already defines global bindings for the authorization namespace
- so, it is not necessary to give the bindingings here because all the xsds are compiled
- at once for this namespace
- <xs:appinfo>
- <jaxb:globalBindings>
- <xjc:simple />
- </jaxb:globalBindings>
- </xs:appinfo>
- </xs:annotation-->
- <xs:element name="permission" type="permission"/>
- <xs:complexType name="permission">
- <xs:annotation>
- <xs:documentation>
- CspacePermissionConfig describes permission in CollectionSpace
- - resourceName could be a service path, e.g. collectionobjects or intakes
- no need to give slash at the beginning or end
- - attributeName could be an attribute of the service schema
- e.g. otherNumber from collectionobjects_common
- - actionGroup is label that can be used by a client to "group" sets of actions for operations
- like searching for permissions by a specific actionGroup label.
- - action describes the actions that could be taken on given resource (and attribute)
- - effect describes the effect of the access control for the action
- performed on the given resource (and attribute)
- </xs:documentation>
- <xs:appinfo>
- <hj:entity>
- <orm:table name="permissions"/>
- </hj:entity>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
-
- <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="description" />
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="resourceName" type="xs:string" minOccurs="1" maxOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="resource_name" length="128" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="attributeName" type="xs:string" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="attribute_name" length="128" nullable="true"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="actionGroup" type="xs:string" minOccurs="0" maxOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="action_group" length="128" nullable="true"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="action" type="permission_action" minOccurs="1" maxOccurs="unbounded"/>
- <xs:element name="effect" type="effect_type" minOccurs="1" maxOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="effect" length="32" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="tenant_id" type="xs:string" minOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="tenant_id" length="128" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="createdAt" type="xs:dateTime">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="created_at" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="updatedAt" type="xs:dateTime">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="updated_at" />
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="csid" type="xs:string">
- <xs:annotation>
- <xs:appinfo>
- <hj:id>
- <orm:column name="csid" length="128" nullable="false"/>
- </hj:id>
- </xs:appinfo>
- </xs:annotation>
- </xs:attribute>
- </xs:complexType>
-
- <xs:complexType name="permission_action">
- <xs:annotation>
- <xs:appinfo>
- <hj:entity>
- <orm:table name="permissions_actions">
- </orm:table>
- </hj:entity>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="name" type="action_type" minOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="name" length="128" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="objectIdentity" type="xs:string" minOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="objectIdentity" length="128" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- <xs:element name="objectIdentityResource" type="xs:string" minOccurs="1">
- <xs:annotation>
- <xs:appinfo>
- <hj:basic>
- <orm:column name="objectIdentityResource" length="128" nullable="false"/>
- </hj:basic>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:simpleType name = "action_type">
- <xs:restriction base = "xs:string">
- <xs:enumeration value = "CREATE"/>
- <xs:enumeration value = "READ"/>
- <xs:enumeration value = "UPDATE"/>
- <xs:enumeration value = "DELETE"/>
- <xs:enumeration value = "SEARCH"/>
- <xs:enumeration value = "START"/>
- <xs:enumeration value = "STOP"/>
- <xs:enumeration value = "RUN"/>
- <xs:enumeration value = "ADMIN"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name = "effect_type">
- <xs:restriction base = "xs:string">
- <xs:enumeration value = "PERMIT"/>
- <xs:enumeration value = "DENY"/>
- </xs:restriction>
- </xs:simpleType>
-
-</xs:schema>
-
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!--
- CollectionSpace default (security) authorization provider schema (XSD)
-
- Entity(s) : permission
- Used for:
-
- $LastChangedRevision: 916 $
- $LastChangedDate: 2009-11-05 16:59:20 -0800 (Thu, 05 Nov 2009) $
--->
-
-<xs:schema
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:ns="http://collectionspace.org/services/authorization"
- xmlns="http://collectionspace.org/services/authorization"
- targetNamespace="http://collectionspace.org/services/authorization"
- version="0.1"
- jaxb:extensionBindingPrefixes="hj orm"
- >
-
- <!--
- Avoid XmlRootElement nightmare:
- See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
-
- <xs:include schemaLocation="permissions.xsd"/>
- <xs:element name="permissions_list">
- <xs:complexType>
- <xs:annotation>
- <xs:appinfo>
- <hj:ignored/>
- </xs:appinfo>
- </xs:annotation>
- <xs:sequence>
- <xs:annotation>
- <xs:documentation>permission configuration list</xs:documentation>
- </xs:annotation>
- <xs:element name="permission" type="ns:permission" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
-</xs:schema>
-
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="1.0" elementFormDefault="unqualified"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns="http://collectionspace.org/services/authorization"
targetNamespace="http://collectionspace.org/services/authorization"
version="0.1"
- jaxb:version="1.0"
jaxb:extensionBindingPrefixes="hj orm xjc"
>
- <!--
- Avoid XmlRootElement nightmare:
- See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
<!--
Notes for MySQL
MySQL puts key length limit of 1000 bytes
hbm2ddl makes column length >= 256 as long text, such as column cannot be used
in defining a key (pk, fk or constraint)
-->
- <!--xs:annotation>
- Note that roles.xsd already defines global bindings for the authorization namespace
- so, it is not necessary to give the bindingings here because all the xsds are compiled
- at once for this namespace
- <xs:appinfo>
- <jaxb:globalBindings>
- <xjc:simple />
- </jaxb:globalBindings>
- </xs:appinfo>
- </xs:annotation-->
<xs:include schemaLocation="authorization_common.xsd"/>
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="1.0" elementFormDefault="unqualified"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:ns="http://collectionspace.org/services/authorization"
xmlns="http://collectionspace.org/services/authorization"
targetNamespace="http://collectionspace.org/services/authorization"
- version="0.1"
- jaxb:version="1.0"
- jaxb:extensionBindingPrefixes="hj orm xjc"
+ version="0.1"
+ jaxb:extensionBindingPrefixes="hj orm xjc"
>
- <!--
- Notes for MySQL
- MySQL puts key length limit of 1000 bytes
- username - rolename constraint should be within 1000 bytes
- hbm2ddl makes column length >= 256 as long text, such as column cannot be used
- in defining a key (pk, fk or constraint)
- -->
-
<!--
see http://weblogs.java.net/blog/2006/03/03/why-does-jaxb-put-xmlrootelement-sometimes-not-always
for more details behind xjc:simple
-->
+ <!--
<xs:annotation>
<xs:appinfo>
<jaxb:globalBindings>
</jaxb:globalBindings>
</xs:appinfo>
</xs:annotation>
+ -->
+
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:globalBindings generateIsSetMethod="true" localScoping="toplevel">
+ <jaxb:serializable/>
+ </jaxb:globalBindings>
+ </xs:appinfo>
+ </xs:annotation>
+
+ <!--
+ Notes for MySQL
+ MySQL puts key length limit of 1000 bytes
+ username - rolename constraint should be within 1000 bytes
+ hbm2ddl makes column length >= 256 as long text, such as column cannot be used
+ in defining a key (pk, fk or constraint)
+ -->
+
<xs:element name="role" type="role"/>
<!-- role type has a name so that it could be referred from roles_list -->
<xs:complexType name="role">
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="1.0" elementFormDefault="unqualified"
xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
xmlns:ns="http://collectionspace.org/services/authorization"
-->
<xs:include schemaLocation="roles.xsd"/>
- <xs:element name="roles_list">
- <xs:complexType>
+ <xs:element name="roles_list" type="roles_list"/>
+ <xs:complexType name="roles_list">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
<xs:annotation>
- <xs:appinfo>
- <hj:ignored/>
- </xs:appinfo>
+ <xs:documentation>role list</xs:documentation>
</xs:annotation>
- <xs:sequence>
- <xs:annotation>
- <xs:documentation>role list</xs:documentation>
- </xs:annotation>
- <xs:element name="role" type="ns:role" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="role" type="ns:role" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authorization</artifactId>
<parent>\r
<artifactId>org.collectionspace.services.authorization</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<sql.dir>${basedir}/src/main/resources/db</sql.dir>\r
</properties>\r
<dependencies>\r
- <dependency>\r
- <groupId>com.sun.xml.bind</groupId>\r
- <artifactId>jaxb-impl</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2-commons</groupId>\r
- <artifactId>property-listener-injector</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
- </dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization.jaxb</artifactId>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
</dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
-
<artifactId>postgresql</artifactId>
\r+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
</dependency>\r
</dependencies>\r
\r
drop table if exists roles;
create table accounts_roles (HJID bigint not null auto_increment, account_id varchar(128) not null, created_at datetime not null, role_id varchar(128) not null, role_name varchar(255), screen_name varchar(255), user_id varchar(128) not null, primary key (HJID), unique (account_id, role_id));
create table permissions (csid varchar(128) not null, action_group varchar(128), attribute_name varchar(128), created_at datetime not null, description varchar(255), effect varchar(32) not null, resource_name varchar(128) not null, tenant_id varchar(128) not null, updated_at datetime, primary key (csid));
-create table permissions_actions (HJID bigint not null auto_increment, name varchar(128) not null, objectIdentity varchar(128) not null, objectIdentityResource varchar(128) not null, ACTIONS_PERMISSION_CSID varchar(128), primary key (HJID));
+create table permissions_actions (HJID bigint not null auto_increment, name varchar(128) not null, objectIdentity varchar(128) not null, objectIdentityResource varchar(128) not null, ACTION__PERMISSION_CSID varchar(128), primary key (HJID));
create table permissions_roles (HJID bigint not null auto_increment, actionGroup varchar(255), created_at datetime not null, permission_id varchar(128) not null, permission_resource varchar(255), role_id varchar(128) not null, role_name varchar(255), primary key (HJID), unique (permission_id, role_id));
create table roles (csid varchar(128) not null, created_at datetime not null, description varchar(255), displayname varchar(200) not null, rolegroup varchar(255), rolename varchar(200) not null, tenant_id varchar(128) not null, metadata_protection varchar(255), perms_protection varchar(255), updated_at datetime, primary key (csid), unique (rolename, tenant_id), unique (displayname, tenant_id));
-alter table permissions_actions add index FK85F82042E2DC84FD (ACTIONS_PERMISSION_CSID), add constraint FK85F82042E2DC84FD foreign key (ACTIONS_PERMISSION_CSID) references permissions (csid);
+alter table permissions_actions add index FK85F82042E2DC84FD (ACTION__PERMISSION_CSID), add constraint FK85F82042E2DC84FD foreign key (ACTION__PERMISSION_CSID) references permissions (csid);
<parent>
<artifactId>org.collectionspace.services.authorization</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authorization.service</artifactId>
package org.collectionspace.services.authorization;\r
\r
-import org.collectionspace.services.authorization.PermissionAction;\r
-import org.collectionspace.services.authorization.ActionType;\r
-import org.collectionspace.services.authorization.Permission;\r
+import org.collectionspace.services.authorization.perms.PermissionAction;\r
+import org.collectionspace.services.authorization.perms.ActionType;\r
+import org.collectionspace.services.authorization.perms.Permission;\r
\r
public class PermissionActionUtil {\r
\r
package org.collectionspace.services.authorization;
import java.util.StringTokenizer;
+import org.collectionspace.services.authorization.perms.ActionType;
/**
* A security resource that represents URI and method invoked on it
<property name="sidIdentityQuery" value="${db.spring.acl.sidIdentityQuery}"/>
</bean>
+ <!-- Until we resolve the JNDI issue with Nuxeo startup, we can't use this datasource
<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="CspaceDS"/>
</bean>
+ -->
+
+ <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+ <property name="url" value="jdbc:mysql://localhost:3306/cspace"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ </bean>
<bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
<constructor-arg ref="dataSource"/>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.batch.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<artifactId>org.collectionspace.services.batch</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.batch</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.batch</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.batch.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.batch</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.blob.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<artifactId>org.collectionspace.services.blob</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.blob</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.blob</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.blob.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.blob</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-surefire-plugin</artifactId>\r
<version>2.4.3</version>\r
+ <scope>test</scope>\r
</dependency>\r
<dependency>\r
<groupId>commons-io</groupId>\r
import java.util.List;\r
\r
import javax.xml.bind.JAXBContext;\r
+import javax.xml.bind.JAXBElement;\r
import javax.xml.bind.Marshaller;\r
import javax.xml.bind.Unmarshaller;\r
import javax.xml.transform.stream.StreamSource;\r
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();\r
try {\r
String thePackage = jaxbObject.getClass().getPackage().getName();\r
+ if (thePackage.equals(JAXBElement.class.getPackage().getName())) {\r
+ JAXBElement jaxbElement = (JAXBElement)jaxbObject;\r
+ thePackage = jaxbElement.getValue().getClass().getPackage().getName();\r
+ }\r
JAXBContext jc = JAXBContext.newInstance(thePackage);\r
//Create marshaller\r
Marshaller m = jc.createMarshaller();\r
#url of the collectionspace server\r
cspace.url=http://localhost:8180/cspace-services/\r
+#cspace.url=http://nightly.collectionspace.org:8180/cspace-services/\r
+\r
#cspace.url=http://localhost:8200/cspace-services/\r
#for sockspy: \r
#cspace.url=http://localhost:8280/cspace-services/\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.collectionobject.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version> \r
+ <version>1.14-SNAPSHOT</version> \r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject.client.samples</artifactId>
<packaging>pom</packaging>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
<name>collectionobject.client.samples</name>
<modules>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="output" path="target/classes"/>\r
</classpath>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<artifactId>org.collectionspace.services.collectionobject.client.sample</artifactId>
<packaging>jar</packaging>
<name>collectionobject.client.sample</name>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
<dependencies>
<!-- keep slf4j dependencies on the top -->
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusion>\r
</exclusions>\r
</dependency>\r
-\r
-<!-- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency> -->\r
</dependencies>\r
\r
<build>\r
// Private Methods\r
// \r
private void validateCollectionobjectsCommon(CollectionobjectsCommon co) throws AssertionError {\r
- assert(co != null);\r
+ CS_ASSERT(co != null);\r
String objectNumber = co.getObjectNumber();\r
- assert(objectNumber != null);\r
- assert(objectNumber.isEmpty() == false) : OBJECTNUMBER_NULL_ERROR;\r
+ CS_ASSERT(objectNumber != null);\r
+ CS_ASSERT(objectNumber.isEmpty() == false, OBJECTNUMBER_NULL_ERROR);\r
\r
}\r
}\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.common-test</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
<name>services.common-test</name>
<url>http://maven.apache.org</url>
<packaging>jar</packaging>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>org.collectionspace.services.common-api</artifactId>\r
<version>${project.version}</version>\r
</dependency>\r
+ <!-- \r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo.quote-api</artifactId> \r
<version>${project.version}</version>\r
</dependency>\r
+ -->\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.jaxb</artifactId>\r
</dependency>\r
\r
<!-- Utilities -->\r
+ <!-- For NuxeoRESTClient.java class -->\r
+ <dependency>\r
+ <groupId>org.restlet</groupId>\r
+ <artifactId>org.restlet</artifactId>\r
+ <version>1.0.7</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>com.noelios.restlet</groupId>\r
+ <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
+ <version>1.0.7</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>com.noelios.restlet</groupId>\r
+ <artifactId>com.noelios.restlet</artifactId>\r
+ <version>1.0.7</version>\r
+ </dependency>\r
\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
<dependency>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
+ <scope>provided</scope>\r
</dependency>\r
<dependency>\r
<groupId>postgresql</groupId>\r
<artifactId>postgresql</artifactId>\r
+ <scope>provided</scope>\r
</dependency>\r
<dependency>\r
<groupId>javax.persistence</groupId>\r
<artifactId>persistence-api</artifactId>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>com.sun.xml.bind</groupId>\r
- <artifactId>jaxb-impl</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2-commons</groupId>\r
- <artifactId>property-listener-injector</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
- </dependency>\r
-\r
<!-- jboss -->\r
<dependency>\r
<groupId>org.jboss.resteasy</groupId>\r
</dependency>\r
<!-- jboss -->\r
<dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jbosssx</artifactId>\r
- <version>4.2.3.GA</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- <dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jboss-remoting</artifactId>\r
- <version>2.2.2.SP8</version>\r
- <scope>provided</scope>\r
- </dependency>\r
+ <groupId>org.jboss.security</groupId>\r
+ <artifactId>jbosssx</artifactId>\r
+ <version>2.0.3.SP1</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.jboss.remoting</groupId>\r
+ <artifactId>jboss-remoting</artifactId>\r
+ <scope>provided</scope>\r
+ </dependency>\r
<!-- nuxeo -->\r
+ <dependency>\r
+ <groupId>org.nuxeo.runtime</groupId>\r
+ <artifactId>nuxeo-runtime-launcher</artifactId>\r
+ <version>${nuxeo.platform.version}</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.nuxeo.ecm.platform</groupId>\r
<artifactId>nuxeo-platform-mimetype-api</artifactId>\r
<artifactId>nuxeo-core-io</artifactId>\r
<version>${nuxeo.core.version}</version>\r
</dependency>\r
+<!-- \r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-facade</artifactId>\r
<version>${nuxeo.core.version}</version>\r
</dependency>\r
+ -->\r
<dependency>\r
<groupId>org.nuxeo.ecm.core</groupId>\r
<artifactId>nuxeo-core-io</artifactId>\r
<version>4.1.0</version>\r
</dependency>\r
\r
- <!-- fixme remove restlet dependencies once REST client is no longer used -->\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
<dependency>\r
<groupId>commons-fileupload</groupId>\r
<artifactId>commons-fileupload</artifactId>\r
@Override
public void contextInitialized(ServletContextEvent event) {
try {
- ServletContext sc = event.getServletContext();
-
//create repository select to stop jboss from jamming
//our log on top of theirs
// LogManager.setRepositorySelector(new CollectionSpaceLog4jRepositorySelector(),
// null);
- ServiceMain svcMain = ServiceMain.getInstance(); //first access initializes as well
+ ServiceMain svcMain = ServiceMain.getInstance();
svcMain.retrieveAllWorkspaceIds();
} catch (Exception e) {
import java.util.List;\r
import java.util.UUID;\r
\r
+import javax.naming.NamingException;\r
import javax.security.auth.login.LoginException;\r
+import javax.servlet.ServletContext;\r
+import javax.sql.DataSource;\r
\r
+import org.collectionspace.authentication.AuthN;\r
import org.collectionspace.services.common.config.ServicesConfigReaderImpl;\r
import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;\r
import org.collectionspace.services.common.init.IInitHandler;\r
import org.collectionspace.services.common.types.PropertyItemType;\r
import org.collectionspace.services.common.types.PropertyType;\r
import org.collectionspace.services.nuxeo.client.java.DocHandlerBase;\r
-import org.collectionspace.services.nuxeo.client.java.NuxeoConnector;\r
+//import org.collectionspace.services.nuxeo.client.java.NuxeoConnector;\r
+//import org.collectionspace.services.nuxeo.client.java.NxConnect;\r
+import org.collectionspace.services.nuxeo.client.java.NuxeoConnectorEmbedded;\r
import org.collectionspace.services.nuxeo.client.java.TenantRepository;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
*/\r
private static volatile ServiceMain instance = null;\r
final Logger logger = LoggerFactory.getLogger(ServiceMain.class);\r
- private NuxeoConnector nuxeoConnector;\r
+ private NuxeoConnectorEmbedded nuxeoConnector;\r
+ private static ServletContext servletContext;\r
private String serverRootDir = null;\r
private ServicesConfigReaderImpl servicesConfigReader;\r
private TenantBindingConfigReaderImpl tenantBindingConfigReader;\r
+ \r
private static final String TENANT_ADMIN_ACCT_PREFIX = "admin@"; \r
private static final String TENANT_READER_ACCT_PREFIX = "reader@"; \r
private static final String ROLE_PREFIX = "ROLE_"; \r
private static final String TENANT_READER_ROLE_SUFFIX = "_TENANT_READER"; \r
private static final String DEFAULT_ADMIN_PASSWORD = "Administrator";\r
private static final String DEFAULT_READER_PASSWORD = "reader";\r
+ private static final String SERVER_HOME_PROPERTY = "catalina.home";\r
+ \r
+ private static DataSource cspaceDataSource = null;\r
+ private static DataSource nuxeoDataSource = null;\r
\r
private ServiceMain() {\r
//empty\r
}\r
\r
+ /*\r
+ * FIXME: REM - This method is no longer necessary and can should be removed.\r
+ * \r
+ * Set this singletons ServletContext without any call to initialize\r
+ */\r
+ @Deprecated\r
+ private static void setServletContext(ServletContext servletContext) {\r
+ if (servletContext != null) {\r
+ synchronized (ServiceMain.class) {\r
+ ServiceMain.servletContext = servletContext;\r
+ }\r
+ }\r
+ }\r
+ \r
+ public static ServiceMain getInstance(ServletContext servletContext) {\r
+ ServiceMain.servletContext = servletContext;\r
+ return ServiceMain.getInstance();\r
+ }\r
+ \r
/**\r
* getInstance returns the ServiceMain singleton instance after proper\r
* initialization in a thread-safe manner\r
}\r
\r
private void initialize() throws Exception {\r
+ if (logger.isDebugEnabled() == true) {\r
+ System.out.print("Pausing 1 seconds for you to attached the debugger");\r
+ long startTime, currentTime;\r
+ currentTime = startTime = System.currentTimeMillis();\r
+ long stopTime = startTime + 1 * 1000; //5 seconds\r
+ do {\r
+ if (currentTime % 1000 == 0) {\r
+ System.out.print(".");\r
+ }\r
+ currentTime = System.currentTimeMillis();\r
+ } while (currentTime < stopTime);\r
+ \r
+ System.out.println();\r
+ System.out.println("Resuming cspace services initialization.");\r
+ }\r
+ \r
+ setDataSources();\r
setServerRootDir();\r
readConfig();\r
propagateConfiguredProperties();\r
} catch(Exception e) {\r
logger.error("Default Account setup failed on exception: " + e.getLocalizedMessage());\r
}\r
+ //\r
+ // Start up and initialize our embedded Nuxeo server instance\r
+ //\r
+ if (getClientType().equals(ClientType.JAVA)) {\r
+ nuxeoConnector = NuxeoConnectorEmbedded.getInstance();\r
+ nuxeoConnector.initialize(getServicesConfigReader().getConfiguration().getRepositoryClient(),\r
+ ServiceMain.servletContext);\r
+ }\r
+\r
try {\r
- firePostInitHandlers();\r
+ //\r
+ // Invoke all post-initialization handlers, passing in a DataSource instance of the Nuxeo db.\r
+ // Typically, these handlers modify column types and add indexes to the Nuxeo db schema.\r
+ //\r
+ firePostInitHandlers(ServiceMain.nuxeoDataSource);\r
} catch(Exception e) {\r
logger.error("ServiceMain.initialize firePostInitHandlers failed on exception: " + e.getLocalizedMessage());\r
}\r
-\r
- if (getClientType().equals(ClientType.JAVA)) {\r
- nuxeoConnector = NuxeoConnector.getInstance();\r
- nuxeoConnector.initialize(getServicesConfigReader().getConfiguration().getRepositoryClient());\r
- }\r
}\r
\r
/**\r
}\r
}\r
\r
+ /*\r
+ * FIXME: REM - This method is way too big -over 300 lines! We need to break it up into\r
+ * smaller, discrete, sub-methods.\r
+ */\r
private void createDefaultAccounts() {\r
if (logger.isDebugEnabled()) {\r
logger.debug("ServiceMain.createDefaultAccounts starting...");\r
return TENANT_READER_ACCT_PREFIX+tenantName;\r
}\r
\r
- private void firePostInitHandlers() throws Exception {\r
+ private void firePostInitHandlers(DataSource dataSource) throws Exception {\r
Hashtable<String, TenantBindingType> tenantBindingTypeMap = tenantBindingConfigReader.getTenantBindings();\r
//Loop through all tenants in tenant-bindings.xml\r
for (TenantBindingType tbt: tenantBindingTypeMap.values()){\r
Object o = instantiate(initHandlerClassname, IInitHandler.class);\r
if (o != null && o instanceof IInitHandler){\r
IInitHandler handler = (IInitHandler)o;\r
- handler.onRepositoryInitialized(sbt, fields, props);\r
+ handler.onRepositoryInitialized(dataSource, sbt, fields, props);\r
//The InitHandler may be the default one,\r
// or specialized classes which still implement this interface and are registered in tenant-bindings.xml.\r
}\r
/**\r
* @return the nuxeoConnector\r
*/\r
- public NuxeoConnector getNuxeoConnector() {\r
+ public NuxeoConnectorEmbedded getNuxeoConnector() {\r
return nuxeoConnector;\r
}\r
\r
return serverRootDir;\r
}\r
\r
+ /*\r
+ * Save a copy of the DataSource instances that exist in our initial JNDI context. For some reason, after starting up\r
+ * our instance of embedded Nuxeo, we can find our datasources. Therefore, we need to preserve the datasources in these\r
+ * static members.\r
+ */\r
+ private void setDataSources() throws NamingException {\r
+ ServiceMain.cspaceDataSource = JDBCTools.getDataSource(JDBCTools.CSPACE_REPOSITORY_NAME);\r
+ ServiceMain.nuxeoDataSource = JDBCTools.getDataSource(JDBCTools.NUXEO_REPOSITORY_NAME);\r
+ AuthN.setDataSource(cspaceDataSource);\r
+ }\r
+ \r
private void setServerRootDir() {\r
- serverRootDir = System.getProperty("jboss.server.home.dir");\r
+ serverRootDir = System.getProperty(SERVER_HOME_PROPERTY);\r
if (serverRootDir == null) {\r
serverRootDir = "."; //assume server is started from server root, e.g. server/cspace\r
+ logger.warn("System property '" +\r
+ SERVER_HOME_PROPERTY + "' was not set. Using \"" +\r
+ serverRootDir +\r
+ "\" instead.");\r
}\r
}\r
\r
}
File configFile = new File(configFileName);
if (!configFile.exists()) {
- String msg = "Could not find configuration file " + configFileName;
+ String msg = "Could not find configuration file " + configFile.getAbsolutePath(); //configFileName;
logger.error(msg);
throw new RuntimeException(msg);
}
tenantBindings.put(tenantBinding.getId(), tenantBinding);
readDomains(tenantBinding);
readServiceBindings(tenantBinding);
- if (logger.isDebugEnabled()) {
- logger.debug("read() added tenant id=" + tenantBinding.getId()
+ if (logger.isInfoEnabled()) {
+ logger.info("Finished reading tenant bindings for tenant id=" + tenantBinding.getId()
+ " name=" + tenantBinding.getName());
}
}
package org.collectionspace.services.common.document;\r
\r
-import java.lang.reflect.Field;\r
-import java.lang.reflect.ParameterizedType;\r
-import java.lang.reflect.Type;\r
-import java.lang.reflect.TypeVariable;\r
-import java.util.ArrayList;\r
\r
import org.collectionspace.services.common.context.MultipartServiceContext;\r
import org.collectionspace.services.common.context.ServiceContext;\r
import org.collectionspace.services.common.document.DocumentHandler.Action;\r
-import org.collectionspace.services.relation.RelationsCommon;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;\r
-import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
return ctx;\r
}\r
\r
- protected void setServiceContext(ServiceContext<IT, OT> ctx) {\r
+ // gets reset by calls to setServiceContext() method\r
+ protected boolean enforceAsserts = true;\r
+ \r
+ public boolean getEnforceAsserts() {\r
+ return enforceAsserts;\r
+ }\r
+\r
+ public void setEnforceAsserts(ServiceContext<IT, OT> ctx) {\r
+ Boolean disableAssertsAttr = ctx.getServiceBinding().isDisableAsserts();\r
+ if (disableAssertsAttr == null) {\r
+ enforceAsserts = true;\r
+ } else {\r
+ enforceAsserts = !disableAssertsAttr.booleanValue();\r
+ }\r
+ }\r
+\r
+ protected void setServiceContext(ServiceContext<IT, OT> ctx) {\r
this.ctx = ctx;\r
+ \r
+ }\r
+ \r
+ protected void CS_ASSERT(boolean expression, String errorMsg) throws AssertionError {\r
+ if (expression != true) {\r
+ if (errorMsg == null) {\r
+ errorMsg = "Validation exception occurred in: " +\r
+ this.getClass().getName();\r
+ }\r
+ throw new AssertionError(errorMsg);\r
+ }\r
+ }\r
+ \r
+ protected void CS_ASSERT(boolean expression) throws AssertionError {\r
+ CS_ASSERT(expression, null);\r
}\r
\r
+ private void init(ServiceContext<IT, OT> ctx) {\r
+ setEnforceAsserts(ctx);\r
+ setServiceContext(ctx);\r
+ }\r
+ \r
/* (non-Javadoc)\r
* @see org.collectionspace.services.common.document.ValidatorHandler#validate(org.collectionspace.services.common.document.DocumentHandler.Action, org.collectionspace.services.common.context.ServiceContext)\r
*/\r
@Override\r
public void validate(Action action, ServiceContext<IT, OT> ctx)\r
throws InvalidDocumentException {\r
- setServiceContext(ctx);\r
+ init(ctx);\r
+ \r
switch (action) {\r
case CREATE:\r
handleCreate();\r
} \r
}\r
\r
+ protected boolean enforceAsserts() {\r
+ return !ctx.getServiceBinding().isDisableAsserts();\r
+ }\r
+ \r
protected Object getCommonPart() {\r
Object result = null; \r
\r
import org.collectionspace.services.nuxeo.client.java.CommonList;\r
import org.collectionspace.services.common.blob.BlobOutput;\r
\r
-import org.collectionspace.ecm.platform.quote.api.QuoteManager;\r
+//import org.collectionspace.ecm.platform.quote.api.QuoteManager;\r
\r
// TODO: Auto-generated Javadoc\r
/**\r
DocumentBlobHolder docBlobHolder = (DocumentBlobHolder)documentModel.getAdapter(BlobHolder.class);\r
//\r
// FIXME: REM this looks like cruft\r
- try {\r
+/* try {\r
QuoteManager quoteManager = (QuoteManager)Framework.getService(QuoteManager.class);\r
quoteManager.createQuote(documentModel, "Quoted - Comment" + System.currentTimeMillis(),\r
"Administrator");\r
} catch (Exception e) {\r
e.printStackTrace();\r
}\r
+ */\r
//\r
//\r
List<Blob> docBlobs = docBlobHolder.getBlobs(); \r
* verified by the mimetype service.\r
* @return the blob\r
*/\r
- private static Blob createStreamingBlob(InputStream file,\r
+ private static Blob createStreamingBlob(File file,\r
String filename, String mimeType) {\r
Blob blob = null;\r
try {\r
// persisting the blob makes it possible to read the binary content\r
// of the request stream several times (mimetype sniffing, digest\r
// computation, core binary storage)\r
- blob = StreamingBlob.createFromStream(file, mimeType).persist();\r
+ blob = StreamingBlob.createFromFile(file, mimeType).persist();\r
// filename\r
if (filename != null) {\r
filename = getCleanFileName(filename);\r
FileInputStream inputStream = new FileInputStream(blobFile); \r
if (inputStream != null) {\r
result = createImage(repoSession, wspaceDoc,\r
- inputStream, blobFile.getName(), null);\r
+ inputStream, blobFile, null);\r
} \r
} catch (Exception e) {\r
logger.error("Could not create image blob", e);\r
static public BlobsCommon createImage(RepositoryInstance nuxeoSession,\r
DocumentModel blobLocation,\r
InputStream file,\r
- String fileName, \r
+ File blobFile, \r
String mimeType) {\r
BlobsCommon result = null;\r
\r
try {\r
- Blob fileBlob = createStreamingBlob(file, fileName, mimeType);\r
+ Blob fileBlob = createStreamingBlob(blobFile, blobFile.getName(), mimeType);\r
String digestAlgorithm = getFileManagerService().getDigestAlgorithm(); //Need some way on initializing the FileManager with a call.\r
DocumentModel documentModel = getFileManagerService().createDocumentFromBlob(nuxeoSession,\r
- fileBlob, blobLocation.getPathAsString(), true, fileName);\r
+ fileBlob, blobLocation.getPathAsString(), true, blobFile.getName());\r
result = createBlobsCommon(documentModel, fileBlob);\r
} catch (Exception e) {\r
result = null;\r
import java.sql.Statement;\r
import java.util.List;\r
\r
+import javax.sql.DataSource;\r
+\r
import org.collectionspace.services.common.api.Tools;\r
import org.collectionspace.services.common.service.ServiceBindingType;\r
import org.collectionspace.services.common.service.InitHandler.Params.Field;\r
/** See the class javadoc for this class: it shows the syntax supported in the configuration params.\r
*/\r
@Override\r
- public void onRepositoryInitialized(ServiceBindingType sbt, List<Field> fields, List<Property> properties) throws Exception {\r
+ public void onRepositoryInitialized(DataSource dataSource,\r
+ ServiceBindingType sbt, \r
+ List<Field> fields, \r
+ List<Property> properties) throws Exception {\r
//todo: all post-init tasks for services, or delegate to services that override.\r
int rows = 0;\r
String sql = "";\r
if(Tools.notEmpty(param) && (param.indexOf(',')>-1)){\r
String[] fieldNames = param.split(",");\r
for (String fn: fieldNames){\r
- rows = addOneIndex(tableName, fn);\r
+ rows = addOneIndex(dataSource, tableName, fn);\r
}\r
} else {\r
- rows = addOneIndex(tableName, fieldName);\r
+ rows = addOneIndex(dataSource, tableName, fieldName);\r
}\r
}\r
}\r
\r
- private int addOneIndex(String tableName, String columnName){\r
+ private int addOneIndex(DataSource dataSource, String tableName, String columnName){\r
int rows = 0;\r
String sql = "";\r
String indexName = tableName + INDEX_SEP + columnName + INDEX_SUFFIX;\r
try {\r
DatabaseProductType databaseProductType = JDBCTools.getDatabaseProductType();\r
- if (indexExists(databaseProductType, tableName, columnName, indexName)) {\r
+ if (indexExists(dataSource, databaseProductType, tableName, columnName, indexName)) {\r
logger.trace("Index already exists for column " + columnName\r
+ " in table " + tableName);\r
// FIXME: Can add the option to drop and re-create an index here.\r
//\r
// If this assumption is no longer valid, we might instead\r
// identify the relevant repository from the table name here.\r
- rows = JDBCTools.executeUpdate(JDBCTools.NUXEO_REPOSITORY_NAME, sql);\r
+ rows = JDBCTools.executeUpdate(dataSource, sql);\r
logger.trace("Index added to column ("+columnName+") on table ("+tableName+")");\r
}\r
return rows;\r
}\r
}\r
\r
- private boolean indexExists(DatabaseProductType databaseProductType,\r
- String tableName, String colName, String indexName) {\r
+ private boolean indexExists(DataSource dataSource,\r
+ DatabaseProductType databaseProductType,\r
+ String tableName, \r
+ String colName, \r
+ String indexName) {\r
\r
// FIXME: May need to qualify table name by database/catalog,\r
// as table names likely will not be globally unique across same\r
//\r
// If this assumption is no longer valid, we might instead\r
// identify the relevant repository from the table name here.\r
- conn = JDBCTools.getConnection(JDBCTools.NUXEO_REPOSITORY_NAME);\r
+ conn = JDBCTools.getConnection(dataSource);\r
stmt = conn.createStatement();\r
rs = stmt.executeQuery(sql);\r
if (rs.next()) {\r
\r
import java.util.List;\r
\r
+import javax.sql.DataSource;\r
+\r
/**\r
* User: laramie\r
* $LastChangedRevision$\r
*/\r
\r
public interface IInitHandler {\r
- public void onRepositoryInitialized(ServiceBindingType sbt, List<Field> fields, List<Property> property) throws Exception;\r
+ public void onRepositoryInitialized(DataSource dataSource,\r
+ ServiceBindingType sbt, \r
+ List<Field> fields, \r
+ List<Property> property) throws Exception;\r
}\r
import java.sql.ResultSet;\r
import java.util.List;\r
\r
+import javax.sql.DataSource;\r
+\r
/** Concrete class which does nothing, but subclasses may override to do\r
* some action on the event onRepositoryInitialized(), such as sending JDBC\r
* calls to the repository to add indices, etc.\r
* @throws Exception\r
*/\r
@Override\r
- public void onRepositoryInitialized(ServiceBindingType sbt, List<Field> fields, List<Property> properties) throws Exception {\r
+ public void onRepositoryInitialized(DataSource dataSource,\r
+ ServiceBindingType sbt, \r
+ List<Field> fields, \r
+ List<Property> properties) throws Exception {\r
\r
// For debugging.\r
/*\r
import java.sql.Statement;
import java.util.List;
+import javax.sql.DataSource;
+
import org.collectionspace.services.common.service.ServiceBindingType;
import org.collectionspace.services.common.service.InitHandler.Params.Field;
import org.collectionspace.services.common.service.InitHandler.Params.Property;
final Logger logger = LoggerFactory.getLogger(ModifyFieldDatatypes.class);
@Override
- public void onRepositoryInitialized(ServiceBindingType sbt, List<Field> fields, List<Property> properties) throws Exception {
+ public void onRepositoryInitialized(DataSource dataSource,
+ ServiceBindingType sbt,
+ List<Field> fields,
+ List<Property> properties) throws Exception {
//todo: all post-init tasks for services, or delegate to services that override.
int rows = 0;
String sql = "";
for (Field field : fields) {
datatype = getDatatypeFromLogicalType(databaseProductType, field.getType());
// If the field is already of the desired datatype, skip it.
- if (fieldHasDesiredDatatype(databaseProductType, field, datatype)) {
+ if (fieldHasDesiredDatatype(dataSource, databaseProductType, field, datatype)) {
logger.trace("Field " + field.getTable() + "." + field.getCol()
+ " is already of desired datatype " + datatype);
continue;
//
// If this assumption is no longer valid, we might instead
// identify the relevant repository from the table name here.
- rows = JDBCTools.executeUpdate(JDBCTools.NUXEO_REPOSITORY_NAME, sql);
+ rows = JDBCTools.executeUpdate(dataSource, sql);
}
} catch (Exception e) {
throw e;
return datatype;
}
- private boolean fieldHasDesiredDatatype(DatabaseProductType databaseProductType,
+ private boolean fieldHasDesiredDatatype(DataSource dataSource,
+ DatabaseProductType databaseProductType,
Field field, String datatype) {
// FIXME: Consider instead using the database-agnostic
}
try {
- conn = JDBCTools.getConnection(JDBCTools.NUXEO_REPOSITORY_NAME);
+ conn = JDBCTools.getConnection(dataSource);
stmt = conn.createStatement();
rs = stmt.executeQuery(sql);
while (rs.next()) {
import org.nuxeo.ecm.core.api.DocumentModel;\r
import org.nuxeo.ecm.core.api.DocumentModelList;\r
import org.nuxeo.ecm.core.api.repository.RepositoryInstance;\r
-import org.nuxeo.ecm.core.client.NuxeoClient;\r
+//import org.nuxeo.ecm.core.client.NuxeoClient;\r
\r
import org.collectionspace.services.jaxb.InvocableJAXBSchema;\r
-import org.collectionspace.services.nuxeo.client.java.NuxeoConnector;\r
+//import org.collectionspace.services.nuxeo.client.java.NuxeoConnector;\r
+//import org.collectionspace.services.nuxeo.client.java.NxConnect;\r
+import org.collectionspace.services.nuxeo.client.java.NuxeoClientEmbedded;\r
+import org.collectionspace.services.nuxeo.client.java.NuxeoConnectorEmbedded;\r
+\r
import org.collectionspace.services.client.IQueryManager;\r
import org.collectionspace.services.common.invocable.Invocable;\r
import org.collectionspace.services.common.invocable.InvocableUtils;\r
@Override\r
@Deprecated\r
public void execQuery(String queryString) {\r
- NuxeoClient client = null;\r
+ NuxeoClientEmbedded client = null;\r
try {\r
- client = NuxeoConnector.getInstance().getClient();\r
+ client = NuxeoConnectorEmbedded.getInstance().getClient();\r
RepositoryInstance repoSession = client.openRepository();\r
\r
DocumentModelList docModelList = repoSession\r
*/
package org.collectionspace.services.common.security;
+import java.security.MessageDigest;
import java.util.List;
-import java.net.URI;
+import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
import java.util.StringTokenizer;
import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;
import org.collectionspace.authentication.AuthN;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.jboss.crypto.digest.DigestCallback;
+import org.jboss.security.Base64Encoder;
+import org.jboss.security.Base64Utils;
+
/**
*
* @author
public static final String URI_PATH_SEPARATOR = "/";
public static final int MIN_PASSWORD_LENGTH = 8;
public static final int MAX_PASSWORD_LENGTH = 24;
+
+ public static final String BASE64_ENCODING = "BASE64";
+ public static final String BASE16_ENCODING = "HEX";
+ public static final String RFC2617_ENCODING = "RFC2617";
+ private static char MD5_HEX[] = "0123456789abcdef".toCharArray();
+
/**
* createPasswordHash creates password has using configured digest algorithm
*/
public static String createPasswordHash(String username, String password) {
//TODO: externalize digest algo and encoding
- return org.jboss.security.Util.createPasswordHash("SHA-256", //digest algo
+ return createPasswordHash("SHA-256", //digest algo
"base64", //encoding
null, //charset
username,
return false;
}
}
+
+ public static String createPasswordHash(String hashAlgorithm, String hashEncoding, String hashCharset, String username, String password)
+ {
+ return createPasswordHash(hashAlgorithm, hashEncoding, hashCharset, username, password, null);
+ }
+
+ public static String createPasswordHash(String hashAlgorithm, String hashEncoding, String hashCharset, String username, String password, DigestCallback callback)
+ {
+ String passwordHash = null;
+ byte passBytes[];
+ try
+ {
+ if(hashCharset == null)
+ passBytes = password.getBytes();
+ else
+ passBytes = password.getBytes(hashCharset);
+ }
+ catch(UnsupportedEncodingException uee)
+ {
+ logger.error((new StringBuilder()).append("charset ").append(hashCharset).append(" not found. Using platform default.").toString(), uee);
+ passBytes = password.getBytes();
+ }
+ try
+ {
+ MessageDigest md = MessageDigest.getInstance(hashAlgorithm);
+ if(callback != null)
+ callback.preDigest(md);
+ md.update(passBytes);
+ if(callback != null)
+ callback.postDigest(md);
+ byte hash[] = md.digest();
+ if(hashEncoding.equalsIgnoreCase("BASE64"))
+ passwordHash = encodeBase64(hash);
+ else
+ if(hashEncoding.equalsIgnoreCase("HEX"))
+ passwordHash = encodeBase16(hash);
+ else
+ if(hashEncoding.equalsIgnoreCase("RFC2617"))
+ passwordHash = encodeRFC2617(hash);
+ else
+ logger.error((new StringBuilder()).append("Unsupported hash encoding format ").append(hashEncoding).toString());
+ }
+ catch(Exception e)
+ {
+ logger.error("Password hash calculation failed ", e);
+ }
+ return passwordHash;
+ }
+
+ public static String encodeRFC2617(byte data[])
+ {
+ char hash[] = new char[32];
+ for(int i = 0; i < 16; i++)
+ {
+ int j = data[i] >> 4 & 0xf;
+ hash[i * 2] = MD5_HEX[j];
+ j = data[i] & 0xf;
+ hash[i * 2 + 1] = MD5_HEX[j];
+ }
+
+ return new String(hash);
+ }
+
+ public static String encodeBase16(byte bytes[])
+ {
+ StringBuffer sb = new StringBuffer(bytes.length * 2);
+ for(int i = 0; i < bytes.length; i++)
+ {
+ byte b = bytes[i];
+ char c = (char)(b >> 4 & 0xf);
+ if(c > '\t')
+ c = (char)((c - 10) + 97);
+ else
+ c += '0';
+ sb.append(c);
+ c = (char)(b & 0xf);
+ if(c > '\t')
+ c = (char)((c - 10) + 97);
+ else
+ c += '0';
+ sb.append(c);
+ }
+
+ return sb.toString();
+ }
+
+ public static String encodeBase64(byte bytes[])
+ {
+ String base64 = null;
+ try
+ {
+ base64 = Base64Encoder.encode(bytes);
+ }
+ catch(Exception e) { }
+ return base64;
+ }
+
+ public static String tob64(byte buffer[])
+ {
+ return Base64Utils.tob64(buffer);
+ }
+
+ public static byte[] fromb64(String str)
+ throws NumberFormatException
+ {
+ return Base64Utils.fromb64(str);
+ }
+
+
}
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
+import javax.naming.Context;\r
import javax.naming.InitialContext;\r
import javax.naming.NamingException;\r
import javax.security.auth.login.LoginException;\r
\r
//todo: make sure this will get instantiated in the right order\r
final static Logger logger = LoggerFactory.getLogger(JDBCTools.class);\r
+ \r
+ public static DataSource getDataSource(String repositoryName) throws NamingException {\r
+ DataSource result = null;\r
+ InitialContext ctx = new InitialContext();\r
+ Context envCtx = null;\r
+ \r
+ if (logger.isDebugEnabled() == true) {\r
+ logger.debug("Looking up datasource in JNDI with name: " + repositoryName);\r
+ }\r
+ \r
+ try {\r
+ envCtx = (Context) ctx.lookup("java:comp/env");\r
+ DataSource ds = (DataSource) envCtx.lookup("jdbc/" + repositoryName);\r
+ if (ds == null) {\r
+ throw new IllegalArgumentException("datasource not found: " + repositoryName);\r
+ } else {\r
+ result = ds;\r
+ }\r
+ } finally {\r
+ if (ctx != null) {\r
+ try {\r
+ ctx.close();\r
+ } catch (Exception e) {\r
+ logger.error("Error getting DataSource for: " + repositoryName, e);\r
+ }\r
+ }\r
+ if (envCtx != null) {\r
+ try {\r
+ envCtx.close();\r
+ } catch (Exception e) {\r
+ logger.error("Error getting DataSource for: " + repositoryName, e);\r
+ }\r
+ }\r
+ }\r
+ return result;\r
+ }\r
+ \r
+ /*\r
+ * This is a wrapper around DataSource's getConnectionMethod -mainly exists modularize all connection related code to JDBCTool class.\r
+ */\r
+ public static Connection getConnection(DataSource dataSource) throws SQLException {\r
+ Connection result = null;\r
+ result = dataSource.getConnection();\r
+ return result;\r
+ }\r
\r
public static Connection getConnection(String repositoryName) throws LoginException, SQLException {\r
- if (Tools.isEmpty(repositoryName)) {\r
+ Connection result = null;\r
+ \r
+ if (Tools.isEmpty(repositoryName)) {\r
repositoryName = getDefaultRepositoryName();\r
}\r
- InitialContext ctx = null;\r
+ \r
Connection conn = null;\r
try {\r
- ctx = new InitialContext();\r
- DataSource ds = (DataSource) ctx.lookup(repositoryName);\r
- if (ds == null) {\r
- throw new IllegalArgumentException("datasource not found: " + repositoryName);\r
- }\r
+ DataSource ds = getDataSource(repositoryName);\r
conn = ds.getConnection();\r
- return conn;\r
+ result = conn;\r
} catch (NamingException ex) {\r
LoginException le = new LoginException("Error looking up DataSource from: " + repositoryName);\r
le.initCause(ex);\r
throw le;\r
} catch (SQLException e) {\r
throw e;\r
- } finally {\r
- if (ctx != null) {\r
- try {\r
- ctx.close();\r
- } catch (Exception e) {\r
- // Do nothing with exception in 'finally' clause.\r
- }\r
- }\r
}\r
+ \r
+ return result;\r
}\r
\r
\r
}\r
} */\r
\r
- public static int executeUpdate(String repoName, String sql) throws Exception {\r
+ public static int executeUpdate(DataSource dataSource, String sql) throws Exception {\r
Connection conn = null;\r
Statement stmt = null;\r
try {\r
- conn = getConnection(repoName); // If null, uses default\r
+ conn = getConnection(dataSource);\r
stmt = conn.createStatement();\r
int rows = stmt.executeUpdate(sql);\r
stmt.close();\r
if(DBProductName==null) {\r
Connection conn = null;\r
try {\r
- conn = getConnection(getDefaultRepositoryName());\r
+ conn = getConnection(getDefaultRepositoryName()); //FIXME: REM - getDefaultRepositoryName returns the Nuxeo repo name -we should be using the "cspace" repo name\r
DBProductName = conn.getMetaData().getDatabaseProductName();\r
} catch (Exception e) {\r
} finally {\r
import javax.persistence.PersistenceException;
import javax.persistence.Query;
-import org.collectionspace.services.authorization.Permission;
+import org.collectionspace.services.authorization.perms.Permission;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
import org.collectionspace.services.authorization.RoleValue;
try {
List<AccountValue> accountValues = new ArrayList<AccountValue>();
accountValues.add(account);
- result.setAccounts(accountValues);
+ result.setAccount(accountValues);
emf = getEntityManagerFactory();
em = emf.createEntityManager();
PermissionRoleRel permRolRel = (PermissionRoleRel)resultList.next();
permissionValues.add(AuthorizationRoleRel.buildPermissionValue(permRolRel));
}
- result.setPermissions(permissionValues);
+ result.setPermission(permissionValues);
}
} catch (NoResultException nre) {
if (em != null && em.getTransaction().isActive()) {
\r
import org.apache.commons.lang.builder.ToStringBuilder;\r
import org.jvnet.jaxb2_commons.lang.ToString;\r
-import org.jvnet.jaxb2_commons.lang.builder.JAXBToStringBuilder;\r
import javax.xml.parsers.DocumentBuilder;\r
import javax.xml.parsers.DocumentBuilderFactory;\r
import org.w3c.dom.Document;\r
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.xml.bind.JAXBElement;
import org.collectionspace.services.authorization.AccountPermission;
import org.collectionspace.services.jaxb.AbstractCommonList;
}
AccountPermission accountPermission = JpaStorageUtils.getAccountPermissions(JpaStorageUtils.CS_CURRENT_USER,
currentServiceName, workflowSubResource);
- PayloadOutputPart accountPermissionPart = new PayloadOutputPart("account_permission", accountPermission);
+ org.collectionspace.services.authorization.ObjectFactory objectFactory =
+ new org.collectionspace.services.authorization.ObjectFactory();
+ JAXBElement<AccountPermission> ap = objectFactory.createAccountPermission(accountPermission);
+ PayloadOutputPart accountPermissionPart = new PayloadOutputPart("account_permission", ap);
ctx.addOutputPart(accountPermissionPart);
}
import org.nuxeo.ecm.core.api.IdRef;
import org.nuxeo.ecm.core.api.PathRef;
import org.nuxeo.ecm.core.api.repository.RepositoryInstance;
-import org.nuxeo.ecm.core.client.NuxeoClient;
+//import org.nuxeo.ecm.core.client.NuxeoClient;
import org.nuxeo.ecm.core.schema.SchemaManager;
import org.nuxeo.runtime.api.Framework;
// private final Logger profilerLogger = LoggerFactory.getLogger("remperf");
// private String foo = Profiler.createLogger();
+ public static final String NUXEO_CORE_TYPE_DOMAIN = "Domain";
+ public static final String NUXEO_CORE_TYPE_WORKSPACEROOT = "WorkspaceRoot";
+
/**
* Instantiates a new repository java client impl.
*/
@Override
public Hashtable<String, String> retrieveWorkspaceIds(String domainName) throws Exception {
- return NuxeoConnector.getInstance().retrieveWorkspaceIds(domainName);
+ return NuxeoConnectorEmbedded.getInstance().retrieveWorkspaceIds(domainName);
}
@Override
RepositoryInstance repoSession = null;
String domainId = null;
try {
+ //
+ // First create the top-level domain directory
+ //
repoSession = getRepositorySession();
DocumentRef parentDocRef = new PathRef("/");
DocumentModel parentDoc = repoSession.getDocument(parentDocRef);
- DocumentModel doc = repoSession.createDocumentModel(parentDoc.getPathAsString(),
- domainName, "Domain");
- doc.setPropertyValue("dc:title", domainName);
- doc.setPropertyValue("dc:description", "A CollectionSpace domain "
+ DocumentModel domainDoc = repoSession.createDocumentModel(parentDoc.getPathAsString(),
+ domainName, NUXEO_CORE_TYPE_DOMAIN);
+ domainDoc.setPropertyValue("dc:title", domainName);
+ domainDoc.setPropertyValue("dc:description", "A CollectionSpace domain "
+ domainName);
- doc = repoSession.createDocument(doc);
- domainId = doc.getId();
+ domainDoc = repoSession.createDocument(domainDoc);
+ domainId = domainDoc.getId();
repoSession.save();
+ //
+ // Next, create a "Workspaces" root directory to contain the workspace folders for the individual service documents
+ //
+ DocumentModel workspacesRoot = repoSession.createDocumentModel(domainDoc.getPathAsString(),
+ NuxeoUtils.Workspaces, NUXEO_CORE_TYPE_WORKSPACEROOT);
+ workspacesRoot.setPropertyValue("dc:title", NuxeoUtils.Workspaces);
+ workspacesRoot.setPropertyValue("dc:description", "A CollectionSpace workspaces directory for "
+ + domainDoc.getPathAsString());
+ workspacesRoot = repoSession.createDocument(workspacesRoot);
+ String workspacesRootId = workspacesRoot.getId();
+
if (logger.isDebugEnabled()) {
- logger.debug("created tenant domain name=" + domainName
- + " id=" + domainId);
+ logger.debug("Created tenant domain name=" + domainName
+ + " id=" + domainId + " " +
+ NuxeoUtils.Workspaces + " id=" + workspacesRootId);
}
} catch (Exception e) {
if (logger.isDebugEnabled()) {
repoSession = getRepositorySession();
DocumentRef parentDocRef = new PathRef(
"/" + domainName
- + "/" + NuxeoUtils.WORKSPACES);
+ + "/" + NuxeoUtils.Workspaces);
DocumentModel parentDoc = repoSession.getDocument(parentDocRef);
DocumentModel doc = repoSession.createDocumentModel(parentDoc.getPathAsString(),
workspaceName, "Workspace");
repoSession = getRepositorySession();
DocumentRef docRef = new PathRef(
"/" + tenantDomain
- + "/" + NuxeoUtils.WORKSPACES
+ + "/" + NuxeoUtils.Workspaces
+ "/" + workspaceName);
DocumentModel workspace = repoSession.getDocument(docRef);
workspaceId = workspace.getId();
// Authentication failures happen while trying to reuse the session
Profiler profiler = new Profiler("getRepositorySession():", 2);
profiler.start();
- NuxeoClient client = NuxeoConnector.getInstance().getClient();
+ NuxeoClientEmbedded client = NuxeoConnectorEmbedded.getInstance().getClient();
RepositoryInstance repoSession = client.openRepository();
- if (logger.isTraceEnabled()) {
+ if (logger.isDebugEnabled()) {
logger.debug("getRepository() repository root: " + repoSession.getRootDocument());
}
profiler.stop();
*/
private void releaseRepositorySession(RepositoryInstance repoSession) {
try {
- NuxeoClient client = NuxeoConnector.getInstance().getClient();
+ NuxeoClientEmbedded client = NuxeoConnectorEmbedded.getInstance().getClient();
// release session
client.releaseRepository(repoSession);
} catch (Exception e) {
// Base document type in Nuxeo is "Document"
//
public static final String BASE_DOCUMENT_TYPE = "Document";
- public static final String WORKSPACES = "workspaces";
+// public static final String WORKSPACES = "workspaces";
+ public static final String Workspaces = "Workspaces";
// Regular expressions pattern for identifying valid ORDER BY clauses.
// FIXME: Currently supports only USASCII word characters in field names.
*/
public static DocumentRef createPathRef(ServiceContext ctx, String id) {
return new PathRef("/" + ctx.getRepositoryDomainStorageName() +
- "/" + WORKSPACES +
+ "/" + Workspaces +
"/" + ctx.getRepositoryWorkspaceName() +
"/" + id);
}
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.contact</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.contact</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.contact</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.contact.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.contact</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.dimension</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.dimension</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.dimension</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.dimension.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.dimension</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <!-- Restlet -->\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
</dependencies>\r
\r
<build>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.group.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<artifactId>org.collectionspace.services.group</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.group</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.group</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.group.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.group</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>org.collectionspace.services.hyperjaxb</artifactId>\r
<name>services.hyperjaxb</name>\r
\r
- <dependencies> \r
+ <dependencies>\r
+ <!-- \r
<dependency>\r
<groupId>com.sun.xml.bind</groupId>\r
<artifactId>jaxb-impl</artifactId>\r
<dependency>\r
<groupId>org.jvnet.jaxb2-commons</groupId>\r
<artifactId>property-listener-injector</artifactId>\r
- </dependency> \r
+ </dependency> \r
<dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
+ <groupId>org.jvnet.jaxb2_commons</groupId>\r
+ <artifactId>jaxb2-basics-runtime</artifactId>\r
</dependency>\r
+ -->\r
<!-- Dependencies for HyperJaxB -->\r
<dependency>\r
<groupId>javax.persistence</groupId>\r
\r
<xs:schema \r
xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"\r
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"\r
xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"\r
xmlns:ns="http://collectionspace.org/services/hyperjaxb"\r
xmlns="http://collectionspace.org/services/hyperjaxb"\r
jaxb:extensionBindingPrefixes="hj"\r
version="0.9">\r
\r
+ <xs:annotation>\r
+ <xs:appinfo>\r
+ <jaxb:globalBindings generateIsSetMethod="true" localScoping="toplevel">\r
+ <jaxb:serializable/>\r
+ </jaxb:globalBindings>\r
+ </xs:appinfo>\r
+ </xs:annotation>\r
+ \r
<xs:element name="abstract-common-list">\r
<xs:complexType>\r
<xs:annotation>\r
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!-- CollectionSpace default (security) authorization provider schema (XSD)
+ Entity(s) : permission Used for: $LastChangedRevision: 916 $ $LastChangedDate:
+ 2009-11-05 16:59:20 -0800 (Thu, 05 Nov 2009) $ -->
+
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="2.1" elementFormDefault="unqualified"
+ xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
+ xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:ns="http://collectionspace.org/services/authorization/perms"
+ xmlns="http://collectionspace.org/services/authorization/perms"
+ targetNamespace="http://collectionspace.org/services/authorization/perms"
+ version="0.1"
+ jaxb:extensionBindingPrefixes="hj orm">
+
+ <xs:element name="permission" type="permission" />
+ <xs:complexType name="permission">
+ <xs:annotation>
+ <xs:documentation>
+ CspacePermissionConfig describes permission in CollectionSpace
+ - resourceName could be a service path, e.g. collectionobjects or
+ intakes
+ no need to give slash at the beginning or end
+ - attributeName could be an attribute of the service schema
+ e.g. otherNumber from collectionobjects_common
+ - actionGroup is label that can be used by a client to "group" sets
+ of actions for operations
+ like searching for permissions by a specific actionGroup label.
+ - action describes the actions that could be taken on given resource
+ (and attribute)
+ - effect describes the effect of the access control for the action
+ performed on the given resource (and attribute)
+ </xs:documentation>
+ <xs:appinfo>
+ <hj:entity>
+ <orm:table name="permissions" />
+ </hj:entity>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+
+ <xs:element name="description" type="xs:string" minOccurs="0"
+ maxOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="description" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="resourceName" type="xs:string"
+ minOccurs="1" maxOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="resource_name" length="128"
+ nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="attributeName" type="xs:string"
+ minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="attribute_name" length="128"
+ nullable="true" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="actionGroup" type="xs:string" minOccurs="0"
+ maxOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="action_group" length="128" nullable="true" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="action" type="permission_action"
+ minOccurs="1" maxOccurs="unbounded" />
+ <xs:element name="effect" type="effect_type" minOccurs="1"
+ maxOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="effect" length="32" nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="tenant_id" type="xs:string" minOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="tenant_id" length="128" nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="createdAt" type="xs:dateTime">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="created_at" nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="updatedAt" type="xs:dateTime">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="updated_at" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="csid" type="xs:string">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:id>
+ <orm:column name="csid" length="128" nullable="false" />
+ </hj:id>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="permission_action">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:entity>
+ <orm:table name="permissions_actions">
+ </orm:table>
+ </hj:entity>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="name" type="action_type" minOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="name" length="128" nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="objectIdentity" type="xs:string"
+ minOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="objectIdentity" length="128"
+ nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="objectIdentityResource" type="xs:string"
+ minOccurs="1">
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:basic>
+ <orm:column name="objectIdentityResource" length="128"
+ nullable="false" />
+ </hj:basic>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="action_type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="CREATE" />
+ <xs:enumeration value="READ" />
+ <xs:enumeration value="UPDATE" />
+ <xs:enumeration value="DELETE" />
+ <xs:enumeration value="SEARCH" />
+ <xs:enumeration value="START" />
+ <xs:enumeration value="STOP" />
+ <xs:enumeration value="RUN" />
+ <xs:enumeration value="ADMIN" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="effect_type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="PERMIT" />
+ <xs:enumeration value="DENY" />
+ </xs:restriction>
+ </xs:simpleType>
+
+</xs:schema>
+
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+ CollectionSpace default (security) authorization provider schema (XSD)
+
+ Entity(s) : permission
+ Used for:
+
+ $LastChangedRevision: 916 $
+ $LastChangedDate: 2009-11-05 16:59:20 -0800 (Thu, 05 Nov 2009) $
+-->
+
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="2.1" elementFormDefault="unqualified"
+ xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
+ xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:ns="http://collectionspace.org/services/authorization/perms"
+ xmlns="http://collectionspace.org/services/authorization/perms"
+ targetNamespace="http://collectionspace.org/services/authorization/perms"
+ version="0.1"
+ jaxb:extensionBindingPrefixes="hj orm"
+ >
+
+ <!--
+ Avoid XmlRootElement nightmare:
+ See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
+-->
+
+
+ <xs:include schemaLocation="permissions.xsd"/>
+
+ <xs:element name="permissions_list">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:annotation>
+ <xs:documentation>permission configuration list</xs:documentation>
+ </xs:annotation>
+ <xs:element name="permission" type="ns:permission" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="foo_permissions_list">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="abstractCommonList">
+ <xs:sequence>
+ <xs:element name="permissions-list-item" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="screenName" type="xs:string" minOccurs="1"/>
+ <xs:element name="personRefName" type="xs:string" minOccurs="1" />
+ <xs:element name="email" type="xs:string" minOccurs="1" />
+ <!-- uri to retrive collection object details -->
+ <xs:element name="uri" type="xs:anyURI" minOccurs="1" />
+ <xs:element name="csid" type="xs:string" minOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <!-- This is the base class for paginated lists -->
+ <xs:complexType name="abstractCommonList">
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:class ref="org.collectionspace.services.hyperjaxb.AbstractCommonList"/>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:complexType>
+
+ <xs:element name="foo-common-list">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:documentation>
+ AccountsCommonList contains information about one or more
+ accounts. An instance of this type could be returned on
+ index and search operations.
+ </xs:documentation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:extension base="abstractCommonList">
+ <xs:sequence>
+ <xs:element name="foo-list-item" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:annotation>
+ <xs:appinfo>
+ <hj:ignored/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="screenName" type="xs:string" minOccurs="1"/>
+ <xs:element name="personRefName" type="xs:string" minOccurs="1" />
+ <xs:element name="email" type="xs:string" minOccurs="1" />
+ <!-- uri to retrive collection object details -->
+ <xs:element name="uri" type="xs:anyURI" minOccurs="1" />
+ <xs:element name="csid" type="xs:string" minOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+
+</xs:schema>
+
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id.service</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
<scope>test</scope>
<type>jar</type>
</dependency>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.id.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics-runtime</artifactId>
+ </dependency>
</dependencies>
<build>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.id</name>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<!--module>3rdparty</module-->
<!--module>jaxb</module-->
<parent>
<artifactId>org.collectionspace.services.id</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.imports.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<artifactId>org.collectionspace.services.imports</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.imports</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.imports.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.imports</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<dependency>
- <groupId>org.nuxeo.ecm.platform</groupId>
+ <groupId>org.nuxeo.shell</groupId>
<artifactId>nuxeo-shell-core</artifactId>
- <version>${nuxeo.platform.version}</version>
+ <version>${nuxeo.shell.version}</version>
</dependency>
<dependency>
<groupId>org.nuxeo.ecm.core</groupId>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
List<RepositoryDomainType> repositoryDomainList = tenantBinding.getRepositoryDomain();
if (repositoryDomainList.size() == 1) {
String domainName = repositoryDomainList.get(0).getStorageName().trim();
- result = "/" + domainName + "/" + NuxeoUtils.WORKSPACES;
+ result = "/" + domainName + "/" + NuxeoUtils.Workspaces;
} else {
throw new ConfigurationException("Tenant bindings contains 0 or more than 1 repository domains.");
}
import java.io.File;\r
import org.apache.commons.logging.Log;\r
import org.apache.commons.logging.LogFactory;\r
+import org.collectionspace.services.nuxeo.client.java.NuxeoClientEmbedded;\r
import org.collectionspace.services.nuxeo.client.java.NuxeoConnector;\r
+import org.collectionspace.services.nuxeo.client.java.NuxeoConnectorEmbedded;\r
import org.nuxeo.ecm.core.api.repository.RepositoryInstance;\r
-import org.nuxeo.ecm.core.client.NuxeoClient;\r
+//import org.nuxeo.ecm.core.client.NuxeoClient;\r
import org.nuxeo.ecm.core.io.DocumentPipe;\r
import org.nuxeo.ecm.core.io.DocumentReader;\r
import org.nuxeo.ecm.core.io.DocumentWriter;\r
public String run(String src, String dest) throws Exception {\r
File file = new File(src);\r
///cspace way of configuring client and auth:\r
- NuxeoClient client = NuxeoConnector.getInstance().getClient();\r
+ NuxeoClientEmbedded client = NuxeoConnectorEmbedded.getInstance().getClient();\r
RepositoryInstance repository = client.openRepository();\r
try {\r
return importTree(repository, file, dest);\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<artifactId>org.collectionspace.services.intake</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.intake</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.intake</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.intake.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.intake</artifactId> \r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
</dependencies>\r
\r
<build>\r
<?xml version="1.0" encoding="UTF-8"?>\r
\r
-<!--\r
- pom.xml\r
- \r
- A Maven 2 project file for the 'jaxb' module of the ID Service project.\r
+<!-- pom.xml A Maven 2 project file for the 'jaxb' module of the ID Service \r
+ project. This document is a part of the source code and related artifacts \r
+ for CollectionSpace, an open source collections management system for museums \r
+ and related institutions: http://www.collectionspace.org http://wiki.collectionspace.org \r
+ Based on work by Sanjay Dalal and Richard Millet. $LastChangedBy: aron $ \r
+ $LastChangedRevision: 302 $ $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, \r
+ 29 Jun 2009) $ -->\r
\r
- This document is a part of the source code and related artifacts\r
- for CollectionSpace, an open source collections management system\r
- for museums and related institutions:\r
- \r
- http://www.collectionspace.org\r
- http://wiki.collectionspace.org\r
- \r
- Based on work by Sanjay Dalal and Richard Millet.\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
\r
- $LastChangedBy: aron $\r
- $LastChangedRevision: 302 $\r
- $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $\r
--->\r
+ <parent>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <artifactId>org.collectionspace.services.main</artifactId>\r
+ <version>1.14-SNAPSHOT</version>\r
+ </parent>\r
\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <groupId>org.collectionspace.services</groupId>\r
+ <artifactId>org.collectionspace.services.jaxb</artifactId>\r
+ <name>services.jaxb</name>\r
\r
- <parent>\r
- <groupId>org.collectionspace.services</groupId>\r
- <artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
- </parent>\r
- \r
- <modelVersion>4.0.0</modelVersion>\r
- <groupId>org.collectionspace.services</groupId>\r
- <artifactId>org.collectionspace.services.jaxb</artifactId>\r
- <name>services.jaxb</name>\r
- \r
- <dependencies> \r
- <dependency>\r
- <groupId>com.sun.xml.bind</groupId>\r
- <artifactId>jaxb-impl</artifactId>\r
- </dependency>\r
- \r
- <dependency>\r
- <groupId>org.jvnet.jaxb2-commons</groupId>\r
- <artifactId>property-listener-injector</artifactId>\r
- </dependency>\r
- \r
- <dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
- </dependency>\r
- \r
- </dependencies>\r
- \r
- <build>\r
- <finalName>collectionspace-services-jaxb</finalName>\r
- <defaultGoal>install</defaultGoal>\r
- <plugins>\r
- \r
- <plugin>\r
- <groupId>org.jvnet.jaxb2.maven2</groupId>\r
- <artifactId>maven-jaxb2-plugin</artifactId>\r
- </plugin>\r
- </plugins>\r
- </build>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>com.sun.xml.bind</groupId>\r
+ <artifactId>jaxb-impl</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.jvnet.jaxb2_commons</groupId>\r
+ <artifactId>jaxb2-basics</artifactId>\r
+ <version>${jaxb2-basics.version}</version>\r
+ </dependency>\r
+ </dependencies>\r
+\r
+ <build>\r
+ <finalName>collectionspace-services-jaxb</finalName>\r
+ <defaultGoal>install</defaultGoal>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.jvnet.jaxb2.maven2</groupId>\r
+ <artifactId>maven-jaxb2-plugin</artifactId>\r
+ </plugin>\r
+ </plugins>\r
+ </build>\r
\r
</project>\r
\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanin.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanin</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanin</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanin</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.loanin.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanin</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanout.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanout</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanout</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanout</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.loanout.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanout</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.location.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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_orgauthorities.xhtml">
- breadcrumb=title.orgauthorities
- </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_orgauthorities</from-outcome>
- <to-view-id>/view_orgauthorities.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>view_orgauthority</from-outcome>
- <to-view-id>/view_orgauthority.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>
-
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.location</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.location</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.location</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.collectionspace.services.common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.location</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
</dependencies>\r
\r
<build>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.media.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.media</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.media</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
*
*/
public ClientResponse<Response> createBlobFromUri(String csid, String blobUri) {
- return getProxy().createBlobFromUri(csid, blobUri);
+ return getProxy().createBlobFromUri(csid, blobUri, blobUri); //send the URI as both a query param and as content
}
/**
public interface MediaProxy extends CollectionSpaceCommonListPoxProxy {
@POST
- @Path("/{csid}")
+ @Path("{csid}")
@Consumes("multipart/form-data")
ClientResponse<Response> createBlobFromFormData(@PathParam("csid") String csid,
MultipartFormDataOutput formDataOutput);
@POST
- @Path("/{csid}")
+ @Path("{csid}")
@Produces("application/xml")
@Consumes("application/xml")
ClientResponse<Response>createBlobFromUri(@PathParam("csid") String csid,
- @QueryParam(BlobClient.BLOB_URI_PARAM) String blobUri);
-
+ @QueryParam(BlobClient.BLOB_URI_PARAM) String blobUri,
+ String emptyXML); //this "emptyXML" param is needed to force RESTEasy to produce a Content-Type header for this POST
}
setupCreate();
MediaClient client = new MediaClient();
PoxPayloadOut multipart = createMediaInstance(createIdentifier());
- ClientResponse<Response> mediaRes = client.create(multipart);
- assertStatusCode(mediaRes, testName);
- String mediaCsid = extractId(mediaRes);
+ ClientResponse<Response> mediaRes = null;
+ String mediaCsid = null;
+ try {
+ mediaRes = client.create(multipart);
+ assertStatusCode(mediaRes, testName);
+ mediaCsid = extractId(mediaRes);
+ } finally {
+ mediaRes.releaseConnection();
+ }
String currentDir = this.getResourceDir();
String blobsDirPath = currentDir + File.separator + BLOBS_DIR;
// If we found a good blob candidate file, then try to create the blob record
//
if (blobFile != null) {
+ client = new MediaClient();
ClientResponse<Response> res = null;
String mimeType = this.getMimeType(blobFile);
logger.debug("Processing file URI: " + blobFile.getAbsolutePath());
logger.debug("MIME type is: " + mimeType);
- if (fromUri == true) {
- URL childUrl = blobFile.toURI().toURL();
- res = client.createBlobFromUri(mediaCsid, childUrl.toString());
- } else {
- MultipartFormDataOutput formData = new MultipartFormDataOutput();
- OutputPart outputPart = formData.addFormData("file", blobFile, MediaType.valueOf(mimeType));
- res = client.createBlobFromFormData(mediaCsid, formData);
+ try {
+ if (fromUri == true) {
+ URL childUrl = blobFile.toURI().toURL();
+ res = client.createBlobFromUri(mediaCsid, childUrl.toString());
+ } else {
+ MultipartFormDataOutput formData = new MultipartFormDataOutput();
+ OutputPart outputPart = formData.addFormData("file", blobFile, MediaType.valueOf(mimeType));
+ res = client.createBlobFromFormData(mediaCsid, formData);
+ }
+ } finally {
+ res.releaseConnection();
}
assertStatusCode(res, testName);
if (isMediaCleanup() == true) {
<parent>
<artifactId>org.collectionspace.services.media</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.media.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.media</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.movement.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.movement</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.movement</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.movement</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.movement.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.movement</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.note.3rdparty</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
\r
<extension target="application#MODULE">\r
<module>\r
- <ejb>${bundle.fileName}</ejb>\r
+ <java>${bundle.fileName}</java>\r
</module>\r
-\r
- <module>\r
- <web>\r
- <web-uri>nuxeo.war</web-uri>\r
- <context-root>/nuxeo</context-root>\r
- </web>\r
- </module>\r
- </extension>\r
-\r
- <!-- uncomment that to enable tomcat based auth\r
- <extension target="web#LOGIN-CONFIG">\r
- <login-config>\r
- <auth-method>FORM</auth-method>\r
- <realm-name>nuxeo.ecm</realm-name>\r
- <form-login-config>\r
- <form-login-page>/login.jsp</form-login-page>\r
- <form-error-page>/login.jsp?loginFailed=true</form-error-page>\r
- </form-login-config>\r
- </login-config>\r
- </extension>\r
- -->\r
-\r
- <extension target="web#FILTER-MAPPING">\r
-\r
- <!-- Seam Context Filter is declared in org.nuxeo.ecm.platform.ui.web\r
- deployment fragment -->\r
-\r
- <filter-mapping>\r
- <filter-name>Seam Context Filter</filter-name>\r
- <url-pattern>/ws/FileManageWS</url-pattern>\r
- </filter-mapping>\r
-\r
- <filter-mapping>\r
- <filter-name>Seam Context Filter</filter-name>\r
- <url-pattern>/DocumentManagerWS</url-pattern>\r
- </filter-mapping>\r
- </extension>\r
-\r
- <extension target="web#SERVLET">\r
- </extension>\r
-\r
- <extension target="web#SERVLET-MAPPING">\r
- </extension>\r
-\r
- <extension target="pages#PAGES">\r
- <!-- This calls a method which load the Workspace logo -->\r
- <page view-id="/showLogo.xhtml" action="#{logoHelper.getLogo}"/>\r
-\r
- <!-- Bind URL to the Document URL resolver-->\r
- <page view-id="/getDocument.xhtml"\r
- action="#{navigationContext.navigateToURL}">\r
- </page>\r
-\r
- <page view-id="/nxliveedit.xhtml" action="#{liveEditHelper.getBootstrap()}"/>\r
-\r
- <!-- Bind URL to the Parallele conversation Document URL resolver-->\r
- <page view-id="/parallele.xhtml"\r
- action="#{paralleleNavigationHelper.navigateToURL}">\r
- </page>\r
-\r
- <!-- Post login and 'home' view handler -->\r
- <page view-id="/nxstartup.xhtml"\r
- action="#{startupHelper.initDomainAndFindStartupPage('Default domain', 'view')}"/>\r
-\r
- <!-- To redirect to the user dashboard instead, use instead:\r
-\r
- <page view-id="/nxstartup.xhtml"\r
- action="#{startupHelper.initDomainAndFindStartupPage('Default domain', 'user_dashboard')}" />\r
- -->\r
-\r
- <!-- config for workspace management\r
- = give a description for each viewId\r
- -->\r
-\r
- <page view-id="/view_domains.xhtml">\r
- #{currentServerLocation.name}/#{currentTabAction.label}\r
- </page>\r
-\r
- <page view-id="/select_document_type.faces.xhtml">\r
- Create new document in #{currentDocument.name}\r
- </page>\r
-\r
- <page view-id="/create_document.faces.xhtml">\r
- Create new document in #{currentDocument.name}\r
- </page>\r
-\r
- <page view-id="/user_dashboard.xhtml">\r
- breadcrumb=command.user_dashboard\r
- </page>\r
-\r
- <page view-id="/view_users.xhtml">\r
- breadcrumb=command.manageMembers\r
- </page>\r
-\r
- <page view-id="/view_many_users.xhtml">\r
- breadcrumb=command.manageMembers\r
- </page>\r
-\r
- <page view-id="/view_vocabularies.xhtml">\r
- breadcrumb=title.vocabularies\r
- </page>\r
-\r
- <page view-id="/search/search_form.xhtml">\r
- breadcrumb=command.advancedSearch\r
- </page>\r
- </extension>\r
-\r
- <extension target="faces-config#APPLICATION">\r
- <locale-config>\r
- <default-locale>en</default-locale>\r
- <supported-locale>en_GB</supported-locale>\r
- <supported-locale>en_US</supported-locale>\r
- <supported-locale>fr</supported-locale>\r
- <supported-locale>de</supported-locale>\r
- <supported-locale>es</supported-locale>\r
- <supported-locale>it</supported-locale>\r
- <supported-locale>ar</supported-locale>\r
- <supported-locale>ru</supported-locale>\r
- <supported-locale>ja</supported-locale>\r
- <supported-locale>vn</supported-locale>\r
- </locale-config>\r
-\r
- <message-bundle>messages</message-bundle>\r
- </extension>\r
-\r
- <extension target="components#PAGEFLOW">\r
- <value>config/addWorkspace.jpdl.xml</value>\r
- </extension>\r
-\r
- <extension target="faces-config#NAVIGATION">\r
- <!-- generic pages -->\r
- <navigation-case>\r
- <from-outcome>generic_error_page</from-outcome>\r
- <to-view-id>/generic_error_page.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>generic_message_page</from-outcome>\r
- <to-view-id>/generic_message_page.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>home</from-outcome>\r
- <to-view-id>/nxstartup.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>user_login</from-outcome>\r
- <to-view-id>/login.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>user_logout</from-outcome>\r
- <to-view-id>/logout.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_servers</from-outcome>\r
- <to-view-id>/view_servers.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- pages for document actions -->\r
-\r
- <navigation-case>\r
- <from-outcome>view_domains</from-outcome>\r
- <to-view-id>/view_domains.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>select_document_type</from-outcome>\r
- <to-view-id>/select_document_type.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>create_document</from-outcome>\r
- <to-view-id>/create_document.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>edit_document</from-outcome>\r
- <to-view-id>/edit_document.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_documents</from-outcome>\r
- <to-view-id>/view_documents.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>create_file</from-outcome>\r
- <to-view-id>/create_file.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>create_workspace_wizard</from-outcome>\r
- <to-view-id>/createWorkspaceWizard.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>send_email</from-outcome>\r
- <to-view-id>/document_email.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- AT: BBB, use view_documents instead -->\r
- <navigation-case>\r
- <from-outcome>view_workspaces</from-outcome>\r
- <to-view-id>/view_workspaces.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- AT: BBB, use create_document instead -->\r
- <navigation-case>\r
- <from-outcome>create_domain</from-outcome>\r
- <to-view-id>/create_domain.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- AT: BBB, use edit_document instead -->\r
- <navigation-case>\r
- <from-outcome>edit_domain</from-outcome>\r
- <to-view-id>/edit_domain.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- AT: BBB, use create_document instead -->\r
- <navigation-case>\r
- <from-outcome>create_workspace</from-outcome>\r
- <to-view-id>/create_workspace.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- AT: BBB, use edit_document instead -->\r
- <navigation-case>\r
- <from-outcome>edit_workspace</from-outcome>\r
- <to-view-id>/edit_workspace.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- users ang groups -->\r
-\r
- <navigation-case>\r
- <from-outcome>members_management</from-outcome>\r
- <to-view-id>/members_management.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_users</from-outcome>\r
- <to-view-id>/view_users.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_many_users</from-outcome>\r
- <to-view-id>/view_many_users.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>edit_user</from-outcome>\r
- <to-view-id>/edit_user.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>edit_user_password</from-outcome>\r
- <to-view-id>/edit_user_password.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_user</from-outcome>\r
- <to-view-id>/view_user.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>create_user</from-outcome>\r
- <to-view-id>/create_user.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_groups</from-outcome>\r
- <to-view-id>/view_groups.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_group</from-outcome>\r
- <to-view-id>/view_group.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>edit_group</from-outcome>\r
- <to-view-id>/edit_group.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>create_group</from-outcome>\r
- <to-view-id>/create_group.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_vocabularies</from-outcome>\r
- <to-view-id>/view_vocabularies.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>view_vocabulary</from-outcome>\r
- <to-view-id>/view_vocabulary.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- search -->\r
-\r
- <navigation-case>\r
- <from-outcome>search_form</from-outcome>\r
- <to-view-id>/search/search_form.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>search_results_nxql</from-outcome>\r
- <to-view-id>/search/search_results_nxql.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>search_results_advanced</from-outcome>\r
- <to-view-id>\r
- /search/search_results_advanced.xhtml\r
- </to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>search_results_simple</from-outcome>\r
- <to-view-id>/search/search_results_simple.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <!-- miscellaneaous -->\r
-\r
- <navigation-case>\r
- <from-outcome>clipboard</from-outcome>\r
- <to-view-id>/incl/clipboard.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>user_dashboard</from-outcome>\r
- <to-view-id>/user_dashboard.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>select_workspace_template</from-outcome>\r
- <to-view-id>/select_workspace_template.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>pdf_generation_error</from-outcome>\r
- <to-view-id>/pdf_generation_error.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>mass_edit</from-outcome>\r
- <to-view-id>/massedit_documents.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
-\r
- <navigation-case>\r
- <from-outcome>mass_edit_confirm</from-outcome>\r
- <to-view-id>/massedit_documents_preview.xhtml</to-view-id>\r
- <redirect/>\r
- </navigation-case>\r
</extension>\r
-\r
+ \r
</fragment>\r
-\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<name>services.note.jaxb</name>\r
\r
<dependencies>\r
- <dependency>\r
- <groupId>com.sun.xml.bind</groupId>\r
- <artifactId>jaxb-impl</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2-commons</groupId>\r
- <artifactId>property-listener-injector</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.jvnet.jaxb2_commons</groupId>\r
- <artifactId>runtime</artifactId>\r
- </dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.jaxb</artifactId>\r
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
</projectDescription>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.objectexit.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<artifactId>org.collectionspace.services.objectexit</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.objectexit</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.objectexit</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.objectexit.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.objectexit</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.organization.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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_orgauthorities.xhtml">
- breadcrumb=title.orgauthorities
- </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_orgauthorities</from-outcome>
- <to-view-id>/view_orgauthorities.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>view_orgauthority</from-outcome>
- <to-view-id>/view_orgauthority.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>
-
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.organization</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.collectionspace.services.common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization.client.samples</artifactId>\r
<packaging>pom</packaging>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
<name>organization.client.samples</name>\r
\r
<modules>\r
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="output" path="target/classes"/>\r
</classpath>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>\r
<projectDescription>\r
- <name>org.collectionspace.services.organization.client.sample</name>\r
- <comment></comment>\r
- <projects>\r
- <project>org.collectionspace.services.client</project>\r
- </projects>\r
- <buildSpec>\r
- <buildCommand>\r
- <name>org.eclipse.jdt.core.javabuilder</name>\r
- </buildCommand>\r
- <buildCommand>\r
- <name>org.maven.ide.eclipse.maven2Builder</name>\r
- </buildCommand>\r
- </buildSpec>\r
- <natures>\r
- <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
- <nature>org.eclipse.jdt.core.javanature</nature>\r
- </natures>\r
+ <name>org.collectionspace.services.organization.client.sample</name>\r
+ <comment></comment>\r
+ <projects>\r
+ <project>org.collectionspace.services.client</project>\r
+ </projects>\r
+ <buildSpec>\r
+ <buildCommand>\r
+ <name>org.eclipse.jdt.core.javabuilder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ <buildCommand>\r
+ <name>org.maven.ide.eclipse.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ </buildSpec>\r
+ <natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+ <nature>org.eclipse.jdt.core.javanature</nature>\r
+ </natures>\r
</projectDescription>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization.client.sample</artifactId>\r
<packaging>jar</packaging>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
<name>organization.client.sample</name>\r
\r
<dependencies>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
</dependencies>\r
\r
<build>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.person.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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_orgauthorities.xhtml">
- breadcrumb=title.orgauthorities
- </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_orgauthorities</from-outcome>
- <to-view-id>/view_orgauthorities.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>view_orgauthority</from-outcome>
- <to-view-id>/view_orgauthority.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>
-
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.person</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.collectionspace.services.common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="output" path="target/classes"/>\r
</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
<projectDescription>\r
- <name>org.collectionspace.services.person.client.sample</name>\r
+ <name>org.collectionspace.services.person.client.sample</name>\r
<comment></comment>\r
<projects>\r
<project>org.collectionspace.services.client</project>\r
<project>org.collectionspace.services.common</project>\r
</projects>\r
- <buildSpec>\r
- <buildCommand>\r
- <name>org.eclipse.jdt.core.javabuilder</name>\r
- </buildCommand>\r
- <buildCommand>\r
- <name>org.maven.ide.eclipse.maven2Builder</name>\r
- </buildCommand>\r
- </buildSpec>\r
- <natures>\r
- <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
- <nature>org.eclipse.jdt.core.javanature</nature>\r
- </natures>\r
+ <buildSpec>\r
+ <buildCommand>\r
+ <name>org.eclipse.jdt.core.javabuilder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ <buildCommand>\r
+ <name>org.maven.ide.eclipse.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ </buildSpec>\r
+ <natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+ <nature>org.eclipse.jdt.core.javanature</nature>\r
+ </natures>\r
</projectDescription>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.client</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person.client</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</dependency>\r
</dependencies>\r
\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
</dependencies>\r
\r
<build>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.main</name>
<packaging>pom</packaging>
+ <properties>
+ <annox.version>0.5.0</annox.version>
+ <jaxb2-basics.version>0.6.2</jaxb2-basics.version>
+ <maven-jaxb2-plugin.version>0.8.0</maven-jaxb2-plugin.version>
+ <jaxb.version>2.2.4-1</jaxb.version>
+ </properties>
+
<!--
!!!!!PLEASE READ!!!!!
Make sure you add modules below in the order of dependency. Security and
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<plugin>
<groupId>org.jvnet.hyperjaxb3</groupId>
<artifactId>maven-hyperjaxb3-plugin</artifactId>
- <version>0.5.4</version>
+ <version>0.5.6</version>
<executions>
<execution>
<goals>
</execution>
</executions>
<configuration>
+ <bindingIncludes>
+ <include>bindings.xjb</include>
+ </bindingIncludes>
<extension>true</extension>
<jdk5>true</jdk5>
<ejb3>false</ejb3>
<persistenceUnitName>garbage</persistenceUnitName>
</configuration>
</plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.7.3</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <!-- javax.activation.DataSource provider is required by spec -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
- <configuration>
- <args>
- <arg>-XtoString</arg>
- <arg>-Xinject-listener-code</arg>
-
- <!-- <arg>-Xcollection-setter-injector</arg>
- <arg>-Xfluent-api</arg> -->
- </args>
- <plugins>
- <plugin>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>basic</artifactId>
- <version>0.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- <version>1.0</version>
- </plugin>
- </plugins>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>${maven-jaxb2-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <extension>true</extension>
+ <bindingIncludes>
+ <include>xbindings.xjb</include>
+ </bindingIncludes>
+ <args>
+ <arg>-Xannotate</arg>
+ <arg>-verbose</arg>
+ <arg>-XtoString</arg>
+ <arg>-Xequals</arg>
+ <arg>-XhashCode</arg>
+ <arg>-Xcopyable</arg>
+ </args>
+ <plugins>
+ <plugin>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics-annotate</artifactId>
+ <version>${jaxb2-basics.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics</artifactId>
+ <version>${jaxb2-basics.version}</version>
+ </plugin>
+ </plugins>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>basic</artifactId>
- <version>0.4.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics</artifactId>
+ <version>${jaxb2-basics.version}</version>
+ </dependency>
<dependency>
<groupId>org.jvnet.jaxb2-commons</groupId>
<artifactId>property-listener-injector</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- <version>0.4.1.4</version>
- </dependency>
+ <dependency>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics-runtime</artifactId>
+ <version>${jaxb2-basics.version}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
- <version>1.2.1.GA</version>
+ <version>2.2.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>1.2.1.GA</version>
+ <version>2.2.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
- <version>1.2.1.GA</version>
+ <version>2.2.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
- <version>1.2.1.GA</version>
+ <version>2.2.2.GA</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-cli</artifactId>
<version>1.2</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+
<artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<groupId>org.jvnet.hyperjaxb3</groupId>
<!-- for time type adapters -->
<artifactId>hyperjaxb3-ejb-runtime</artifactId>
- <version>0.5.4</version>
+ <version>0.5.6</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.query</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.relation.3rdparty</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>
<artifactId>org.collectionspace.services.relation</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.relation</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.relation</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
</dependencies>\r
\r
<build>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.report.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>\r
<artifactId>org.collectionspace.services.report</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.report</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.report</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.report.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.report</artifactId> \r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
</dependencies>\r
\r
<build>\r
import java.sql.Statement;\r
import java.util.List;\r
\r
+import javax.sql.DataSource;\r
+\r
import org.collectionspace.services.common.api.Tools;\r
import org.collectionspace.services.common.service.ServiceBindingType;\r
import org.collectionspace.services.common.init.IInitHandler;\r
/** See the class javadoc for this class: it shows the syntax supported in the configuration params.\r
*/\r
@Override\r
- public void onRepositoryInitialized(ServiceBindingType sbt, List<Field> fields, \r
- List<Property> properties) throws Exception {\r
+ public void onRepositoryInitialized(DataSource dataSource,\r
+ ServiceBindingType sbt, \r
+ List<Field> fields, \r
+ List<Property> properties) throws Exception {\r
//Check for existing privileges, and if not there, grant them\r
for(Property prop:properties) {\r
if(READ_ROLE_NAME_KEY.equals(prop.getKey())) {\r
// Check for rights on report_common, and infer rights from that\r
sql = "SELECT has_table_privilege('"+readerRoleName\r
+"', '"+ReportConstants.DB_COMMON_PART_TABLE_NAME+"', 'SELECT')";\r
- conn = JDBCTools.getConnection(JDBCTools.NUXEO_REPOSITORY_NAME);\r
+ conn = JDBCTools.getConnection(dataSource);\r
stmt = conn.createStatement();\r
ResultSet rs = stmt.executeQuery(sql);\r
if(rs.next()) {\r
<artifactId>org.collectionspace.services.sdk</artifactId>\r
<packaging>pom</packaging>\r
<name>services.sdk</name>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
\r
<distributionManagement>\r
<repository>\r
<artifactId>org.collectionspace.services.client.sample</artifactId>\r
<packaging>jar</packaging>\r
<name>client.sample</name>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
\r
<dependencies>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>\r
<artifactId>org.collectionspace.services.security</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
import org.collectionspace.services.account.AccountsCommon;
import org.collectionspace.services.authorization.AccountRole;
import org.collectionspace.services.authorization.AccountValue;
-import org.collectionspace.services.authorization.ActionType;
-import org.collectionspace.services.authorization.EffectType;
+import org.collectionspace.services.authorization.perms.ActionType;
+import org.collectionspace.services.authorization.perms.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
import org.collectionspace.services.account.AccountsCommon;
import org.collectionspace.services.authorization.AccountRole;
import org.collectionspace.services.authorization.AccountValue;
-import org.collectionspace.services.authorization.ActionType;
-import org.collectionspace.services.authorization.EffectType;
+import org.collectionspace.services.authorization.perms.ActionType;
+import org.collectionspace.services.authorization.perms.EffectType;
-import org.collectionspace.services.authorization.Permission;
-import org.collectionspace.services.authorization.PermissionAction;
+import org.collectionspace.services.authorization.perms.Permission;
+import org.collectionspace.services.authorization.perms.PermissionAction;
import org.collectionspace.services.authorization.PermissionRole;
import org.collectionspace.services.authorization.PermissionValue;
import org.collectionspace.services.authorization.Role;
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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_orgauthorities.xhtml">
- breadcrumb=title.orgauthorities
- </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_orgauthorities</from-outcome>
- <to-view-id>/view_orgauthorities.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
-
- <navigation-case>
- <from-outcome>view_orgauthority</from-outcome>
- <to-view-id>/view_orgauthority.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>
-
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.collectionspace.services.common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.restlet</groupId>
- <artifactId>org.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.noelios.restlet</groupId>
- <artifactId>com.noelios.restlet</artifactId>
- <version>1.0.7</version>
- </dependency>
-
</dependencies>
<build>
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<extension target="application#MODULE">
<module>
- <ejb>${bundle.fileName}</ejb>
+ <java>${bundle.fileName}</java>
</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>
-
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.vocabulary</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>${project.version}</version>
</dependency>
<!-- External dependencies -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arguments>\r
</arguments>\r
</buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
</buildSpec>\r
<natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
<nature>org.eclipse.jdt.core.javanature</nature>\r
<nature>org.maven.ide.eclipse.maven2Nature</nature>\r
</natures>\r
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
<classpathentry kind="output" path="target/classes"/>\r
</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
<projectDescription>\r
- <name>org.collectionspace.services.vocabulary.client.sample</name>\r
- <comment/>\r
- <projects/>\r
- <buildSpec>\r
- <buildCommand>\r
- <name>org.eclipse.jdt.core.javabuilder</name>\r
- </buildCommand>\r
- <buildCommand>\r
- <name>org.maven.ide.eclipse.maven2Builder</name>\r
- </buildCommand>\r
- </buildSpec>\r
- <natures>\r
- <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
- <nature>org.eclipse.jdt.core.javanature</nature>\r
- </natures>\r
-</projectDescription>
\ No newline at end of file
+ <name>org.collectionspace.services.vocabulary.client.sample</name>\r
+ <comment></comment>\r
+ <projects>\r
+ </projects>\r
+ <buildSpec>\r
+ <buildCommand>\r
+ <name>org.eclipse.jdt.core.javabuilder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ <buildCommand>\r
+ <name>org.maven.ide.eclipse.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ <buildCommand>\r
+ <name>org.eclipse.m2e.core.maven2Builder</name>\r
+ <arguments>\r
+ </arguments>\r
+ </buildCommand>\r
+ </buildSpec>\r
+ <natures>\r
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>\r
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+ <nature>org.eclipse.jdt.core.javanature</nature>\r
+ </natures>\r
+</projectDescription>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary.client.sample</artifactId>\r
<packaging>jar</packaging>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
<name>vocabulary.client.sample</name>\r
\r
<dependencies>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary</artifactId>\r
- <version>1.12-SNAPSHOT</version>\r
+ <version>1.14-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</exclusions>\r
</dependency>\r
\r
- <dependency>\r
- <groupId>org.restlet</groupId>\r
- <artifactId>org.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>com.noelios.restlet</groupId>\r
- <artifactId>com.noelios.restlet</artifactId>\r
- <version>1.0.7</version>\r
- </dependency>\r
-\r
</dependencies>\r
\r
<build>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.workflow.3rdparty</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<parent>
<artifactId>org.collectionspace.services.workflow</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.workflow</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.workflow</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>services.workflow.jaxb</name>
<dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2-commons</groupId>
- <artifactId>property-listener-injector</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jvnet.jaxb2_commons</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.jaxb</artifactId>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.workflow</artifactId>
- <version>1.12-SNAPSHOT</version>
+ <version>1.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
# Configuration file for Nuxeo
-# See
-# https://doc.nuxeo.com/display/NXDOC/Configuring+Nuxeo+EP
-# and
-# https://doc.nuxeo.com/display/NXDOC/Available+Parameters+for+nuxeo.conf
+# See https://doc.nuxeo.com/x/PwA7
+# and https://doc.nuxeo.com/x/QQA7
# for detailed information about the settings below
# Java ---------------------------------------------------
#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
JAVA_OPTS=-Xms512m -Xmx768m -XX:MaxPermSize=512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dfile.encoding=UTF-8
-# Nuxeo default layout -------------------------------------------
-# Relative paths will be anchored at NUXEO_HOME
-#nuxeo.log.dir=log
-#nuxeo.pid.dir=bin
-#nuxeo.data.dir=data
+# Nuxeo launcher -----------------------------------------
+#launcher.start.max.wait = 300
+#launcher.override.java.tmpdir = true
-# Will regenerate config from these parameters each time the server is
-# restarted
+# Nuxeo layout -------------------------------------------
+# Relative paths will be anchored at NUXEO_HOME; here are not default but recommended values
+#nuxeo.log.dir=/var/log/nuxeo
+#nuxeo.pid.dir=/var/run
+#nuxeo.data.dir=/var/lib/nuxeo
+
+# Will regenerate config from these parameters each time the server is restarted
nuxeo.force.generation=true
# General parameters
#nuxeo.url=http://localhost:8080/nuxeo
#org.nuxeo.ecm.contextPath=/nuxeo
-#org.nuxeo.ecm.instance.name=
-#org.nuxeo.ecm.instance.description=
#org.nuxeo.ecm.product.name=
#org.nuxeo.ecm.product.version=
+
+# Defines the dashboard mode. There are 3 modes:
+# - auto: (default) let Nuxeo choose dashboard based on user browser capabilities
+# - old: force usage of the 'old' JSF based dashboard for all users
+# - opensocial: force usage of the new OpenSocial based dashboard for all users
#org.nuxeo.ecm.webapp.dashboard.mode=
# Database configuration
#nuxeo.db.port=
#nuxeo.db.min-pool-size=
#nuxeo.db.max-pool-size=
-#nuxeo.vcs.min-pool-size=
+#nuxeo.vcs.min-pool-size=
#nuxeo.vcs.max-pool-size=
# Mail settings (for notifications)
#nuxeo.notification.eMailSubjectPrefix="[Nuxeo]"
#mail.smtp.host=
#mail.smtp.port=
-#mail.smtp.auth=
+#mail.smtp.auth=
#mail.smtp.username=
-#mail.smtp.password=
+#mail.smtp.password=
#mail.from=
#mailservice.user=
#mailservice.password=
-#mail.store.protocol=
+#mail.store.protocol=
#mail.transport.protocol=
-#mail.user=
+#mail.user=
#mail.pop3.host=
#mail.debug=
+# OOo server config
+#jod.connection.protocol=SOCKET
+#jod.max.tasks.per.process=
+#jod.task.execution.timeout=
+#jod.task.queue.timeout=
+#jod.office.home=
+#jod.jpipe.lib.path=
+#jod.template.profile.dir=
+
# OpenSocial settings
+#opensocial.gadgets.embeddedServer=
#opensocial.gadgets.host=
-#opensocial.gadgets.port=
+#opensocial.gadgets.port=
+#opensocial.gadgets.path=
#opensocial.proxy.proxySet=
#opensocial.proxy.proxyHost=
#opensocial.proxy.proxyPort=
#opensocial.proxy.user=
#opensocial.proxy.password=
+#opensocial.trusted.hosts=
+
+# Encoding of the zip entries filename
+#zip.entry.encoding=ascii
+
+# JSF facelets
+# When a page is requested, what interval in seconds should the compiler check
+# for changes.
+# If you don't want the compiler to check for changes once the page is
+# compiled, then use a value of -1.
+# Setting a low refresh period helps during development to be able to edit
+# pages in a running application.
+#facelets.REFRESH_PERIOD=2
+
+# LiveEdit auto-versioning will minor version if set to minor
+#org.nuxeo.ecm.platform.liveedit.autoversioning=minor
+
+# Clustering settings
+#repository.clustering.enabled=false
+#repository.clustering.delay=1000
+# If clustering is activated, set repository.binary.store=/path/to/some/shared/folder/for/binaries
## More JVM options ------------------------------------------
#JAVA_OPTS=$JAVA_OPTS -Dcom.sun.management.jmxremote=true
# Log Garbage Collector informations into a file
-#JAVA_OPTS=$JAVA_OPTS -Xloggc:$DIRNAME/../log/gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
+#JAVA_OPTS=$JAVA_OPTS -Xloggc:${nuxeo.log.dir}/gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
-# Use BEA JROCKIT
-#JAVA_HOME=/usr/local/jrockit-R27.4.0-jdk1.5.0_12
-#JAVA_OPTS=-server -Xms$HEAP_SIZE -Xmx$HEAP_SIZE -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
-# Enable Jrockit Mission control
-#JAVA_OPTS=$JAVA_OPTS -Xmanagement
+# Enable JMX
+#JAVA_OPTS=$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1089 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false
+# Disable soft references
+#JAVA_OPTS=$JAVA_OPTS -XX:SoftRefLRUPolicyMSPerMB=0
+nuxeo.wizard.done=false
projects / tmp / jakarta-migration.git / commitdiff