You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2012/02/02 18:01:37 UTC
svn commit: r1239720 - in /abdera/abdera2-server: ./ examples/ server/ test/
test/src/main/java/org/apache/abdera2/test/activities/server/
test/src/main/java/org/apache/abdera2/test/client/
test/src/main/java/org/apache/abdera2/test/server/basic/ test/...
Author: jmsnell
Date: Thu Feb 2 17:01:37 2012
New Revision: 1239720
URL: http://svn.apache.org/viewvc?rev=1239720&view=rev
Log:
project fixup...
Modified:
abdera/abdera2-server/examples/ (props changed)
abdera/abdera2-server/examples/pom.xml
abdera/abdera2-server/pom.xml
abdera/abdera2-server/server/pom.xml
abdera/abdera2-server/test/ (props changed)
abdera/abdera2-server/test/pom.xml
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/AsyncBasicTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/BasicTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/AppTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/CacheTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/ClientTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/basic/BasicTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/custom/CustomProviderTest.java
abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/multipart/MultipartRelatedTest.java
Propchange: abdera/abdera2-server/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 2 17:01:37 2012
@@ -0,0 +1 @@
+target
Modified: abdera/abdera2-server/examples/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/examples/pom.xml?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/examples/pom.xml (original)
+++ abdera/abdera2-server/examples/pom.xml Thu Feb 2 17:01:37 2012
@@ -1,10 +1,11 @@
<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.abdera2</groupId>
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server-project</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server-examples</artifactId>
<packaging>jar</packaging>
<name>Abdera2 Server Examples</name>
@@ -32,6 +33,11 @@
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-security</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.abdera2.server</groupId>
+ <artifactId>abdera2-server</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
Modified: abdera/abdera2-server/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/pom.xml?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/pom.xml (original)
+++ abdera/abdera2-server/pom.xml Thu Feb 2 17:01:37 2012
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.abdera2</groupId>
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server-project</artifactId>
<packaging>pom</packaging>
<name>Apache Abdera2 - Server</name>
Modified: abdera/abdera2-server/server/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/server/pom.xml?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/server/pom.xml (original)
+++ abdera/abdera2-server/server/pom.xml Thu Feb 2 17:01:37 2012
@@ -21,11 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.abdera2</groupId>
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server-project</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server</artifactId>
<packaging>bundle</packaging>
<name>Abdera2 Server</name>
Propchange: abdera/abdera2-server/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 2 17:01:37 2012
@@ -0,0 +1 @@
+target
Modified: abdera/abdera2-server/test/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/pom.xml?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/pom.xml (original)
+++ abdera/abdera2-server/test/pom.xml Thu Feb 2 17:01:37 2012
@@ -21,11 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.abdera2</groupId>
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server-project</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
-
+
+ <groupId>org.apache.abdera2.server</groupId>
<artifactId>abdera2-server-test</artifactId>
<packaging>bundle</packaging>
<name>Abdera2 Server Tests</name>
@@ -73,6 +74,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.abdera2.server</groupId>
+ <artifactId>abdera2-server</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/AsyncBasicTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/AsyncBasicTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/AsyncBasicTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/AsyncBasicTest.java Thu Feb 2 17:01:37 2012
@@ -33,10 +33,10 @@ import org.apache.abdera2.activities.mod
import org.apache.abdera2.activities.model.objects.NoteObject;
import org.apache.abdera2.activities.model.objects.PersonObject;
import org.apache.abdera2.common.http.ResponseType;
-import org.apache.abdera2.protocol.client.BasicClient;
-import org.apache.abdera2.protocol.client.Client;
-import org.apache.abdera2.protocol.client.ClientResponse;
-import org.apache.abdera2.protocol.client.Session;
+import org.apache.abdera2.common.protocol.BasicClient;
+import org.apache.abdera2.common.protocol.Client;
+import org.apache.abdera2.common.protocol.ClientResponse;
+import org.apache.abdera2.common.protocol.Session;
import org.apache.abdera2.test.server.JettyServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/BasicTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/BasicTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/BasicTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/activities/server/BasicTest.java Thu Feb 2 17:01:37 2012
@@ -36,10 +36,10 @@ import org.apache.abdera2.activities.mod
import org.apache.abdera2.activities.model.Verb;
import org.apache.abdera2.activities.model.objects.NoteObject;
import org.apache.abdera2.activities.model.objects.PersonObject;
-import org.apache.abdera2.protocol.client.BasicClient;
-import org.apache.abdera2.protocol.client.Client;
-import org.apache.abdera2.protocol.client.ClientResponse;
-import org.apache.abdera2.protocol.client.Session;
+import org.apache.abdera2.common.protocol.BasicClient;
+import org.apache.abdera2.common.protocol.Client;
+import org.apache.abdera2.common.protocol.ClientResponse;
+import org.apache.abdera2.common.protocol.Session;
import org.apache.abdera2.test.server.JettyServer;
import org.apache.abdera2.common.Constants;
import org.apache.abdera2.common.http.ResponseType;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/AppTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/AppTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/AppTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/AppTest.java Thu Feb 2 17:01:37 2012
@@ -52,7 +52,7 @@ import org.apache.abdera2.parser.ParserO
import org.apache.abdera2.protocol.client.AbderaClient;
import org.apache.abdera2.protocol.client.AbderaClientResponse;
import org.apache.abdera2.protocol.client.AbderaSession;
-import org.apache.abdera2.protocol.client.RequestOptions;
+import org.apache.abdera2.common.protocol.RequestOptions;
import org.apache.abdera2.common.http.CacheControl;
import org.apache.abdera2.common.http.EntityTag;
import org.apache.abdera2.common.mediatype.MimeTypeHelper;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/CacheTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/CacheTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/CacheTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/CacheTest.java Thu Feb 2 17:01:37 2012
@@ -30,11 +30,11 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.abdera2.common.http.CacheControl;
-import org.apache.abdera2.protocol.client.BasicCachingClient;
-import org.apache.abdera2.protocol.client.Client;
-import org.apache.abdera2.protocol.client.ClientResponse;
-import org.apache.abdera2.protocol.client.RequestOptions;
-import org.apache.abdera2.protocol.client.Session;
+import org.apache.abdera2.common.protocol.BasicCachingClient;
+import org.apache.abdera2.common.protocol.Client;
+import org.apache.abdera2.common.protocol.ClientResponse;
+import org.apache.abdera2.common.protocol.RequestOptions;
+import org.apache.abdera2.common.protocol.Session;
import org.apache.abdera2.test.JettyUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/ClientTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/ClientTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/ClientTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/client/ClientTest.java Thu Feb 2 17:01:37 2012
@@ -32,11 +32,11 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.abdera2.common.misc.MoreExecutors2;
-import org.apache.abdera2.protocol.client.BasicClient;
-import org.apache.abdera2.protocol.client.Client;
-import org.apache.abdera2.protocol.client.ClientResponse;
-import org.apache.abdera2.protocol.client.Session;
-import org.apache.abdera2.protocol.client.Session.Listener;
+import org.apache.abdera2.common.protocol.BasicClient;
+import org.apache.abdera2.common.protocol.Client;
+import org.apache.abdera2.common.protocol.ClientResponse;
+import org.apache.abdera2.common.protocol.Session;
+import org.apache.abdera2.common.protocol.Session.Listener;
import org.apache.abdera2.test.JettyUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/basic/BasicTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/basic/BasicTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/basic/BasicTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/basic/BasicTest.java Thu Feb 2 17:01:37 2012
@@ -35,8 +35,8 @@ import org.apache.abdera2.model.Workspac
import org.apache.abdera2.protocol.client.AbderaClient;
import org.apache.abdera2.protocol.client.AbderaClientResponse;
import org.apache.abdera2.protocol.client.AbderaSession;
-import org.apache.abdera2.protocol.client.ClientResponse;
-import org.apache.abdera2.protocol.client.Session;
+import org.apache.abdera2.common.protocol.ClientResponse;
+import org.apache.abdera2.common.protocol.Session;
import org.apache.abdera2.test.server.JettyServer;
import org.apache.abdera2.common.Constants;
import org.apache.abdera2.common.http.ResponseType;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/custom/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/custom/CustomProviderTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/custom/CustomProviderTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/custom/CustomProviderTest.java Thu Feb 2 17:01:37 2012
@@ -37,8 +37,8 @@ import org.apache.abdera2.model.Workspac
import org.apache.abdera2.protocol.client.AbderaClient;
import org.apache.abdera2.protocol.client.AbderaClientResponse;
import org.apache.abdera2.protocol.client.AbderaSession;
-import org.apache.abdera2.protocol.client.ClientResponse;
-import org.apache.abdera2.protocol.client.Session;
+import org.apache.abdera2.common.protocol.ClientResponse;
+import org.apache.abdera2.common.protocol.Session;
import org.apache.abdera2.test.server.JettyServer;
import org.apache.abdera2.common.Constants;
import org.apache.abdera2.common.http.ResponseType;
Modified: abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/multipart/MultipartRelatedTest.java
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/multipart/MultipartRelatedTest.java?rev=1239720&r1=1239719&r2=1239720&view=diff
==============================================================================
--- abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/multipart/MultipartRelatedTest.java (original)
+++ abdera/abdera2-server/test/src/main/java/org/apache/abdera2/test/server/multipart/MultipartRelatedTest.java Thu Feb 2 17:01:37 2012
@@ -18,7 +18,7 @@ import org.apache.abdera2.model.Entry;
import org.apache.abdera2.protocol.client.AbderaClient;
import org.apache.abdera2.protocol.client.AbderaClientResponse;
import org.apache.abdera2.protocol.client.AbderaSession;
-import org.apache.abdera2.protocol.client.Client;
+import org.apache.abdera2.common.protocol.Client;
import org.apache.abdera2.protocol.server.AtompubProvider;
import org.apache.abdera2.protocol.server.impl.DefaultAtompubProvider;
import org.apache.abdera2.protocol.server.impl.SimpleWorkspaceInfo;