continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r365927 - in /maven/continuum/trunk/continuum-webapp: ./ src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/secure/
Date Wed, 04 Jan 2006 15:50:29 GMT
Author: evenisse
Date: Wed Jan  4 07:50:22 2006
New Revision: 365927

URL: http://svn.apache.org/viewcvs?rev=365927&view=rev
Log:
Rollback acegisecurity feature, we'll try to use osuser

Removed:
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/logoff.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/secure/
Modified:
    maven/continuum/trunk/continuum-webapp/   (props changed)
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/   (props changed)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/login.jsp

Propchange: maven/continuum/trunk/continuum-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan  4 07:50:22 2006
@@ -1,2 +1 @@
 target
-.wtpmodules

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/pom.xml?rev=365927&r1=365926&r2=365927&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Wed Jan  4 07:50:22 2006
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project>
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
@@ -89,12 +84,6 @@
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
       <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.acegisecurity</groupId>
-      <artifactId>acegi-security</artifactId>
-      <version>1.0.0-RC1</version>
-      <scope>runtime</scope>
     </dependency>
   </dependencies>
 </project>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
            ('svn:ignore' removed)

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=365927&r1=365926&r2=365927&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Wed Jan  4 07:50:22
2006
@@ -6,18 +6,7 @@
 
 <web-app>
 
-  <display-name>Continuum</display-name>
-
-  <!--
-    - Location of the XML file that defines the root application context
-    - Applied by ContextLoaderListener.
-    -->
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>
-      /WEB-INF/applicationContext-acegi-security.xml
-    </param-value>
-  </context-param>
+  <display-name>Test Web App</display-name>
 
   <context-param>
     <param-name>extremecomponentsResourceBundleLocation</param-name>
@@ -45,29 +34,6 @@
   <listener>
     <listener-class>org.codehaus.plexus.webwork.servlet.PlexusWebWorkSessionLifecycleListener</listener-class>
   </listener>
-
-  <!--
-    - Loads the root application context of this web app at startup.
-    - The application context is then available via 
-    - WebApplicationContextUtils.getWebApplicationContext(servletContext).
-    -->
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-
-  <filter>
-    <filter-name>Acegi Filter Chain Proxy</filter-name>
-    <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
-    <init-param>
-      <param-name>targetClass</param-name>
-      <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>Acegi Filter Chain Proxy</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
 
   <servlet>
     <servlet-name>webwork</servlet-name>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/login.jsp?rev=365927&r1=365926&r2=365927&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/login.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/login.jsp Wed Jan  4 07:50:22 2006
@@ -7,12 +7,9 @@
     <body>
       <div id="axial" class="h3">
         <h3><ww:text name="login.section.title"/></h3>
-
-        <%-- TODO check parameter login_error, when = 1 means that there was an error
--%>
-
-        <ww:form action="j_acegi_security_check" method="post">
-            <ww:textfield label="%{getText('login.username')}" name="j_username"/>
-            <ww:password label="%{getText('login.password')}" name="j_password"/>
+        <ww:form action="login" method="post">
+            <ww:textfield label="%{getText('login.username')}" name="username"/>
+            <ww:password label="%{getText('login.password')}" name="password"/>
             <ww:submit value="%{getText('login.submit')}"/>
         </ww:form>
       </div>



Mime
View raw message