Merge branch 'release/1.0.2'

opentext-idol · Mar 11, 2015 · 2bfae39 · 2bfae39
2 parents c16b560 + 54ec18d
commit 2bfae39
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 170 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>com.hp.autonomy.frontend.find</groupId>
     <artifactId>find</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>war</packaging>
 
     <properties>
@@ -426,6 +426,11 @@
             <artifactId>configuration-impl</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.hp.autonomy.frontend.configuration</groupId>
+            <artifactId>configuration-authentication</artifactId>
+            <version>0.1.0</version>
+        </dependency>
         <dependency>
             <groupId>com.hp.autonomy.frontend</groupId>
             <artifactId>logging</artifactId>

diff --git a/...java/com/hp/autonomy/frontend/find/authentication/DefaultLoginAuthenticationProvider.java b/...java/com/hp/autonomy/frontend/find/authentication/DefaultLoginAuthenticationProvider.java
diff --git a/src/main/java/com/hp/autonomy/frontend/find/authentication/FindAccessDeniedHandler.java b/src/main/java/com/hp/autonomy/frontend/find/authentication/FindAccessDeniedHandler.java
diff --git a/src/main/java/com/hp/autonomy/frontend/find/authentication/LoginSuccessHandler.java b/src/main/java/com/hp/autonomy/frontend/find/authentication/LoginSuccessHandler.java
diff --git a/...n/java/com/hp/autonomy/frontend/find/authentication/SingleUserAuthenticationProvider.java b/...n/java/com/hp/autonomy/frontend/find/authentication/SingleUserAuthenticationProvider.java
diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml
@@ -43,6 +43,26 @@
         <security:intercept-url pattern="/api/config/**" access="ROLE_DEFAULT"/>
     </security:http>
 
+    <bean id="defaultLoginAuthenticationProvider" class="com.hp.autonomy.frontend.configuration.authentication.DefaultLoginAuthenticationProvider">
+        <constructor-arg ref="configFileService"/>
+        <constructor-arg value="ROLE_DEFAULT"/>
+    </bean>
+
+    <bean id="singleUserAuthenticationProvider" class="com.hp.autonomy.frontend.configuration.authentication.SingleUserAuthenticationProvider">
+        <constructor-arg ref="configFileService"/>
+        <constructor-arg value="ROLE_ADMIN"/>
+    </bean>
+
+    <bean id="loginSuccessHandler" class="com.hp.autonomy.frontend.configuration.authentication.LoginSuccessHandler">
+        <constructor-arg value="ROLE_DEFAULT"/>
+        <constructor-arg value="/config/"/>
+        <constructor-arg value="/p/"/>
+    </bean>
+
+    <bean id="findAccessDeniedHandler" class="com.hp.autonomy.frontend.configuration.authentication.FindAccessDeniedHandler">
+        <constructor-arg value="loginPage"/>
+    </bean>
+
     <security:http>
         <security:access-denied-handler ref="findAccessDeniedHandler"/>
         <security:intercept-url pattern="/p/**" access="ROLE_ADMIN"/>