You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jv...@apache.org on 2005/05/16 14:24:00 UTC
svn commit: r170370 - in /maven/continuum/trunk/continuum-web/src/main:
java/org/apache/maven/continuum/web/action/
java/org/apache/maven/continuum/web/pipeline/valve/
java/org/apache/maven/continuum/web/tool/
java/org/apache/maven/continuum/web/validation/ resources/META-INF/plexus/
Author: jvanzyl
Date: Mon May 16 05:23:59 2005
New Revision: 170370
URL: http://svn.apache.org/viewcvs?rev=170370&view=rev
Log: (empty)
Modified:
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextPopulatorValve.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java
maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.action;
+package org.apache.maven.continuum.web.action;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.action;
+package org.apache.maven.continuum.web.action;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -16,17 +16,14 @@
* limitations under the License.
*/
-import org.codehaus.plexus.summit.rundata.RunData;
+import ognl.Ognl;
import org.codehaus.plexus.action.AbstractAction;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import java.util.Map;
-import java.util.List;
-import java.util.Iterator;
import java.util.HashMap;
-
-import ognl.Ognl;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextPopulatorValve.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextPopulatorValve.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextPopulatorValve.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/ContinuumViewContextPopulatorValve.java Mon May 16 05:23:59 2005
@@ -21,12 +21,10 @@
import org.codehaus.plexus.summit.pipeline.valve.CreateViewContextValve;
import org.codehaus.plexus.summit.rundata.RunData;
import org.codehaus.plexus.summit.view.ViewContext;
-import org.codehaus.continuum.web.pipeline.valve.RequestParameterMap;
-import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Map;
import java.util.Iterator;
+import java.util.Map;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.tool;
+package org.apache.maven.continuum.web.tool;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -62,11 +62,11 @@
}
else if ( state == ContinuumProjectState.BUILDING )
{
- return "Updating";
+ return "Building";
}
else if ( state == ContinuumProjectState.UPDATING )
{
- return "Building";
+ return "Updating";
}
else if ( state == ContinuumProjectState.CHECKING_OUT )
{
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java Mon May 16 05:23:59 2005
@@ -1,4 +1,5 @@
-package org.codehaus.continuum.web.tool;
+package org.apache.maven.continuum.web.tool;
+
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.tool;
+package org.apache.maven.continuum.web.tool;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.tool;
+package org.apache.maven.continuum.web.tool;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.tool;
+package org.apache.maven.continuum.web.tool;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java Mon May 16 05:23:59 2005
@@ -1,4 +1,4 @@
-package org.codehaus.continuum.web.validation;
+package org.apache.maven.continuum.web.validation;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=170370&r1=170369&r2=170370&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml Mon May 16 05:23:59 2005
@@ -93,20 +93,20 @@
<component>
<role>datetool</role>
- <implementation>org.codehaus.continuum.web.tool.DateTool</implementation>
+ <implementation>org.apache.maven.continuum.web.tool.DateTool</implementation>
<configuration/>
</component>
<component>
<role>csstool</role>
- <implementation>org.codehaus.continuum.web.tool.CssTool</implementation>
+ <implementation>org.apache.maven.continuum.web.tool.CssTool</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
<configuration/>
</component>
<component>
<role>formicatool</role>
- <implementation>org.codehaus.continuum.web.tool.FormicaTool</implementation>
+ <implementation>org.apache.maven.continuum.web.tool.FormicaTool</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
<requirements>
<requirement>
@@ -216,7 +216,7 @@
<component>
<role>org.codehaus.plexus.action.Action</role>
<role-hint>cam</role-hint>
- <implementation>org.codehaus.continuum.web.action.CallApplicationModel</implementation>
+ <implementation>org.apache.maven.continuum.web.action.CallApplicationModel</implementation>
<configuration>
<application-role>org.apache.maven.continuum.Continuum</application-role>
<calls>
@@ -237,7 +237,7 @@
<component>
<role>org.codehaus.plexus.formica.validation.Validator</role>
<role-hint>scm-url</role-hint>
- <implementation>org.codehaus.continuum.web.validation.ScmUrlValidator</implementation>
+ <implementation>org.apache.maven.continuum.web.validation.ScmUrlValidator</implementation>
<requirements>
<requirement>
<role>org.apache.maven.scm.manager.ScmManager</role>
@@ -254,7 +254,7 @@
<component>
<role>org.codehaus.plexus.formica.web.ContentGenerator</role>
<role-hint>continuum-state</role-hint>
- <implementation>org.codehaus.continuum.web.tool.ContinuumStateContentGenerator</implementation>
+ <implementation>org.apache.maven.continuum.web.tool.ContinuumStateContentGenerator</implementation>
</component>
</components>