You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gh...@apache.org on 2013/04/05 12:24:22 UTC
svn commit: r1464910 - in /roller/trunk:
weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/
weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/
Author: ghuber
Date: Fri Apr 5 10:24:21 2013
New Revision: 1464910
URL: http://svn.apache.org/r1464910
Log:
Testing updates
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java?rev=1464910&r1=1464909&r2=1464910&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/LoadSaltFilter.java Fri Apr 5 10:24:21 2013
@@ -34,7 +34,7 @@ import org.apache.roller.weblogger.ui.re
public class LoadSaltFilter implements Filter {
private static Log log = LogFactory.getLog(LoadSaltFilter.class);
- @Override
+ //@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
HttpServletRequest httpReq = (HttpServletRequest) request;
@@ -47,11 +47,11 @@ public class LoadSaltFilter implements F
chain.doFilter(request, response);
}
- @Override
+ //@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
- @Override
+ //@Override
public void destroy() {
}
}
\ No newline at end of file
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java?rev=1464910&r1=1464909&r2=1464910&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java Fri Apr 5 10:24:21 2013
@@ -33,7 +33,7 @@ import org.apache.roller.weblogger.ui.re
public class ValidateSaltFilter implements Filter {
private static Log log = LogFactory.getLog(ValidateSaltFilter.class);
- @Override
+ //@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
HttpServletRequest httpReq = (HttpServletRequest) request;
@@ -48,11 +48,11 @@ public class ValidateSaltFilter implemen
chain.doFilter(request, response);
}
- @Override
+ //@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
- @Override
+ //@Override
public void destroy() {
}
}
\ No newline at end of file
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp?rev=1464910&r1=1464909&r2=1464910&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/OAuthKeys.jsp Fri Apr 5 10:24:21 2013
@@ -67,6 +67,6 @@
<p style="margin-left:2em"><b><s:text name="oauthKeys.accessTokenURL" /></b>:
<s:property value="accessTokenURL" /></p>
+<br />
-
-
+<input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />