Author: jmsnell
Date: Wed Feb 1 18:29:46 2012
New Revision: 1239252
URL: http://svn.apache.org/viewvc?rev=1239252&view=rev
Log:
removing the server code stuff from the main abdera2 project area... it's been
moved into abdera2-server... this will simplify things long term and make it
easier to evolve the server stuff independently of this core data format and
client implementation (allowing us to get the latter into the hands of
developers faster while continuing to work on improving, simplifying and
modernizing the server side of things...)
Removed:
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/AbstractActivitiesCollectionAdapter.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/AbstractActivitiesProvider.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/AbstractActivitiesWorkspaceProvider.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/ActivitiesProvider.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/ActivitiesResponseContext.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/ActivitiesServiceManager.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/DefaultActivitiesProvider.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/ProtocolException.java
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/basic/
abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/managed/
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractBaseRequestContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractProvider.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractResponseContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractServiceManager.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractWorkspaceManager.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractWorkspaceProvider.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/BaseRequestContextWrapper.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/BaseResponseContextWrapper.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/BasicCollectionInfo.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/BasicWorkspaceInfo.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/CollectionAdapter.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/CollectionInfo.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/CollectionRequestProcessor.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/CompressionFilter.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/DefaultWorkspaceManager.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/EmptyResponseContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/EntryRequestProcessor.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/MediaRequestProcessor.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/MediaResponseContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/MethodOverrideFilter.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/Provider.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/ProviderHelper.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RegexTargetResolver.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestProcessor.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestTemplateContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/ResponseContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/ResponseContextException.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RouteManager.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/ServiceManager.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/SimpleResponseContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/SimpleSubjectResolver.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/SimpleTarget.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/Target.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/TargetBuilder.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/TargetFunctionResolver.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/TargetType.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/TemplateManagerTargetBuilder.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/TransactionalRequestProcessor.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/WorkspaceInfo.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/WorkspaceManager.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/AbderaServlet.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/AbstractAbderaServlet.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/ServletRequestContext.java
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/async/
abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/ActivitiesServlet.java
abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/MyActivitiesAdapter.java
abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/appserver/employee/
abdera/abdera2/ext/src/main/java/org/apache/abdera2/ext/json/
abdera/abdera2/ext/src/main/java/org/apache/abdera2/ext/serializer/ObjectResponseContext.java
abdera/abdera2/security/src/main/java/org/apache/abdera2/security/util/filters/
abdera/abdera2/server/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/activities/server/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/ext/json/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/security/filter/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/JettyServer.java
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/basic/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/custom/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/customer/
abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/multipart/
Modified:
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/ExceptionHelper.java
abdera/abdera2/core/src/main/java/org/apache/abdera2/util/MorePredicates.java
abdera/abdera2/pom.xml
Modified:
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/ExceptionHelper.java
URL:
http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/ExceptionHelper.java?rev=1239252&r1=1239251&r2=1239252&view=diff
==============================================================================
---
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/ExceptionHelper.java
(original)
+++
abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/ExceptionHelper.java
Wed Feb 1 18:29:46 2012
@@ -17,10 +17,7 @@
*/
package org.apache.abdera2.common.misc;
-import org.apache.abdera2.common.http.ResponseType;
import org.apache.abdera2.common.mediatype.MimeTypeParseException;
-import org.apache.abdera2.common.protocol.ResponseContextException;
-import org.apache.commons.logging.Log;
public class ExceptionHelper {
@@ -73,21 +70,21 @@ public class ExceptionHelper {
else return new RuntimeException(t);
}
- public static void log(Log log, Throwable t) {
- if (t instanceof ResponseContextException) {
- ResponseContextException rce =
- (ResponseContextException)t;
- if (rce.getResponseType() == ResponseType.CLIENT_ERROR)
- log.info(t);
- else
- log.error(t);
- } else log.error(t);
- }
+// public static void log(Log log, Throwable t) {
+// if (t instanceof ResponseContextException) {
+// ResponseContextException rce =
+// (ResponseContextException)t;
+// if (rce.getResponseType() == ResponseType.CLIENT_ERROR)
+// log.info(t);
+// else
+// log.error(t);
+// } else log.error(t);
+// }
- public static void responseLog(Log log, ResponseContextException t) {
- if (log.isDebugEnabled())
- log.debug("A ResponseException was thrown.", t);
- else if (t.getResponseContext().getType() == ResponseType.SERVER_ERROR)
- log.warn("A ResponseException was thrown.", t);
- }
+// public static void responseLog(Log log, ResponseContextException t) {
+// if (log.isDebugEnabled())
+// log.debug("A ResponseException was thrown.", t);
+// else if (t.getResponseContext().getType() == ResponseType.SERVER_ERROR)
+// log.warn("A ResponseException was thrown.", t);
+// }
}
Modified:
abdera/abdera2/core/src/main/java/org/apache/abdera2/util/MorePredicates.java
URL:
http://svn.apache.org/viewvc/abdera/abdera2/core/src/main/java/org/apache/abdera2/util/MorePredicates.java?rev=1239252&r1=1239251&r2=1239252&view=diff
==============================================================================
---
abdera/abdera2/core/src/main/java/org/apache/abdera2/util/MorePredicates.java
(original)
+++
abdera/abdera2/core/src/main/java/org/apache/abdera2/util/MorePredicates.java
Wed Feb 1 18:29:46 2012
@@ -23,9 +23,7 @@ import java.util.Set;
import javax.xml.namespace.QName;
import org.apache.abdera2.common.Constants;
-import org.apache.abdera2.common.Localizer;
import org.apache.abdera2.common.iri.IRI;
-import org.apache.abdera2.common.protocol.ProviderHelper;
import org.apache.abdera2.model.Content;
import org.apache.abdera2.model.Element;
import org.apache.abdera2.model.Entry;
@@ -74,10 +72,8 @@ public class MorePredicates {
if (is_media(content) && !entry.has(Constants.SUMMARY))
return false;
} catch (Exception e) {
- ProviderHelper.log.debug(Localizer.sprintf("CHECKING.VALID.ENTRY",
false));
return false;
}
- ProviderHelper.log.debug(Localizer.sprintf("CHECKING.VALID.ENTRY",
true));
return true;
}
};
Modified: abdera/abdera2/pom.xml
URL:
http://svn.apache.org/viewvc/abdera/abdera2/pom.xml?rev=1239252&r1=1239251&r2=1239252&view=diff
==============================================================================
--- abdera/abdera2/pom.xml (original)
+++ abdera/abdera2/pom.xml Wed Feb 1 18:29:46 2012
@@ -689,7 +689,6 @@
<modules>
<module>common</module>
<module>core</module>
- <module>server</module>
<module>activities</module>
<module>client</module>
<module>ext</module>
