Author: gmazza
Date: Sat Aug 10 00:34:00 2013
New Revision: 1512542
URL: http://svn.apache.org/r1512542
Log:
Removed two discontinued blog ping services.
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityEnforced.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/test/resources/roller-jettyrun.properties
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1512542&r1=1512541&r2=1512542&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sat Aug 10 00:34:00 2013
@@ -203,6 +203,14 @@
<artifactId>rome-fetcher</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
+ <exclusions>
+ <!-- Version it would bring in, 2.4.0, is too old,
+ breaks OpenID functionality -->
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityEnforced.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityEnforced.java?rev=1512542&r1=1512541&r2=1512542&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityEnforced.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityEnforced.java
Sat Aug 10 00:34:00 2013
@@ -27,7 +27,7 @@ import java.util.List;
*
* Available enforcements are ...
* - require a logged in user
- * - reguire a valid weblog to work on
+ * - require a valid weblog to work on
* - require a specific user role, such as "admin"
* - require a specific weblog permission
*
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1512542&r1=1512541&r2=1512542&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Sat Aug 10 00:34:00 2013
@@ -537,8 +537,6 @@ pings.initialCommonTargets=\
{{Technorati}{http://rpc.technorati.com/rpc/ping}}\
,{{Weblogs.com}{http://rpc.weblogs.com/RPC2}}\
,{{blo.gs}{http://ping.blo.gs/}}\
-,{{java.blogs}{http://javablogs.com/xmlrpc}}\
-,{{blogrolling.com}{http://rpc.blogrolling.com/pinger/}}\
,{{IceRocket}{http://rpc.icerocket.com:10080/}}
# Specify variant options for known buggy ping targets.
Modified: roller/trunk/app/src/test/resources/roller-jettyrun.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-jettyrun.properties?rev=1512542&r1=1512541&r2=1512542&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-jettyrun.properties (original)
+++ roller/trunk/app/src/test/resources/roller-jettyrun.properties Sat Aug 10
00:34:00 2013
@@ -3,6 +3,9 @@
installation.type=auto
planet.aggregator.enabled=true
+# hybrid and only are other options
+authentication.openid=disabled
+
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
# In-memory Derby database activated via "startdb" execution in app/pom.xml
