abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r589249 - in /incubator/abdera/java/trunk: ./ security/ server/ server/src/main/java/org/apache/abdera/protocol/server/ server/src/main/java/org/apache/abdera/protocol/server/content/ server/src/main/java/org/apache/abdera/protocol/server/i...
Date Sun, 28 Oct 2007 00:02:46 GMT
Author: dandiep
Date: Sat Oct 27 17:02:44 2007
New Revision: 589249

URL: http://svn.apache.org/viewvc?rev=589249&view=rev
Log:
- Move the collectionProvider bits into less ridiculous packages ("content" wasn't a very fitting name)
- Added updated/summary/etc to AbstractCollectionProvider.createEntry
- Remove toASCIIString() usage inside AbstractCollectionProvider
- Make security maven build pass through inclusion of Xalan as a dependency
- General POM cleanups. <scope>compile</scope> is redundant, so I've removed those references.



Added:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionProvider.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/CollectionProvider.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceInfo.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionProvider.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractCollectionProvider.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractWorkspaceProvider.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ResponseContextException.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/ResponseContextException.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/SimpleWorkspaceInfo.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/WorkspaceProvider.java
      - copied, changed from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceProvider.java
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/
      - copied from r589187, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/ContentProviderTest.java
      - copied, changed from r589248, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/ContentProviderTest.java
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/Customer.java
      - copied, changed from r589248, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/Customer.java
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/CustomerContentProvider.java
      - copied, changed from r589248, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/CustomerContentProvider.java
Removed:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/
Modified:
    incubator/abdera/java/trunk/pom.xml
    incubator/abdera/java/trunk/security/pom.xml
    incubator/abdera/java/trunk/server/pom.xml
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ProviderSupport.java
    incubator/abdera/java/trunk/spring/pom.xml

Modified: incubator/abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/pom.xml?rev=589249&r1=589248&r2=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/pom.xml (original)
+++ incubator/abdera/java/trunk/pom.xml Sat Oct 27 17:02:44 2007
@@ -192,42 +192,36 @@
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.0.4</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
         <version>3.1-rc1</version>
-        <scope>compile</scope>
       </dependency>
          
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.3</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-api</artifactId>
         <version>1.2.5</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-impl</artifactId>
         <version>1.2.5</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>stax</groupId>
         <artifactId>stax-api</artifactId>
         <version>1.0.1</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
@@ -241,28 +235,30 @@
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-activation_1.0.2_spec</artifactId>
         <version>1.1</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>jaxen</groupId>
         <artifactId>jaxen</artifactId>
         <version>1.1.1</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>xml-security</groupId>
         <artifactId>xmlsec</artifactId>
         <version>1.3.0</version>
-        <scope>compile</scope>
       </dependency>
       
       <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
-        <version>2.8.0</version>
-        <scope>compile</scope>
+        <version>2.8.1</version>
+      </dependency>
+            
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.04</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: incubator/abdera/java/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/pom.xml?rev=589249&r1=589248&r2=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/security/pom.xml (original)
+++ incubator/abdera/java/trunk/security/pom.xml Sat Oct 27 17:02:44 2007
@@ -1,94 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  The ASF licenses this file to You
-  under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.  For additional information regarding
-  copyright in this work, please see the NOTICE file in the top level
-  directory of this distribution. -->
-<project 
-  xmlns="http://maven.apache.org/POM/4.0.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.abdera</groupId>
-    <artifactId>abdera</artifactId>
-    <version>0.4.0-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>abdera-security</artifactId>
-  <packaging>jar</packaging>  
-  <name>Abdera Security</name>  
-  <version>0.4.0-incubating-SNAPSHOT</version>
-  <description>Atom Specification Implementation Security</description>  
-  <inceptionYear>2006</inceptionYear>
-  <url>http://incubator.apache.org/abdera</url>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/security/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/security/</developerConnection>
-    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/security/</url>
-  </scm>
-  <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-      </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-core</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-parser</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-client</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-protocol</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-server</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>xml-security</groupId>
-      <artifactId>xmlsec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>bouncycastle</groupId>
-      <artifactId>bcprov-jdk15</artifactId>
-      <version>124</version>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution. -->
+<project 
+  xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.abdera</groupId>
+    <artifactId>abdera</artifactId>
+    <version>0.4.0-incubating-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>abdera-security</artifactId>
+  <packaging>jar</packaging>  
+  <name>Abdera Security</name>  
+  <version>0.4.0-incubating-SNAPSHOT</version>
+  <description>Atom Specification Implementation Security</description>  
+  <inceptionYear>2006</inceptionYear>
+  <url>http://incubator.apache.org/abdera</url>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/security/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/security/</developerConnection>
+    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/security/</url>
+  </scm>
+  <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+      </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-core</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-parser</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-client</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-protocol</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-server</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xml-security</groupId>
+      <artifactId>xmlsec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>bouncycastle</groupId>
+      <artifactId>bcprov-jdk15</artifactId>
+      <version>124</version>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+  </dependencies>
+</project>

Modified: incubator/abdera/java/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/pom.xml?rev=589249&r1=589248&r2=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/pom.xml (original)
+++ incubator/abdera/java/trunk/server/pom.xml Sat Oct 27 17:02:44 2007
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  The ASF licenses this file to You
-  under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.  For additional information regarding
-  copyright in this work, please see the NOTICE file in the top level
-  directory of this distribution. -->
-<project 
-  xmlns="http://maven.apache.org/POM/4.0.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.abdera</groupId>
-    <artifactId>abdera</artifactId>
-    <version>0.4.0-incubating-SNAPSHOT</version>
-  </parent>  
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>abdera-server</artifactId>
-  <packaging>jar</packaging>
-  <name>Abdera Server</name>
-  <version>0.4.0-incubating-SNAPSHOT</version>
-  <description>Atom Publishing Protocol Specification Server-Side Implementation</description>
-  <inceptionYear>2006</inceptionYear>
-  <url>http://incubator.apache.org/abdera</url>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/server/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/server/</developerConnection>
-    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/server/</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-core</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>   
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-parser</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>   
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-protocol</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>   
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-client</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>   
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution. -->
+<project 
+  xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.abdera</groupId>
+    <artifactId>abdera</artifactId>
+    <version>0.4.0-incubating-SNAPSHOT</version>
+  </parent>  
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>abdera-server</artifactId>
+  <packaging>jar</packaging>
+  <name>Abdera Server</name>
+  <version>0.4.0-incubating-SNAPSHOT</version>
+  <description>Atom Publishing Protocol Specification Server-Side Implementation</description>
+  <inceptionYear>2006</inceptionYear>
+  <url>http://incubator.apache.org/abdera</url>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/server/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/server/</developerConnection>
+    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/server/</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-core</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>   
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-parser</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>   
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-protocol</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>   
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-client</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>   
+  </dependencies>
+</project>

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionProvider.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/CollectionProvider.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionProvider.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionProvider.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/CollectionProvider.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/CollectionProvider.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/CollectionProvider.java Sat Oct 27 17:02:44 2007
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server;
 
 import java.io.InputStream;
 import java.util.Date;
@@ -25,10 +25,8 @@
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Content;
 import org.apache.abdera.model.Feed;
-import org.apache.abdera.protocol.server.RequestContext;
-import org.apache.abdera.protocol.server.ResponseContext;
 
-public interface CollectionProvider<T> {
+public interface CollectionProvider {
     
     String getTitle();
     

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceInfo.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceInfo.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceInfo.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/WorkspaceInfo.java Sat Oct 27 17:02:44 2007
@@ -15,18 +15,20 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server;
 
 import java.util.Map;
 
-public interface WorkspaceInfo<T> {
+import org.apache.abdera.protocol.server.impl.ResponseContextException;
+
+public interface WorkspaceInfo {
 
   String getId();
 
   String getName();
 
-  Map<String, CollectionProvider<T>> getCollectionProviders();
+  Map<String, CollectionProvider> getCollectionProviders();
 
-  CollectionProvider<T> getCollectionProvider(String id) throws ResponseContextException;
+  CollectionProvider getCollectionProvider(String id) throws ResponseContextException;
 
 }

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionProvider.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractCollectionProvider.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionProvider.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionProvider.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractCollectionProvider.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractCollectionProvider.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractCollectionProvider.java Sat Oct 27 17:02:44 2007
@@ -15,11 +15,12 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
+import java.util.List;
 
 import javax.activation.MimeType;
 
@@ -31,23 +32,20 @@
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
+import org.apache.abdera.model.Person;
 import org.apache.abdera.model.Text;
 import org.apache.abdera.parser.ParseException;
 import org.apache.abdera.parser.Parser;
+import org.apache.abdera.protocol.server.CollectionProvider;
 import org.apache.abdera.protocol.server.RequestContext;
 import org.apache.abdera.protocol.server.ResponseContext;
-import org.apache.abdera.protocol.server.impl.AbstractResponseContext;
-import org.apache.abdera.protocol.server.impl.BaseResponseContext;
-import org.apache.abdera.protocol.server.impl.EmptyResponseContext;
-import org.apache.abdera.protocol.server.impl.MediaResponseContext;
-import org.apache.abdera.protocol.server.impl.ProviderSupport;
 import org.apache.abdera.util.EntityTag;
 import org.apache.abdera.util.MimeTypeHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public abstract class AbstractCollectionProvider<T> extends ProviderSupport
-  implements CollectionProvider<T> {
+  implements CollectionProvider {
   private final static Log log = LogFactory.getLog(AbstractCollectionProvider.class);
   
   private String baseMediaIri = "media/";
@@ -74,7 +72,7 @@
     return ctype != null && !MimeTypeHelper.isAtom(ctype) /*&& !MimeTypeHelper.isXml(ctype)*/;
   }
   
-  public abstract T createEntry(String title, String summary, Content content) throws ResponseContextException;
+  public abstract T createEntry(String title, IRI id, String summary, Date updated, List<Person> authors, Content content) throws ResponseContextException;
   
   public T createMediaEntry(MimeType mimeType, String slug, InputStream inputStream) throws ResponseContextException {
     throw new UnsupportedOperationException();
@@ -313,7 +311,7 @@
   protected void addEntryDetails(RequestContext request, Entry e, 
                                IRI entryBaseIri, T entryObj) throws ResponseContextException {
     IRI entryIri = entryBaseIri.resolve(getName(entryObj));
-    e.addLink(entryIri.toASCIIString(), "edit");
+    e.addLink(entryIri.toString(), "edit");
     e.setId(getId(entryObj));
     e.setTitle(getTitle(entryObj));
     e.setUpdated(getUpdated(entryObj));
@@ -333,7 +331,7 @@
     mediaIri = entryBaseIri.resolve(mediaIri);
 
     entry.setContent(mediaIri, getContentType(doc));
-    entry.addLink(mediaIri.toASCIIString(), "edit-media");
+    entry.addLink(mediaIri.toString(), "edit-media");
   }
 
   protected EntityTag calculateEntityTag(Base base) {
@@ -398,14 +396,18 @@
       entry.setUpdated(new Date());
       
       try {
-        T entryObj = createEntry(entry.getTitle(), entry.getSummary(), 
-                                          entry.getContentElement());
+        T entryObj = createEntry(entry.getTitle(),
+                                 entry.getId(),
+                                 entry.getSummary(),
+                                 entry.getUpdated(),
+                                 entry.getAuthors(),
+                                 entry.getContentElement());
         entry.getIdElement().setValue(getId(entryObj));
       
         IRI entryBaseUri = getEntryBaseFromFeedIRI(resolveBase(request));
         
         IRI entryIri = entryBaseUri.resolve(getName(entryObj));
-        entry.addLink(entryIri.toASCIIString(), "edit");
+        entry.addLink(entryIri.toString(), "edit");
   
         BaseResponseContext<Entry> rc = new BaseResponseContext<Entry>(entry);
         rc.setLocation(entryIri.resolve(entry.getEditLinkResolvedHref()).toString());
@@ -422,7 +424,7 @@
   }
 
   protected IRI getEntryBaseFromFeedIRI(IRI baseIri) {
-    return new IRI(baseIri.toASCIIString() + "/");
+    return new IRI(baseIri.toString() + "/");
   }
 
   protected Entry getEntryFromCollectionProvider(IRI feedIri, RequestContext request) throws ResponseContextException {

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractWorkspaceProvider.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractWorkspaceProvider.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/AbstractWorkspaceProvider.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractWorkspaceProvider.java Sat Oct 27 17:02:44 2007
@@ -15,7 +15,7 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server.impl;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
@@ -30,12 +30,10 @@
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Service;
 import org.apache.abdera.model.Workspace;
+import org.apache.abdera.protocol.server.CollectionProvider;
 import org.apache.abdera.protocol.server.RequestContext;
 import org.apache.abdera.protocol.server.ResponseContext;
-import org.apache.abdera.protocol.server.impl.AbstractProvider;
-import org.apache.abdera.protocol.server.impl.AbstractResponseContext;
-import org.apache.abdera.protocol.server.impl.BaseResponseContext;
-import org.apache.abdera.protocol.server.impl.EmptyResponseContext;
+import org.apache.abdera.protocol.server.WorkspaceInfo;
 import org.apache.abdera.util.EntityTag;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -74,7 +72,7 @@
         Set<Map.Entry<String, CollectionProvider>> entrySet = 
           (Set<Map.Entry<String, CollectionProvider>>) (wp.getCollectionProviders().entrySet());
         for (Map.Entry<String, CollectionProvider> entry : entrySet) {
-          CollectionProvider<?> cp = entry.getValue();
+          CollectionProvider cp = entry.getValue();
 
           String id;
           String workspaceKey;
@@ -106,8 +104,8 @@
     }
 
     @SuppressWarnings("unchecked")
-    private <T> CollectionProvider<T> getCollectionProvider(IRI resolveBase, 
-                                                            RequestContext request) throws ResponseContextException {
+    private CollectionProvider getCollectionProvider(IRI resolveBase, 
+                                                     RequestContext request) throws ResponseContextException {
       String path = resolveBase.getPath();
       String[] paths = path.split("/");
       if (paths.length < 1) {
@@ -146,7 +144,7 @@
       
       return e.getResponseContext();
     }
-    protected abstract WorkspaceInfo<?> getWorkspaceInfo(String string);
+    protected abstract WorkspaceInfo getWorkspaceInfo(String string);
 
     public ResponseContext createEntry(RequestContext request) {
       try {
@@ -179,7 +177,7 @@
 
     public ResponseContext deleteEntry(RequestContext request) {
       try {
-        CollectionProvider<?> provider = getCollectionProvider(resolveBase(request).resolve("./"), request);
+        CollectionProvider provider = getCollectionProvider(resolveBase(request).resolve("./"), request);
       
         return provider.deleteEntry(request);
       } catch (ResponseContextException e) {

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ProviderSupport.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ProviderSupport.java?rev=589249&r1=589248&r2=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ProviderSupport.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ProviderSupport.java Sat Oct 27 17:02:44 2007
@@ -15,10 +15,10 @@
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.ExtensibleElement;
 import org.apache.abdera.protocol.error.Error;
+import org.apache.abdera.protocol.server.CollectionProvider;
 import org.apache.abdera.protocol.server.Provider;
 import org.apache.abdera.protocol.server.RequestContext;
 import org.apache.abdera.protocol.server.ResponseContext;
-import org.apache.abdera.protocol.server.content.CollectionProvider;
 import org.apache.abdera.protocol.util.EncodingUtil;
 import org.apache.abdera.util.Messages;
 import org.apache.abdera.util.MimeTypeHelper;

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ResponseContextException.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/ResponseContextException.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ResponseContextException.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ResponseContextException.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/ResponseContextException.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/ResponseContextException.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/ResponseContextException.java Sat Oct 27 17:02:44 2007
@@ -15,10 +15,8 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server.impl;
 
-import org.apache.abdera.protocol.server.impl.AbstractResponseContext;
-import org.apache.abdera.protocol.server.impl.EmptyResponseContext;
 
 public class ResponseContextException extends Exception {
   private AbstractResponseContext responseContext;

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/SimpleWorkspaceInfo.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/SimpleWorkspaceInfo.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/SimpleWorkspaceInfo.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/SimpleWorkspaceInfo.java Sat Oct 27 17:02:44 2007
@@ -15,10 +15,13 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server.impl;
 
 import java.util.Collection;
 import java.util.Map;
+
+import org.apache.abdera.protocol.server.CollectionProvider;
+import org.apache.abdera.protocol.server.WorkspaceInfo;
 
 public class SimpleWorkspaceInfo implements WorkspaceInfo {
     private Map<String, CollectionProvider> collectionProviders;

Copied: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/WorkspaceProvider.java (from r589187, incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceProvider.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/WorkspaceProvider.java?p2=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/WorkspaceProvider.java&p1=incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceProvider.java&r1=589187&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/content/WorkspaceProvider.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/impl/WorkspaceProvider.java Sat Oct 27 17:02:44 2007
@@ -15,10 +15,12 @@
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
 */
-package org.apache.abdera.protocol.server.content;
+package org.apache.abdera.protocol.server.impl;
 
 import java.util.Collection;
 
+import org.apache.abdera.protocol.server.WorkspaceInfo;
+
 public class WorkspaceProvider extends AbstractWorkspaceProvider {
 
   private Collection<WorkspaceInfo> workspaces;
@@ -27,7 +29,7 @@
     super(10);
   }
   
-  public WorkspaceInfo<?> getWorkspaceInfo(String id) {
+  public WorkspaceInfo getWorkspaceInfo(String id) {
     for (WorkspaceInfo wp : workspaces) {
       if (wp.getId().equals(id)) {
         return wp;

Copied: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/ContentProviderTest.java (from r589248, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/ContentProviderTest.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/ContentProviderTest.java?p2=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/ContentProviderTest.java&p1=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/ContentProviderTest.java&r1=589248&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/ContentProviderTest.java (original)
+++ incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/ContentProviderTest.java Sat Oct 27 17:02:44 2007
@@ -1,4 +1,4 @@
-package org.apache.abdera.server.protocol.server.content;
+package org.apache.abdera.protocol.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,15 +19,15 @@
 import org.apache.abdera.protocol.client.AbderaClient;
 import org.apache.abdera.protocol.client.ClientResponse;
 import org.apache.abdera.protocol.client.RequestOptions;
+import org.apache.abdera.protocol.server.CollectionProvider;
 import org.apache.abdera.protocol.server.ServiceContext;
 import org.apache.abdera.protocol.server.TargetType;
-import org.apache.abdera.protocol.server.content.CollectionProvider;
-import org.apache.abdera.protocol.server.content.SimpleWorkspaceInfo;
-import org.apache.abdera.protocol.server.content.WorkspaceInfo;
-import org.apache.abdera.protocol.server.content.WorkspaceProvider;
+import org.apache.abdera.protocol.server.WorkspaceInfo;
 import org.apache.abdera.protocol.server.impl.DefaultServiceContext;
 import org.apache.abdera.protocol.server.impl.RegexTargetResolver;
+import org.apache.abdera.protocol.server.impl.SimpleWorkspaceInfo;
 import org.apache.abdera.protocol.server.impl.SingletonProviderManager;
+import org.apache.abdera.protocol.server.impl.WorkspaceProvider;
 import org.apache.abdera.protocol.server.servlet.AbderaServlet;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.Context;
@@ -99,7 +99,7 @@
     ClientResponse res = client.post(colUri.toString(), entry, opts);
     assertEquals(201, res.getStatus());
 
-    prettyPrint(abdera, res.getDocument());
+    // prettyPrint(abdera, res.getDocument());
 
     IRI location = res.getLocation();
     assertEquals(colUri + "/1001-Dan_Diephouse", 
@@ -109,7 +109,7 @@
     res = client.get(location.toString());
     assertEquals(200, res.getStatus());
 
-    prettyPrint(abdera, res.getDocument());
+    // prettyPrint(abdera, res.getDocument());
     org.apache.abdera.model.Document<Entry> entry_doc = res.getDocument();
     entry = entry_doc.getRoot();
 
@@ -117,7 +117,7 @@
     assertEquals(404, res.getStatus());
   }
 
-  private void prettyPrint(Abdera abdera, Base doc) throws IOException {
+  protected void prettyPrint(Abdera abdera, Base doc) throws IOException {
     abdera.getWriterFactory().getWriter("prettyxml").writeTo(doc, System.out);
     System.out.println();
   }

Copied: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/Customer.java (from r589248, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/Customer.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/Customer.java?p2=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/Customer.java&p1=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/Customer.java&r1=589248&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/Customer.java (original)
+++ incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/Customer.java Sat Oct 27 17:02:44 2007
@@ -1,4 +1,4 @@
-package org.apache.abdera.server.protocol.server.content;
+package org.apache.abdera.protocol.server;
 
 import java.util.Date;
 

Copied: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/CustomerContentProvider.java (from r589248, incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/CustomerContentProvider.java)
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/CustomerContentProvider.java?p2=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/CustomerContentProvider.java&p1=incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/CustomerContentProvider.java&r1=589248&r2=589249&rev=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/server/protocol/server/content/CustomerContentProvider.java (original)
+++ incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/protocol/server/CustomerContentProvider.java Sat Oct 27 17:02:44 2007
@@ -1,7 +1,8 @@
-package org.apache.abdera.server.protocol.server.content;
+package org.apache.abdera.protocol.server;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -9,10 +10,12 @@
 
 import org.apache.abdera.Abdera;
 import org.apache.abdera.factory.Factory;
+import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Content;
 import org.apache.abdera.model.Element;
-import org.apache.abdera.protocol.server.content.AbstractCollectionProvider;
-import org.apache.abdera.protocol.server.content.ResponseContextException;
+import org.apache.abdera.model.Person;
+import org.apache.abdera.protocol.server.impl.AbstractCollectionProvider;
+import org.apache.abdera.protocol.server.impl.ResponseContextException;
 import sun.security.pkcs.ContentInfo;
 
 public class CustomerContentProvider extends AbstractCollectionProvider<Customer> {
@@ -23,10 +26,12 @@
   private Factory factory = new Abdera().getFactory();
   
   public String getId() {
-    return "tag:example.org,2006:feed";
+    return "tag:example.org,2007:feed";
   }
 
-  public Customer createEntry(String title, String summary, Content content) {
+  @Override
+  public Customer createEntry(String title, IRI id, String summary, Date updated, List<Person> authors,
+                              Content content) throws ResponseContextException {
     Customer customer = contentToCustomer(content);
     customers.put(customer.getId(), customer);
     

Modified: incubator/abdera/java/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/spring/pom.xml?rev=589249&r1=589248&r2=589249&view=diff
==============================================================================
--- incubator/abdera/java/trunk/spring/pom.xml (original)
+++ incubator/abdera/java/trunk/spring/pom.xml Sat Oct 27 17:02:44 2007
@@ -1,83 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  The ASF licenses this file to You
-  under the Apache License, Version 2.0 (the "License"); you may not
-  use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.  For additional information regarding
-  copyright in this work, please see the NOTICE file in the top level
-  directory of this distribution. -->
-<project 
-  xmlns="http://maven.apache.org/POM/4.0.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.abdera</groupId>
-    <artifactId>abdera</artifactId>
-    <version>0.4.0-incubating-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>abdera-spring</artifactId>
-  <packaging>jar</packaging>  
-  <name>Abdera Spring Integration</name>  
-  <version>0.4.0-incubating-SNAPSHOT</version>
-  <description>Spring Integration Code for Abdera</description>  
-  <inceptionYear>2006</inceptionYear>
-  <url>http://incubator.apache.org/abdera</url>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</developerConnection>
-    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</url>
-  </scm>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>**/TestProvider.java</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <dependencies>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-      </dependency>
-    <dependency>
-      <groupId>org.apache.abdera</groupId>
-      <artifactId>abdera-server</artifactId>
-      <version>0.4.0-incubating-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <version>2.0.6</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution. -->
+<project 
+  xmlns="http://maven.apache.org/POM/4.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.abdera</groupId>
+    <artifactId>abdera</artifactId>
+    <version>0.4.0-incubating-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>abdera-spring</artifactId>
+  <packaging>jar</packaging>  
+  <name>Abdera Spring Integration</name>  
+  <version>0.4.0-incubating-SNAPSHOT</version>
+  <description>Spring Integration Code for Abdera</description>  
+  <inceptionYear>2006</inceptionYear>
+  <url>http://incubator.apache.org/abdera</url>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</developerConnection>
+    <url>http://svn.apache.org/repos/asf/incubator/abdera/java/trunk/spring/</url>
+  </scm>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <excludes>
+              <exclude>**/TestProvider.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+      </dependency>
+    <dependency>
+      <groupId>org.apache.abdera</groupId>
+      <artifactId>abdera-server</artifactId>
+      <version>0.4.0-incubating-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>2.0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-mock</artifactId>
+      <version>2.0.6</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>



Mime
View raw message