Author: gmazza
Date: Tue Aug 6 17:52:51 2013
New Revision: 1511052
URL: http://svn.apache.org/r1511052
Log:
Revert of ROL-1933, removing Crowd Atlassian integration from Roller (See
ROL-1933 for changes necessary for individual users to incorporate V2.4 of it,
also http://markmail.org/message/tyxrhzclkycovd4p for reasoning for removal.)
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CrowdAuthenticationProvider.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CrowdRollerUserDetails.java
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/webapp/WEB-INF/security.xml
roller/trunk/it-selenium/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1511052&r1=1511051&r2=1511052&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Tue Aug 6 17:52:51 2013
@@ -25,24 +25,6 @@
<lucene.version>4.4.0</lucene.version>
</properties>
- <repositories>
- <repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <repository>
- <id>com.atlassian</id>
- <name>Atlassian Repository</name>
- <url>http://maven.atlassian.com/public</url>
- </repository>
- </repositories>
-
<dependencies>
<!-- Eclipselink JPA is the default JPA implementation used by
@@ -400,18 +382,6 @@
</dependency>
<dependency>
- <groupId>com.atlassian.crowd</groupId>
- <artifactId>crowd-integration-client-rest</artifactId>
- <version>2.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.4.0</version>
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=1511052&r1=1511051&r2=1511052&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
Tue Aug 6 17:52:51 2013
@@ -432,24 +432,6 @@ users.sso.autoProvision.enabled=false
users.sso.autoProvision.className=\
org.apache.roller.weblogger.ui.core.security.BasicUserAutoProvision
-
-#----------------------------------
-# Atlassian Crowd authentication
-
-# required fields - if even one of these fields are not present we will not
attempt crowd auth
-crowd.application.name=
-crowd.application.password=
-crowd.port=
-crowd.host=
-crowd.context=
-#end required fields
-
-#this setting allows the use of https, defaults to false; not present we will
use plain socket.
-crowd.useSecureConnection=
-crowd.default.timezone=
-crowd.default.locale=
-
-
#-----------------------------------------------------------------------------
# Rendering system
#-----------------------------------------------------------------------------
Modified: roller/trunk/app/src/main/webapp/WEB-INF/security.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/security.xml?rev=1511052&r1=1511051&r2=1511052&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/security.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/security.xml Tue Aug 6 17:52:51
2013
@@ -98,9 +98,4 @@ http://www.springframework.org/schema/se
<custom-filter position="OPENID_PROCESSING_FILTER"/>
</beans:bean>
- <beans:bean id="rollerCrowdAuthenticationService"
-
class="org.apache.roller.weblogger.ui.core.security.CrowdAuthenticationProvider">
- <custom-authentication-provider/>
- </beans:bean>
-
</beans:beans>
Modified: roller/trunk/it-selenium/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1511052&r1=1511051&r2=1511052&view=diff
==============================================================================
--- roller/trunk/it-selenium/pom.xml (original)
+++ roller/trunk/it-selenium/pom.xml Tue Aug 6 17:52:51 2013
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-webapp</artifactId>
- <version>${roller.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies>
@@ -188,4 +188,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
