Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 20611 invoked from network); 16 Dec 2005 17:17:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Dec 2005 17:17:07 -0000 Received: (qmail 78389 invoked by uid 500); 16 Dec 2005 17:17:05 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 78371 invoked by uid 500); 16 Dec 2005 17:17:05 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 78360 invoked by uid 99); 16 Dec 2005 17:17:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2005 09:17:05 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 16 Dec 2005 09:17:04 -0800 Received: (qmail 20495 invoked by uid 65534); 16 Dec 2005 17:16:41 -0000 Message-ID: <20051216171640.20489.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r357186 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ resources/META-INF/plexus/ webapp/ webapp/WEB-INF/ webapp/decorators/ Date: Fri, 16 Dec 2005 17:15:57 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Dec 16 09:15:42 2005 New Revision: 357186 URL: http://svn.apache.org/viewcvs?rev=357186&view=rev Log: Prepare automatic redirection to continuum initialization page if it isn't configured Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (with props) maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp (with props) maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp (with props) Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java?rev=357186&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (added) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java Fri Dec 16 09:15:42 2005 @@ -0,0 +1,37 @@ +package org.apache.maven.continuum.web.action; + +/* + * Copyright 2004-2005 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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 com.opensymphony.xwork.ActionSupport; + +public class CheckConfigurationAction + extends ActionSupport +{ + private Continuum continuum; + + public String execute() + { + if ( !continuum.getConfiguration().isInitialized() ) + { + return INPUT; + } + + return SUCCESS; + } +} Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java?rev=357186&r1=357185&r2=357186&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/LoginAction.java Fri Dec 16 09:15:42 2005 @@ -17,7 +17,6 @@ */ import com.opensymphony.xwork.ActionSupport; -import org.codehaus.plexus.util.StringUtils; public class LoginAction extends ActionSupport Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml?rev=357186&r1=357185&r2=357186&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml Fri Dec 16 09:15:42 2005 @@ -8,6 +8,17 @@ com.opensymphony.xwork.Action + checkConfigurationAction + org.apache.maven.continuum.web.action.CheckConfigurationAction + per-lookup + + + org.apache.maven.continuum.Continuum + + + + + com.opensymphony.xwork.Action configurationAction org.apache.maven.continuum.web.action.ConfigurationAction per-lookup Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=357186&r1=357185&r2=357186&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Fri Dec 16 09:15:42 2005 @@ -23,6 +23,10 @@ + + /redirectToContinuumInitialization.jsp + configurationEdit.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml?rev=357186&r1=357185&r2=357186&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml Fri Dec 16 09:15:42 2005 @@ -1,7 +1,7 @@ - + + /initializeConfiguration* + /* Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp?rev=357186&r1=357185&r2=357186&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp Fri Dec 16 09:15:42 2005 @@ -1,7 +1,9 @@ <%@ taglib uri="sitemesh-decorator" prefix="decorator" %> <%@ taglib uri="webwork" prefix="ww" %> + + <decorator:title/> " media="screen" /> " media="print" /> @@ -32,4 +34,4 @@ - \ No newline at end of file + Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp?rev=357186&r1=357185&r2=357186&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp Fri Dec 16 09:15:42 2005 @@ -1,31 +1,32 @@ <%@ taglib uri="sitemesh-decorator" prefix="decorator" %> -<%@ taglib uri="webwork" prefix="ww" %> + <decorator:title/> - + " media="screen" /> + " media="print" /> + + - - - - - - - - - + + + +
- "/> -
-   - - -
+ + + + +
+
+
+ +
+
+
+ + - \ No newline at end of file + Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp?rev=357186&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp (added) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp Fri Dec 16 09:15:42 2005 @@ -0,0 +1,16 @@ +<%@ taglib uri="webwork" prefix="ww" %> + + + + <ww:text name="configuration.page.title"/> + + +
+

+ +
+
+
+ + + Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/initializeConfiguration.jsp ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp?rev=357186&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp (added) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp Fri Dec 16 09:15:42 2005 @@ -0,0 +1 @@ + \ No newline at end of file Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/redirectToContinuumInitialization.jsp ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision"