continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r431508 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java resources/xwork.xml
Date Tue, 15 Aug 2006 03:20:18 GMT
Author: carlos
Date: Mon Aug 14 20:20:18 2006
New Revision: 431508

URL: http://svn.apache.org/viewvc?rev=431508&view=rev
Log:
Remove continuum initialization from Action, won't work with security

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=431508&r1=431507&r2=431508&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
Mon Aug 14 20:20:18 2006
@@ -1,11 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.initialization.ContinuumInitializationException;
-import com.opensymphony.xwork.Preparable;
 /*
- * Copyright 2005 The Codehaus.
+ * Copyright 2005-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +14,20 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.initialization.ContinuumInitializationException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
+import com.opensymphony.xwork.Preparable;
+
 /**
- * ContinuumActionSupport:
+ * ContinuumActionSupport
  *
- * @author: Jesse McConnell <jesse@codehaus.org>
- * @version: $ID:$
+ * @author Jesse McConnell <jesse@codehaus.org>
+ * @version $Id$
  */
 public class ContinuumActionSupport
     extends PlexusActionSupport
@@ -35,17 +38,11 @@
      * @plexus.requirement
      */
     protected Continuum continuum;
-    
+
     public void prepare()
         throws Exception
     {
-        getLogger().info("checking the continuum configuration");
-        
-        if ( !continuum.getConfiguration().isInitialized() )
-        {
-            throw new ContinuumInitializationException( "continuum not initialized" );
-        }
-
+        // do nothing
     }
 
     public Continuum getContinuum()

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml?rev=431508&r1=431507&r2=431508&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
Mon Aug 14 20:20:18 2006
@@ -26,11 +26,9 @@
 
     <global-results>
       <result name="internalError" type="redirect">/error.jsp</result>
-      <result name="continuumInitialization" type="redirect">/configuration!input.action</result>
     </global-results>
 
     <global-exception-mappings>
-      <exception-mapping exception="org.apache.maven.continuum.initialization.ContinuumInitializationException"
result="continuumInitialization"/>
       <exception-mapping exception="java.lang.Exception" result="internalError"/>
     </global-exception-mappings>
 



Mime
View raw message