You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by dp...@apache.org on 2008/12/03 09:24:06 UTC
svn commit: r722806 - in /jackrabbit/sandbox/jcr-cmis: ./ server/
server/atompub/
server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/
server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/rest/
server/atompub/src/main/resou...
Author: dpfister
Date: Wed Dec 3 00:24:05 2008
New Revision: 722806
URL: http://svn.apache.org/viewvc?rev=722806&view=rev
Log:
- Add extension factory for "cmis:" elements
- Register it via META-INF/services
- Rename "rest" to "atompub"
Added:
jackrabbit/sandbox/jcr-cmis/server/atompub/ (props changed)
- copied from r722426, jackrabbit/sandbox/jcr-cmis/server/rest/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/ (props changed)
- copied from r722426, jackrabbit/sandbox/jcr-cmis/server/rest/src/main/java/org/apache/jackrabbit/cmis/server/rest/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/services/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/services/org.apache.abdera.factory.ExtensionFactory
jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java (contents, props changed)
- copied, changed from r722426, jackrabbit/sandbox/jcr-cmis/server/rest/src/test/java/org/apache/jackrabbit/cmis/server/rest/JettyServer.java
jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml (with props)
Removed:
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/rest/
jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/rest/
jackrabbit/sandbox/jcr-cmis/server/rest/
Modified:
jackrabbit/sandbox/jcr-cmis/pom.xml
jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml
jackrabbit/sandbox/jcr-cmis/server/atompub/readme.txt
jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/CMISExtensionFactory.java
jackrabbit/sandbox/jcr-cmis/server/pom.xml
Modified: jackrabbit/sandbox/jcr-cmis/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/pom.xml?rev=722806&r1=722805&r2=722806&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/pom.xml (original)
+++ jackrabbit/sandbox/jcr-cmis/pom.xml Wed Dec 3 00:24:05 2008
@@ -126,9 +126,27 @@
<version>0.4.0-incubating</version>
</dependency>
<dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-client</artifactId>
+ <version>0.4.0-incubating</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.5</version>
<scope>test</scope>
</dependency>
</dependencies>
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml?rev=722806&r1=722426&r2=722806&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml (original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml Wed Dec 3 00:24:05 2008
@@ -30,14 +30,14 @@
<artifactId>jcr-cmis-server</artifactId>
<version>1.5-SNAPSHOT</version>
</parent>
- <artifactId>jcr-cmis-server-rest</artifactId>
+ <artifactId>jcr-cmis-server-atompub</artifactId>
<version>1.5-SNAPSHOT</version>
- <name>JCR CMIS Rest Binding</name>
+ <name>JCR CMIS AtomPub Binding</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server/rest</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server/rest</developerConnection>
- <url>http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/rest</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server/atompub</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server/atompub</developerConnection>
+ <url>http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub</url>
</scm>
<dependencies>
@@ -58,22 +58,20 @@
<artifactId>abdera-server</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-client</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.5</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.5</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: jackrabbit/sandbox/jcr-cmis/server/atompub/readme.txt
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/readme.txt?rev=722806&r1=722426&r2=722806&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/readme.txt (original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/readme.txt Wed Dec 3 00:24:05 2008
@@ -1 +1 @@
-This directory contains the implementation of the REST API Binding.
+This directory contains the implementation of the AtomPub Binding.
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/CMISExtensionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/CMISExtensionFactory.java?rev=722806&r1=722426&r2=722806&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/CMISExtensionFactory.java (original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/CMISExtensionFactory.java Wed Dec 3 00:24:05 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.cmis.server.rest;
+package org.apache.jackrabbit.cmis.server.atompub;
import org.apache.abdera.util.AbstractExtensionFactory;
@@ -33,5 +33,7 @@
*/
public CMISExtensionFactory() {
super(CMIS_NS);
+
+ addImpl(CMISRepositoryInfo.NAME, CMISRepositoryInfo.class);
}
}
Added: jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/services/org.apache.abdera.factory.ExtensionFactory
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/services/org.apache.abdera.factory.ExtensionFactory?rev=722806&view=auto
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/services/org.apache.abdera.factory.ExtensionFactory (added)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/resources/META-INF/services/org.apache.abdera.factory.ExtensionFactory Wed Dec 3 00:24:05 2008
@@ -0,0 +1 @@
+org.apache.jackrabbit.cmis.server.atompub.CMISExtensionFactory
\ No newline at end of file
Copied: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java (from r722426, jackrabbit/sandbox/jcr-cmis/server/rest/src/test/java/org/apache/jackrabbit/cmis/server/rest/JettyServer.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java?p2=jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java&p1=jackrabbit/sandbox/jcr-cmis/server/rest/src/test/java/org/apache/jackrabbit/cmis/server/rest/JettyServer.java&r1=722426&r2=722806&rev=722806&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/rest/src/test/java/org/apache/jackrabbit/cmis/server/rest/JettyServer.java (original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java Wed Dec 3 00:24:05 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.cmis.server.rest;
+package org.apache.jackrabbit.cmis.server.atompub;
import org.apache.abdera.protocol.server.Provider;
import org.apache.abdera.protocol.server.ServiceManager;
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/JettyServer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml?rev=722806&view=auto
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml (added)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml Wed Dec 3 00:24:05 2008
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<app:service xmlns:app="http://www.w3.org/2007/app"
+ xmlns:atom="http://www.w3.org/2005/Atom"
+ xmlns:cmis="http://www.cmis.org/2008/05"
+ xmlns:cmisother="http://www.cmis-vendor.org/2008/05"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ xsi:schemaLocation="http://www.w3.org/2007/app APP.xsd http://www.w3.org/2005/Atom ATOM4CMIS.xsd http://www.cmis.org/2008/05 CMIS.xsd ">
+ <app:workspace cmis:repositoryRelationship="Self">
+ <atom:title>Repository 1</atom:title>
+ <cmis:repositoryInfo>
+ <cmis:repositoryId>repid1</cmis:repositoryId>
+ <cmis:repositoryName>repository1</cmis:repositoryName>
+ <cmis:repositoryRelationship>Self</cmis:repositoryRelationship>
+ <cmis:repositoryDescription>Repository Description</cmis:repositoryDescription>
+ <cmis:vendorName>ACME Vendor</cmis:vendorName>
+ <cmis:productName>ACME Repository</cmis:productName>
+ <cmis:productVersion>ACME Version 99.01</cmis:productVersion>
+ <cmis:rootFolderId>rootFolderId</cmis:rootFolderId>
+ <cmis:capabilities>
+ <cmis:capabilityMultifiling>true</cmis:capabilityMultifiling>
+ <cmis:capabilityUnfiling>true</cmis:capabilityUnfiling>
+ <cmis:capabilityVersionSpecificFiling>true</cmis:capabilityVersionSpecificFiling>
+ <cmis:capabilityPWCUpdateable>true</cmis:capabilityPWCUpdateable>
+ <cmis:capabilityAllVersionsSearchable>true</cmis:capabilityAllVersionsSearchable>
+ <cmis:capabilityJoin>innerAndOuter</cmis:capabilityJoin>
+ <cmis:capabilityFullText>fulltextandstructured</cmis:capabilityFullText>
+ </cmis:capabilities>
+ <cmis:cmisVersionsSupported>0.43</cmis:cmisVersionsSupported>
+ <cmis:repositorySpecificInformation><cmisother:Local>Local Message in vendor specific schema</cmisother:Local></cmis:repositorySpecificInformation>
+ </cmis:repositoryInfo>
+ <app:collection cmis:collectionType="unfiled" href="http://www.cmis.org/rep1/unfiled">
+ <atom:title>unfiled collection</atom:title>
+ </app:collection>
+ <app:collection cmis:collectionType="root-children" href="http://www.cmis.org/rep1/root">
+ <atom:title>root collection</atom:title>
+ </app:collection>
+ <app:collection cmis:collectionType="root-descendants" href="http://www.cmis.org/rep1/root-descendants">
+ <atom:title>root collection</atom:title>
+ </app:collection>
+ <app:collection cmis:collectionType="checkedout" href="http://www.cmis.org/rep1/checkedout">
+ <atom:title>checkedout collection</atom:title>
+ </app:collection>
+ <app:collection cmis:collectionType="types-children" href="http://www.cmis.org/rep1/types">
+ <atom:title>type collection</atom:title>
+ </app:collection>
+ <app:collection cmis:collectionType="types-descendants" href="http://www.cmis.org/rep1/types-descendants">
+ <atom:title>type collection</atom:title>
+ </app:collection>
+ <app:collection cmis:collectionType="query" href="http://www.cmis.org/rep1/query">
+ <atom:title>type collection</atom:title>
+ </app:collection>
+ </app:workspace>
+</app:service>
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/resources/Example-Service.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: jackrabbit/sandbox/jcr-cmis/server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/pom.xml?rev=722806&r1=722805&r2=722806&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/pom.xml (original)
+++ jackrabbit/sandbox/jcr-cmis/server/pom.xml Wed Dec 3 00:24:05 2008
@@ -36,7 +36,7 @@
<packaging>pom</packaging>
<modules>
- <module>rest</module>
+ <module>atompub</module>
<module>ws</module>
</modules>