roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r755000 [4/4] - in /roller/trunk: apps/weblogger/ apps/weblogger/nbproject/ apps/weblogger/src/java/META-INF/ apps/weblogger/src/java/org/apache/roller/weblogger/business/ apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/ ap...
Date Mon, 16 Mar 2009 20:40:08 GMT
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?rev=755000&r1=754999&r2=755000&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Mon Mar
16 20:40:06 2009
@@ -23,6 +23,7 @@
 application.true=True
 application.false=False
 
+
 # ------------------------------------------------------------- BookmarkForm.jsp
 
 bookmarkForm.add.title=Add New Bookmark
@@ -355,7 +356,7 @@
 configForm.siteAdminEmail=Site Administrator''s email address
 configForm.absoluteUrl=Absolute URL to site (if required)
 configForm.suspendPingProcessing=Suspend all ping processing?
-configForm.debugMode=Enable debug mode?
+configForm.allowUserWeblogCreation=Allow users to create new weblogs?
 
 configForm.userSettings=User Settings
 configForm.accountActivation=Require new users to activate accounts via email
@@ -364,6 +365,11 @@
 configForm.registrationUrl=External registration url
 configForm.editorPages=Editor Pages
 
+configForm.webServicesSettings=Web Services Settings
+configForm.enableAtomPub=Enable Atom Publishing Protocol
+configForm.AtomPubAuth=AtomPub authentication (basic, oauth, or wsse)
+configForm.enableXmlRpc=Enable Blogger / MetaWeblog API
+
 configForm.weblogSettings=Weblog Rendering Settings
 configForm.pageMaxEntries=Max number of entries to allow per page
 configForm.newsfeedMaxEntries=Number of entries to provide in newsfeeds
@@ -1007,6 +1013,36 @@
 navigationBar.register=Register
 navigationBar.youMay=You may
 
+# ----------------------------------------------------------------- OAuth pages
+
+oauthKeys.title=OAuth Keys
+oauthKeys.description=OAuth key and secret for your account <span>{0}</span>
+oauthKeys.tip=You can authorized other sites and weblog client programs \
+to access your account to create and edit weblog posts, but only if those \
+sites and programs support OAuth. 
+oauthKeys.consumerKey=Consumer Key
+oauthKeys.consumerSecret=Consumer Secret
+
+oauthKeys.userKeys=User Specific Secret and Key
+oauthKeys.userKeysTip=These keys are tied to your user account, use them to \
+authorize weblog clients that need access your account.
+
+oauthKeys.siteWideKeys=Site Wide Secret and Key
+oauthKeys.siteWideKeysTip=Since you are a site admin, you have access to the \
+site wide key and secret. You can provide them to other sites that need to \
+access accounts on this site. Users will still have to authenticate access \
+by logging in to Roller.
+
+
+oauthAuthorize.title=OAuth Authorization
+oauthAuthorize.description=Authorize OAuth access to user account <span>{0}</span>?
+
+oauthAuthorize.tip=A web site is asking to to access your account. Press \
+the button below to allow access or simply close this window to deny it.
+
+#oauthAuthorize.tip=The website '{0}' would like to access your account. Press \
+#the button below to allow this or simply close this window to deny access.
+
 # -------------------------------------------------------------- Page management
 
 pagesForm.title=Templates
@@ -2139,6 +2175,10 @@
 yourWebsites.editProfile=Edit user profile
 yourWebsites.editProfile.desc=Change password, contact info, select language.
 
+yourWebsites.oauthKeys=OAuth Credentials
+yourWebsites.oauthKeys.desc=Enable other sites and programs to access your \
+account remotely.
+
 yourWebsites.globalAdmin=Server administration
 yourWebsites.globalAdmin.desc=Make site-wide administration changes.
 
@@ -2183,6 +2223,3 @@
 welcome.user.account.not.activated=In order to login to the system, you have to \
 activate your user account by clicking the link that is sent to you via e-mail.
 
-
-
-

Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml?rev=755000&r1=754999&r2=755000&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/struts.xml Mon Mar 16 20:40:06 2009
@@ -107,7 +107,17 @@
             <result name="cancel" type="redirect-action">menu</result>
             <result name="success" type="tiles">.Profile</result>
         </action>
