jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpfis...@apache.org
Subject svn commit: r737088 - in /jackrabbit/sandbox/jcr-cmis/server: ./ atompub/ atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/ atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/ ws/
Date Fri, 23 Jan 2009 16:48:05 GMT
Author: dpfister
Date: Fri Jan 23 08:48:05 2009
New Revision: 737088

URL: http://svn.apache.org/viewvc?rev=737088&view=rev
Log:
JCRCMIS - new reference to parent project

Modified:
    jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml
    jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/AbstractRepositoryProvider.java
    jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/SimpleRepositoryProvider.java
    jackrabbit/sandbox/jcr-cmis/server/pom.xml
    jackrabbit/sandbox/jcr-cmis/server/ws/pom.xml

Modified: jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml?rev=737088&r1=737087&r2=737088&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml (original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/pom.xml Fri Jan 23 08:48:05 2009
@@ -22,23 +22,15 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- ====================================================================== -->
-  <!-- P R O J E C T  D E S C R I P T I O N                                   -->
-  <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jcr-cmis-server</artifactId>
     <version>1.6-SNAPSHOT</version>
   </parent>
+
   <artifactId>jcr-cmis-server-atompub</artifactId>
   <version>1.6-SNAPSHOT</version>
-  <name>JCR CMIS AtomPub Binding</name>
-  
-  <scm>
-    <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>
+  <name>Jackrabbit CMIS Server AtomPub Binding</name>
   
   <build>
     <plugins>
@@ -56,18 +48,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.jcr</groupId>
-      <artifactId>jcr</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.abdera</groupId>
       <artifactId>abdera-server</artifactId>
     </dependency>
@@ -87,5 +67,13 @@
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jcr-cmis-api</artifactId>
+      <version>1.6-SNAPSHOT</version>
+    </dependency>
+
   </dependencies>
+
 </project>

Modified: jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/AbstractRepositoryProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/AbstractRepositoryProvider.java?rev=737088&r1=737087&r2=737088&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/AbstractRepositoryProvider.java
(original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/src/main/java/org/apache/jackrabbit/cmis/server/atompub/AbstractRepositoryProvider.java
Fri Jan 23 08:48:05 2009
@@ -51,7 +51,7 @@
                         .writeAttribute(CMIS.REPOSITORY_RELATIONSHIP, "self")
                         .writeTitle(wi.getTitle(request));
 
-                    writeRepository(sw);
+                    writeRepositoryInfo(sw);
 
                     for (CollectionInfo ci : wi.getCollections(request)) {
                         sw.startCollection(ci.getHref(request))
@@ -92,7 +92,7 @@
         .setContentType(Constants.APP_MEDIA_TYPE);
     }
 
-    protected void writeRepository(StreamWriter sw) throws IOException {
+    protected void writeRepositoryInfo(StreamWriter sw) throws IOException {
         sw.startElement(CMIS.REPOSITORY_INFO);
         writeElement(sw, CMIS.REPOSITORY_ID, repository.getId());
         writeElement(sw, CMIS.REPOSITORY_NAME, repository.getName());

Modified: jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/SimpleRepositoryProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/SimpleRepositoryProvider.java?rev=737088&r1=737087&r2=737088&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/SimpleRepositoryProvider.java
(original)
+++ jackrabbit/sandbox/jcr-cmis/server/atompub/src/test/java/org/apache/jackrabbit/cmis/server/atompub/SimpleRepositoryProvider.java
Fri Jan 23 08:48:05 2009
@@ -46,6 +46,7 @@
 
         setRepository(repository);
 
+        // TODO move this down to AbstractRepositoryProvider
         SimpleWorkspaceInfo wi = new SimpleWorkspaceInfo(repository.getDescription());
         wi.setCollections(new HashSet<CollectionInfo>());
         addWorkspace(wi);

Modified: jackrabbit/sandbox/jcr-cmis/server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/pom.xml?rev=737088&r1=737087&r2=737088&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/pom.xml (original)
+++ jackrabbit/sandbox/jcr-cmis/server/pom.xml Fri Jan 23 08:48:05 2009
@@ -22,17 +22,15 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- ====================================================================== -->
-  <!-- P R O J E C T  D E S C R I P T I O N                                   -->
-  <!-- ====================================================================== -->
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
-    <artifactId>jcr-cmis</artifactId>
+    <artifactId>jcr-cmis-parent</artifactId>
     <version>1.6-SNAPSHOT</version>
   </parent>
+
   <artifactId>jcr-cmis-server</artifactId>
   <version>1.6-SNAPSHOT</version>
-  <name>JCR CMIS Server Implementation</name>
+  <name>Jackrabbit CMIS Server Implementation</name>
   <packaging>pom</packaging>
   
   <modules>
@@ -40,10 +38,4 @@
     <module>ws</module>
   </modules>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server</developerConnection>
-    <url>http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server</url>
-  </scm>
-
 </project>

Modified: jackrabbit/sandbox/jcr-cmis/server/ws/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jcr-cmis/server/ws/pom.xml?rev=737088&r1=737087&r2=737088&view=diff
==============================================================================
--- jackrabbit/sandbox/jcr-cmis/server/ws/pom.xml (original)
+++ jackrabbit/sandbox/jcr-cmis/server/ws/pom.xml Fri Jan 23 08:48:05 2009
@@ -37,7 +37,7 @@
 	</parent>
 	<artifactId>jcr-cmis-server-ws</artifactId>
 	<version>1.6-SNAPSHOT</version>
-	<name>JCR CMIS Web Services Binding</name>
+	<name>Jackrabbit CMIS Web Services Binding</name>
 
 	<scm>
 		<connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/sandbox/jcr-cmis/server/ws</connection>



Mime
View raw message