Author: jmsnell
Date: Thu Feb 2 16:31:55 2012
New Revision: 1239713
URL: http://svn.apache.org/viewvc?rev=1239713&view=rev
Log:
Removing items that are in the common package...
Added:
abdera/abdera2-server/server/.classpath (with props)
abdera/abdera2-server/server/.project (with props)
abdera/abdera2-server/server/.settings/
abdera/abdera2-server/server/.settings/org.eclipse.jdt.core.prefs (with
props)
Removed:
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractMessage.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractRequest.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractResponse.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/Message.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/Request.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/Response.java
Modified:
abdera/abdera2-server/server/ (props changed)
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractBaseRequestContext.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/TransactionalRequestProcessor.java
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/ext/json/JSONServlet.java
Propchange: abdera/abdera2-server/server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 2 16:31:55 2012
@@ -0,0 +1 @@
+target
Added: abdera/abdera2-server/server/.classpath
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/.classpath?rev=1239713&view=auto
==============================================================================
--- abdera/abdera2-server/server/.classpath (added)
+++ abdera/abdera2-server/server/.classpath Thu Feb 2 16:31:55 2012
@@ -0,0 +1,47 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/maven-shared-archive-resources"
excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="/abdera2-activities"/>
+ <classpathentry kind="src" path="/abdera2-common"/>
+ <classpathentry kind="src" path="/abdera2-core"/>
+ <classpathentry kind="src" path="/abdera2-ext"/>
+ <classpathentry kind="src" path="/abdera2-security"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.12/axiom-api-1.2.12.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.12/axiom-impl-1.2.12.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/cglib/cglib-nodep/2.2/cglib-nodep-2.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/easymock/easymock/3.0/easymock-3.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.6/geronimo-javamail_1.4_spec-1.6.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.1/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/com/google/code/gson/gson/1.7.1/gson-1.7.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/com/google/guava/guava/11.0/guava-11.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/nu/validator/htmlparser/htmlparser/1.2.1/htmlparser-1.2.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/httpcomponents/httpclient-cache/4.1.2/httpclient-cache-4.1.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/httpcomponents/httpmime/4.1.2/httpmime-4.1.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/com/ibm/icu/icu4j/4.8.1.1/icu4j-4.8.1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-continuation/8.0.0.v20110901/jetty-continuation-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-http/8.0.0.v20110901/jetty-http-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-io/8.0.0.v20110901/jetty-io-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-security/8.0.0.v20110901/jetty-security-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-server/8.0.0.v20110901/jetty-server-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-servlet/8.0.0.v20110901/jetty-servlet-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/eclipse/jetty/jetty-util/8.0.0.v20110901/jetty-util-8.0.0.v20110901.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/joda-time/joda-time/2.0/joda-time-2.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mockito/mockito-all/1.8.5/mockito-all-1.8.5.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/objenesis/objenesis/1.2/objenesis-1.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.6/wstx-asl-3.2.6.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+</classpath>
\ No newline at end of file
Propchange: abdera/abdera2-server/server/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: abdera/abdera2-server/server/.project
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/.project?rev=1239713&view=auto
==============================================================================
--- abdera/abdera2-server/server/.project (added)
+++ abdera/abdera2-server/server/.project Thu Feb 2 16:31:55 2012
@@ -0,0 +1,19 @@
+<projectDescription>
+ <name>abdera2-server</name>
+ <comment>Atom Publishing Protocol Server Implementation.
NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are
not supported in M2Eclipse.</comment>
+ <projects>
+ <project>abdera2-activities</project>
+ <project>abdera2-common</project>
+ <project>abdera2-core</project>
+ <project>abdera2-ext</project>
+ <project>abdera2-security</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange: abdera/abdera2-server/server/.project
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: abdera/abdera2-server/server/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/.settings/org.eclipse.jdt.core.prefs?rev=1239713&view=auto
==============================================================================
--- abdera/abdera2-server/server/.settings/org.eclipse.jdt.core.prefs (added)
+++ abdera/abdera2-server/server/.settings/org.eclipse.jdt.core.prefs Thu Feb
2 16:31:55 2012
@@ -0,0 +1,5 @@
+#Thu Feb 02 08:20:06 PST 2012
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
Propchange: abdera/abdera2-server/server/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractBaseRequestContext.java
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractBaseRequestContext.java?rev=1239713&r1=1239712&r2=1239713&view=diff
==============================================================================
---
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractBaseRequestContext.java
(original)
+++
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractBaseRequestContext.java
Thu Feb 2 16:31:55 2012
@@ -18,7 +18,6 @@
package org.apache.abdera2.common.protocol;
import java.security.Principal;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.Set;
Modified:
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java?rev=1239713&r1=1239712&r2=1239713&view=diff
==============================================================================
---
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
(original)
+++
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
Thu Feb 2 16:31:55 2012
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.abdera2.common.text.UrlEncoding;
import org.apache.abdera2.common.date.DateTimes;
import org.apache.abdera2.common.http.EntityTag;
-import org.apache.abdera2.common.misc.ExceptionHelper;
import org.apache.abdera2.common.misc.MoreFunctions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -146,7 +145,7 @@ public abstract class AbstractCollection
*/
protected ResponseContext createErrorResponse(
ResponseContextException e) {
- ExceptionHelper.responseLog(log,e);
+ log.error(e);
return e.getResponseContext();
}
Modified:
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/TransactionalRequestProcessor.java
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/TransactionalRequestProcessor.java?rev=1239713&r1=1239712&r2=1239713&view=diff
==============================================================================
---
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/TransactionalRequestProcessor.java
(original)
+++
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/common/protocol/TransactionalRequestProcessor.java
Thu Feb 2 16:31:55 2012
@@ -62,7 +62,7 @@ public abstract class TransactionalReque
response = actuallyApply(input);
return response;
} catch (Throwable e) {
- ExceptionHelper.log(log,e);
+ log.error(e);
compensate(input,e);
throw ExceptionHelper.propogate(e);
} finally {
Modified:
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/ext/json/JSONServlet.java
URL:
http://svn.apache.org/viewvc/abdera/abdera2-server/server/src/main/java/org/apache/abdera2/ext/json/JSONServlet.java?rev=1239713&r1=1239712&r2=1239713&view=diff
==============================================================================
---
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/ext/json/JSONServlet.java
(original)
+++
abdera/abdera2-server/server/src/main/java/org/apache/abdera2/ext/json/JSONServlet.java
Thu Feb 2 16:31:55 2012
@@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.abdera2.Abdera;
import org.apache.abdera2.model.Document;
import org.apache.abdera2.protocol.client.AbderaClient;
-import org.apache.abdera2.protocol.client.RequestHelper;
-import org.apache.abdera2.protocol.client.RequestOptions;
+import org.apache.abdera2.common.protocol.RequestHelper;
+import org.apache.abdera2.common.protocol.RequestOptions;
/**
* Servlet that will do an HTTP GET to retrieve an Atom document then convert
that into a JSON doc. The URL pattern is