-        
+
+        <action name="oauthKeys!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.core.OAuthKeys">
+            <result name="success" type="tiles">.OAuthKeys</result>
+        </action>
+
+        <action name="oauthAuthorize!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.core.OAuthAuthorize">
+            <result name="success" type="tiles">.OAuthAuthorize</result>
+        </action>
+
         <action name="createWeblog!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.core.CreateWeblog">
             <result name="input" type="tiles">.CreateWeblog</result>
@@ -404,5 +414,38 @@
         -->
     </package>
     
+    <!-- MOBILE BEGIN
+
+    <package name="mobile-authoring" namespace="/roller-ui/mobile" extends="weblogger">
+
+        <action name="menu!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.core.MainMenu">
+            <result name="success">/WEB-INF/jsps/mobile/MainMenu.jsp</result>
+        </action>
+
+        <action name="entries"
+                class="org.apache.roller.weblogger.ui.struts2.editor.Entries">
+            <result name="list">/WEB-INF/jsps/mobile/Entries.jsp</result>
+        </action>
+
+        <action name="comments!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.editor.Comments">
+            <result name="list">/WEB-INF/jsps/mobile/Comments.jsp</result>
+        </action>
+
+        <action name="entryAdd!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.editor.EntryAdd">
+            <result name="list">/WEB-INF/jsps/mobile/EntryAdd.jsp</result>
+        </action>
+
+        <action name="entryEdit!*" method="{1}"
+                class="org.apache.roller.weblogger.ui.struts2.editor.EntryEdit">
+            <result name="list">/WEB-INF/jsps/mobile/EntryEdit.jsp</result>
+        </action>
+
+    </package>
+
+    MOBILE END -->
+
 </struts>
 

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp?rev=755000&r1=754999&r2=755000&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenu.jsp Mon Mar 16 20:40:06 2009
@@ -71,7 +71,7 @@
                        
                        <tr>
                            <td class="mm_subtable_label"><s:text name='yourWebsites.weblog'
/></td>
-                           <td><a href='<s:property value="#perms.weblog.URL"
/>'>
+                           <td><a href='<s:property value="#perms.weblog.absoluteURL"
/>'>
                                <s:property value="#perms.weblog.absoluteURL" />
                            </a></td>                          
                        </tr>

Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenuSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenuSidebar.jsp?rev=755000&r1=754999&r2=755000&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenuSidebar.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/MainMenuSidebar.jsp Mon Mar 16 20:40:06
2009
@@ -34,6 +34,11 @@
                 <h3><a href="<s:url action="profile"/>"><s:text name="yourWebsites.editProfile"
/></a></h3>
                 <p><s:text name="yourWebsites.editProfile.desc" /></p>
                 
+                <s:if test="getBooleanProp('webservices.enableAtomPub') && getProp('webservices.atomPubAuth')
== 'oauth'">
+                    <h3><a href="<s:url action="oauthKeys" />"><s:text
name="yourWebsites.oauthKeys" /></a></h3>
+                    <p><s:text name="yourWebsites.oauthKeys.desc" /></p>
+                </s:if>
+
                 <s:if test="userIsAdmin">               
                     <h3><a href="<s:url action="globalConfig" namespace="/roller-ui/admin"
/>"><s:text name="yourWebsites.globalAdmin" /></a></h3>          
                     <p><s:text name="yourWebsites.globalAdmin.desc" /></p>

Added: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthAuthorize.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthAuthorize.jsp?rev=755000&view=auto
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthAuthorize.jsp (added)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthAuthorize.jsp Mon Mar 16 20:40:06
2009
@@ -0,0 +1,40 @@
+<%--
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<p class="subtitle">
+   <s:text name="oauthAuthorize.description" >
+       <s:param value="authenticatedUser.userName" />
+   </s:text>
+</p>
+
+<p class="pagetip">
+   <s:text name="oauthAuthorize.tip" >
+       <s:param value="appDesc" />
+   </s:text>
+</p>
+
+<form name="authZForm" action="authorize" method="POST">
+    <input type="hidden" name="userId" value="<s:property value="userName" />" size="20"
/><br>
+    <input type="hidden" name="oauth_token" value='<s:property value="token" />'
/>
+    <input type="hidden" name="oauth_callback" value='<s:property value="callback"
/>' />
+    <input type="submit" name="Authorize" value="Authorize"/>
+</form>
+    
+</body>
+</html>

