Author: snoopdave
Date: Sun Apr 27 15:36:26 2014
New Revision: 1590406
URL: http://svn.apache.org/r1590406
Log:
Fixes from testing Atom Protocol support via MarsEdit client.
Modified:
roller/branches/rome2/app/pom.xml
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/branches/rome2/app/src/main/resources/propono.properties
roller/branches/rome2/app/src/main/webapp/WEB-INF/web.xml
Modified: roller/branches/rome2/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/pom.xml?rev=1590406&r1=1590405&r2=1590406&view=diff
==============================================================================
--- roller/branches/rome2/app/pom.xml (original)
+++ roller/branches/rome2/app/pom.xml Sun Apr 27 15:36:26 2014
@@ -202,6 +202,13 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.7</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- spring deps -->
<dependency>
Modified:
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1590406&r1=1590405&r2=1590406&view=diff
==============================================================================
---
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
(original)
+++
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
Sun Apr 27 15:36:26 2014
@@ -100,8 +100,7 @@ public class RollerAtomService extends A
}
entryCol.addCategories(cats);
- // Add tags as free-form categories using scheme that
points
- // to site because tags can be considered site-wide
+ // Indicte that free form categories are allowed
Categories tags = new Categories();
tags.setFixed(false);
entryCol.addCategories(tags);
Modified:
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1590406&r1=1590405&r2=1590406&view=diff
==============================================================================
---
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Sun Apr 27 15:36:26 2014
@@ -459,9 +459,9 @@ rendering.userRequestMappers=
# Url path elements which can NEVER be considered a weblog url
# each represents a url at the application root, i.e. /<elem>/*
rendering.weblogMapper.rollerProtectedUrls=\
-roller-ui,images,theme,themes,CommentAuthenticatorServlet,\
+roller-ui,roller-services,images,theme,themes,CommentAuthenticatorServlet,\
index.jsp,favicon.ico,robots.txt,\
-page,flavor,rss,atom,language,search,comments,rsd,resource,xmlrpc,planetrss
+page,flavor,rss,atom,language,search,comments,rsd,resource,planetrss
# Set of user defined protected urls. These are added to the set above.
rendering.weblogMapper.userProtectedUrls=
Modified: roller/branches/rome2/app/src/main/resources/propono.properties
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/propono.properties?rev=1590406&r1=1590405&r2=1590406&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/propono.properties (original)
+++ roller/branches/rome2/app/src/main/resources/propono.properties Sun Apr 27
15:36:26 2014
@@ -1,2 +1,2 @@
-com.sun.syndication.propono.atom.server.AtomHandlerFactory=\
+org.rometools.propono.atom.server.AtomHandlerFactory=\
org.apache.roller.weblogger.webservices.atomprotocol.RollerAtomHandlerFactory
Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/web.xml?rev=1590406&r1=1590405&r2=1590406&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/web.xml Sun Apr 27
15:36:26 2014
@@ -263,7 +263,7 @@
<servlet>
<servlet-name>AtomServlet</servlet-name>
-
<servlet-class>com.sun.syndication.propono.atom.server.AtomServlet</servlet-class>
+
<servlet-class>org.rometools.propono.atom.server.AtomServlet</servlet-class>
</servlet>
<servlet>