Added: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthKeys.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthKeys.jsp?rev=755000&view=auto
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthKeys.jsp (added)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/OAuthKeys.jsp Mon Mar 16 20:40:06 2009
@@ -0,0 +1,54 @@
+<%--
+  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.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<p class="subtitle">
+   <s:text name="oauthKeys.description" >
+       <s:param value="authenticatedUser.userName" />
+   </s:text>
+</p>
+
+<p class="pagetip">
+   <s:text name="oauthKeys.tip" />
+</p>
+
+
+<h2><s:text name="oauthKeys.userKeys" /></h2>
+
+<p><s:text name="oauthKeys.userKeysTip" /></p>
+
+<p><b><s:text name="oauthKeys.consumerKey" /></b>:
+    <s:property value="userConsumer.consumerKey" /></p>
+
+<p><b><s:text name="oauthKeys.consumerSecret" /></b>:
+    <s:property value="userConsumer.consumerSecret" /></p>
+
+
+<s:if test="siteWideConsumer">
+
+<h2><s:text name="oauthKeys.siteWideKeys" /></h2>
+
+<p><s:text name="oauthKeys.siteWideKeysTip" /></p>
+
+<p><b><s:text name="oauthKeys.consumerKey" /></b>:
+    <s:property value="siteWideConsumer.consumerKey" /></p>
+
+<p><b><s:text name="oauthKeys.consumerSecret" /></b>:
+    <s:property value="siteWideConsumer.consumerSecret" /></p>
+
+</s:if>
\ No newline at end of file

Modified: roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml?rev=755000&r1=754999&r2=755000&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/tiles.xml Mon Mar 16 20:40:06 2009
@@ -95,7 +95,15 @@
     <definition name=".Profile" extends=".tiles-simplepage" >
         <put-attribute name="content" value="/WEB-INF/jsps/core/Profile.jsp" />
     </definition>
-    
+
+    <definition name=".OAuthKeys" extends=".tiles-simplepage" >
+        <put-attribute name="content" value="/WEB-INF/jsps/core/OAuthKeys.jsp" />
+    </definition>
+
+    <definition name=".OAuthAuthorize" extends=".tiles-simplepage" >
+        <put-attribute name="content" value="/WEB-INF/jsps/core/OAuthAuthorize.jsp" />
+    </definition>
+
     <definition name=".CreateWeblog" extends=".tiles-simplepage" >
         <put-attribute name="content" value="/WEB-INF/jsps/core/CreateWeblog.jsp" />
     </definition>

Modified: roller/trunk/apps/weblogger/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/web.xml?rev=755000&r1=754999&r2=755000&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/web.xml (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/web.xml Mon Mar 16 20:40:06 2009
@@ -1,30 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    
-<web-app  
-    xmlns="http://java.sun.com/xml/ns/j2ee" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"

-    version="2.4">
-    
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
     <display-name>Roller Weblogger</display-name>
-    
+
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>/WEB-INF/security.xml</param-value>
     </context-param>
-    
+
     <filter>
         <filter-name>struts2</filter-name>
         <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
     </filter>
-    
+
     <!-- This is really strange, but for some reason it's needed to prevent
          some problems with the file uploads not working intermittently -->
     <filter>
         <filter-name>struts2-cleanup</filter-name>
         <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>securityFilter</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -33,23 +28,23 @@
             <param-value>springSecurityFilterChain</param-value>
         </init-param>
     </filter>
-    
+
     <filter>
         <filter-name>DebugFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.DebugFilter</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>PersistenceSessionFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.PersistenceSessionFilter</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>BootstrapFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.BootstrapFilter</filter-class>
     </filter>
-    
-    <!-- 
+
+    <!--
     Most app servers support compression, if yours doesn't then use this one,
     but don't forget to uncomment the mapping below too.
     <filter>
@@ -62,39 +57,39 @@
         <filter-name>RequestMappingFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.rendering.filters.RequestMappingFilter</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>InitFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.InitFilter</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>IPBanFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.IPBanFilter</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>SchemeEnforcementFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.SchemeEnforcementFilter</filter-class>
     </filter>
-    
+
     <filter>
         <filter-name>CharEncodingFilter</filter-name>
         <filter-class>org.apache.roller.weblogger.ui.core.filters.CharEncodingFilter</filter-class>
     </filter>
-    
-    
+
+
     <!-- ******************************************
-         Filter mappings - order IS important here.  
+         Filter mappings - order IS important here.
          ****************************************** -->
-    
+
     <!--
      NOTE: Wherever "dispatcher" elements are specified in the filter mappings, they are
      required for Servlet API 2.4 containers, such as Tomcat 5+ and Resin 3+, but should
be
      commented out for Servlet API 2.3 containers, like Tomcat 4.x and Resin 2.x.
     -->
-    
-    <!-- This filter ensures that the request encoding is set to UTF-8 before any 
+
+    <!-- This filter ensures that the request encoding is set to UTF-8 before any
      other processing forces request parsing using a default encoding.
     Note: Any filters preceding this one MUST not cause request parsing. -->
     <filter-mapping>
@@ -103,7 +98,7 @@
         <dispatcher>REQUEST</dispatcher>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-    
+
     <!-- Ip Banning is mapped for comment and trackbacks only.
     Note: this filter does nothing if an ip ban list is not configured. -->
     <filter-mapping>
@@ -116,14 +111,14 @@
         <url-pattern>/roller-ui/rendering/trackback/*</url-pattern>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-     
+
     <!-- Scheme enforcement.  Only here until we get Acegi scheme enforcement working
-->
     <filter-mapping>
         <filter-name>SchemeEnforcementFilter</filter-name>
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
-    
+
     <!-- Acegi Security filters - controls secure access to different parts of Roller
-->
     <filter-mapping>
         <filter-name>securityFilter</filter-name>
@@ -131,13 +126,13 @@
         <dispatcher>REQUEST</dispatcher>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-    
+
     <filter-mapping>
         <filter-name>BootstrapFilter</filter-name>
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
-    
+
     <!-- Map everything to the PersistenceSessionFilter.
     NOTE: Any filters preceding this one MUST NOT use persistence sessions.-->
     <filter-mapping>
@@ -145,22 +140,22 @@
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
-    
+
     <!-- Init filter.  performs some initialization on first request -->
     <filter-mapping>
         <filter-name>InitFilter</filter-name>
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
-    
+
     <!-- Request mapping.  this is what allows the urls to work -->
     <filter-mapping>
         <filter-name>RequestMappingFilter</filter-name>
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
-    
-    <!-- 
+
+    <!--
     Most app servers support compression, if yours doesn't then use this one,
     but don't forget to uncomment the filter definition above too.
     <filter-mapping>
@@ -174,7 +169,7 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
     -->
-    
+
     <!-- Struts2 -->
     <filter-mapping>
         <filter-name>struts2-cleanup</filter-name>
@@ -182,146 +177,146 @@
         <dispatcher>REQUEST</dispatcher>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-    
+
     <filter-mapping>
         <filter-name>struts2</filter-name>
         <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-   
-    
+
+
     <!-- Context Listeners -->
     <listener>
         <listener-class>org.apache.roller.weblogger.ui.core.RollerSession</listener-class>
     </listener>
-    
+
     <listener>
         <listener-class>org.apache.roller.weblogger.ui.core.RollerContext</listener-class>
     </listener>
-    
+
     <listener>
         <listener-class>org.apache.tiles.web.startup.TilesListener</listener-class>
     </listener>
-    
-    
+
+
     <!-- Servlet Definitions -->
     <servlet>
         <servlet-name>PageServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.PageServlet</servlet-class>
         <load-on-startup>5</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>FeedServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.FeedServlet</servlet-class>
         <load-on-startup>5</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>ResourceServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.ResourceServlet</servlet-class>
         <load-on-startup>5</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>SearchServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.SearchServlet</servlet-class>
         <load-on-startup>5</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>OpenSearchServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.webservices.opensearch.OpenSearchServlet</servlet-class>
         <load-on-startup>10</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>CommentServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.CommentServlet</servlet-class>
         <load-on-startup>7</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>TrackbackServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.TrackbackServlet</servlet-class>
         <load-on-startup>7</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>RSDServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.RSDServlet</servlet-class>
         <load-on-startup>7</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>PlanetFeedServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.PlanetFeedServlet</servlet-class>
         <load-on-startup>7</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>CommentAuthenticatorServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.CommentAuthenticatorServlet</servlet-class>
         <load-on-startup>7</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>PreviewServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.PreviewServlet</servlet-class>
         <load-on-startup>9</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>PreviewResourceServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.PreviewResourceServlet</servlet-class>
         <load-on-startup>9</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>PreviewThemeImageServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.servlets.PreviewThemeImageServlet</servlet-class>
         <load-on-startup>9</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>RedirectServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.rendering.velocity.deprecated.RedirectServlet</servlet-class>
         <load-on-startup>9</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>StrutsRedirectServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.struts2.util.StrutsRedirectServlet</servlet-class>
         <load-on-startup>9</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>AtomServlet</servlet-name>
         <servlet-class>com.sun.syndication.propono.atom.server.AtomServlet</servlet-class>
     </servlet>
-    
+
     <servlet>
         <servlet-name>CommentDataServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.struts2.ajax.CommentDataServlet</servlet-class>
     </servlet>
-    
+
     <servlet>
         <servlet-name>UserDataServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.ui.struts2.ajax.UserDataServlet</servlet-class>
     </servlet>
-    
+
     <servlet>
         <servlet-name>AdminServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.webservices.adminprotocol.AdminServlet</servlet-class>
     </servlet>
-    
+
     <servlet>
         <servlet-name>TagDataServlet</servlet-name>
         <servlet-class>org.apache.roller.weblogger.webservices.tagdata.TagDataServlet</servlet-class>
     </servlet>
-    
-    
+
+
     <servlet>
         <servlet-name>XmlRpcServlet</servlet-name>
         <servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
@@ -333,184 +328,218 @@
             <param-value>true</param-value>
         </init-param>
     </servlet>
+
+
+    <!-- BEGIN OAUTH -->
+
+    <servlet>
+        <servlet-name>RequestTokenServlet</servlet-name>
+        <servlet-class>org.apache.roller.weblogger.webservices.oauth.RequestTokenServlet</servlet-class>
+    </servlet>
+
+    <servlet>
+        <servlet-name>AuthorizationServlet</servlet-name>
+        <servlet-class>org.apache.roller.weblogger.webservices.oauth.AuthorizationServlet</servlet-class>
+    </servlet>
     
-     
+    <servlet>
+        <servlet-name>AccessTokenServlet</servlet-name>
+        <servlet-class>org.apache.roller.weblogger.webservices.oauth.AccessTokenServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>RequestTokenServlet</servlet-name>
+        <url-pattern>/roller-services/oauth/requestToken</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>AuthorizationServlet</servlet-name>
+        <url-pattern>/roller-services/oauth/authorize</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>AccessTokenServlet</servlet-name>
+        <url-pattern>/roller-services/oauth/accessToken</url-pattern>
+    </servlet-mapping>
+
+    <!-- END OAUTH -->
+
     <!-- Rendering Servlets -->
     <servlet-mapping>
         <servlet-name>PageServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/page/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>FeedServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/feed/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>ResourceServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/resources/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>CommentServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/comment/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>TrackbackServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/trackback/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RSDServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/rsd/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>SearchServlet</servlet-name>
         <url-pattern>/roller-ui/rendering/search/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>PlanetFeedServlet</servlet-name>
         <url-pattern>/planetrss/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>CommentAuthenticatorServlet</servlet-name>
         <url-pattern>/CommentAuthenticatorServlet</url-pattern>
     </servlet-mapping>
-    
-    
+
+
     <!-- Preview Servlets -->
     <servlet-mapping>
         <servlet-name>PreviewServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/preview/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>PreviewResourceServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/previewresource/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>PreviewThemeImageServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/previewtheme</url-pattern>
     </servlet-mapping>
-    
-    
+
+
     <!-- Servlets for supporting Ajax -->
     <servlet-mapping>
         <servlet-name>CommentDataServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/commentdata/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>UserDataServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/userdata/*</url-pattern>
     </servlet-mapping>
-    
-    
+
+
     <!-- Web Service Servlets -->
     <servlet-mapping>
         <servlet-name>XmlRpcServlet</servlet-name>
         <url-pattern>/roller-services/xmlrpc</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>AtomServlet</servlet-name>
         <url-pattern>/roller-services/app/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>AdminServlet</servlet-name>
         <url-pattern>/roller-services/rap/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>TagDataServlet</servlet-name>
         <url-pattern>/roller-services/tagdata/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>OpenSearchServlet</servlet-name>
         <url-pattern>/roller-services/opensearch/*</url-pattern>
     </servlet-mapping>
-    
+
 
     <!-- Redirect Support for pre-3.0 urls -->
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/language/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/comments/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/resources/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/rsd/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/flavor/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/rss/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/atom/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/page/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/search/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/xmlrpc/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/editor/*</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>RedirectServlet</servlet-name>
         <url-pattern>/admin/*</url-pattern>
     </servlet-mapping>
-    
+
     <!-- Redirect support for some old struts1 urls -->
     <servlet-mapping>
         <servlet-name>StrutsRedirectServlet</servlet-name>
         <url-pattern>/roller-ui/yourWebsites.do</url-pattern>
     </servlet-mapping>
-    
+
     <servlet-mapping>
         <servlet-name>StrutsRedirectServlet</servlet-name>
         <url-pattern>/roller-ui/authoring/commentManagement.do</url-pattern>
     </servlet-mapping>
-    
-    
+
+
     <session-config>
         <session-timeout>30</session-timeout>
     </session-config>
@@ -520,22 +549,22 @@
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
-    
+
     <error-page>
         <exception-type>java.lang.Exception</exception-type>
         <location>/roller-ui/errors/error.jsp</location>
     </error-page>
-    
+
     <error-page>
         <error-code>403</error-code>
         <location>/roller-ui/errors/403.jsp</location>
     </error-page>
-    
+
     <error-page>
         <error-code>404</error-code>
         <location>/roller-ui/errors/404.jsp</location>
     </error-page>
-    
+
 
     <!-- jndi resources -->
     <resource-ref>
@@ -543,18 +572,16 @@
         <res-type>javax.sql.DataSource</res-type>
         <res-auth>Container</res-auth>
     </resource-ref>
-    
+
     <resource-ref>
         <res-ref-name>mail/Session</res-ref-name>
         <res-type>javax.mail.Session</res-type>
         <res-auth>Container</res-auth>
     </resource-ref>
-    
-</web-app>
 
+</web-app>
+<!-- BEGIN: example config. for using Container Managed Authentication
 
-    <!-- BEGIN: example config. for using Container Managed Authentication    
-    
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Weblog admin and editor resources</web-resource-name>
@@ -595,7 +622,7 @@
             <role-name>weblog-admin</role-name>
         </auth-constraint>
     </security-constraint>
-    
+
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Gobal Admin HTTPS resources</web-resource-name>
@@ -612,7 +639,7 @@
             <transport-guarantee>CONFIDENTIAL</transport-guarantee>
         </user-data-constraint>
     </security-constraint>
-    
+
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>editor res</web-resource-name>
@@ -622,7 +649,7 @@
             <role-name>weblog-user</role-name>
         </auth-constraint>
     </security-constraint>
-    
+
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>Editor HTTPS resources</web-resource-name>
@@ -636,7 +663,7 @@
             <transport-guarantee>CONFIDENTIAL</transport-guarantee>
         </user-data-constraint>
     </security-constraint>
-    
+
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>HTTPS resources</web-resource-name>
@@ -648,7 +675,7 @@
             <transport-guarantee>CONFIDENTIAL</transport-guarantee>
         </user-data-constraint>
     </security-constraint>
-    
+
     <login-config>
         <auth-method>FORM</auth-method>
         <realm-name>Roller_UserRealm</realm-name>
@@ -657,14 +684,13 @@
             <form-error-page>/roller-ui/login.rol?error=true</form-error-page>
         </form-login-config>
     </login-config>
-    
+
     <security-role>
         <role-name>weblog-admin</role-name>
     </security-role>
-    
+
     <security-role>
         <role-name>weblog-user</role-name>
     </security-role>
-    
-    END: example config. for using Container Managed Authentication -->
 
+    END: example config. for using Container Managed Authentication -->

Added: roller/trunk/tools/lib/rome-1.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/rome-1.0.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/rome-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/rome-fetcher-1.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/rome-fetcher-1.0.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/rome-fetcher-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/lib/rome-propono-1.0.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/rome-propono-1.0.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/lib/rome-propono-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/oauth/commons-httpclient-3.1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/oauth/commons-httpclient-3.1.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/oauth/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/oauth/httpclient-4.0-beta1.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/oauth/httpclient-4.0-beta1.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/oauth/httpclient-4.0-beta1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/oauth/httpcore-4.0-beta2.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/oauth/httpcore-4.0-beta2.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/oauth/httpcore-4.0-beta2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/tools/oauth/oauth-core-20090121.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/oauth/oauth-core-20090121.jar?rev=755000&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/tools/oauth/oauth-core-20090121.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message