Return-Path: 
 <continuum-commits-return-291-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 33388 invoked from network); 6 Jun 2005 04:08:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Jun 2005 04:08:51 -0000
Received: (qmail 86956 invoked by uid 500); 6 Jun 2005 04:08:49 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 86861 invoked by uid 500); 6 Jun 2005 04:08:48 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 86545 invoked by uid 99); 6 Jun 2005 04:08:47 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 05 Jun 2005 21:08:44 -0700
Received: (qmail 33365 invoked by uid 65534); 6 Jun 2005 04:08:42 -0000
Message-ID: <20050606040842.33364.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r180208 -
 /maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store
 /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum
 /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action
 /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2
 /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store
 /maven/continuum/trunk/continuum-plexus-application
 /maven/continuum/trunk/continuum-web
 /maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve
 /maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus
 /maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts
 /maven/continuum/trunk/continuum-web/src/main/resources/templates/screens
Date: Mon, 06 Jun 2005 04:08:41 -0000
To: continuum-commits@maven.apache.org
From: jvanzyl@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jvanzyl
Date: Sun Jun  5 21:08:40 2005
New Revision: 180208

URL: http://svn.apache.org/viewcvs?rev=3D180208&view=3Drev
Log:
o altering continuum store to allow adding straight ContinuumProject's,
  something is not quite right with this. As I get a mismatch when trying t=
o=20
  do an insert.
 =20
o modified DefaultMavenBuilderHelper to populate the continuum project with
  groupId, url, testOutputDirectory and developers
 =20


Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/cont=
inuum/store/ContinuumStore.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/core/action/StoreProjectAction.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/store/ModelloJPoxContinuumStore.java
    maven/continuum/trunk/continuum-plexus-application/app.properties
    maven/continuum/trunk/continuum-web/pom.xml
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/cont=
inuum/web/pipeline/valve/LoginValve.java
    maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/=
components.xml
    maven/continuum/trunk/continuum-web/src/main/resources/templates/layout=
s/Index.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screen=
s/View.vm

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/mave=
n/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/=
main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=3D180208=
&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/cont=
inuum/store/ContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/cont=
inuum/store/ContinuumStore.java Sun Jun  5 21:08:40 2005
@@ -38,6 +38,9 @@
     // ContinuumProject
     // -------------------------------------------------------------------=
---
=20
+    String addProject( ContinuumProject project )
+        throws ContinuumStoreException;
+
     String addProject( String name,
                        String scmUrl,
                        String nagEmailAddress,

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav=
en/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src=
/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=3D180208&r1=
=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/DefaultContinuum.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/DefaultContinuum.java Sun Jun  5 21:08:40 2005
@@ -283,7 +283,49 @@
     public void addMavenOneProject( String metadataUrl )
         throws ContinuumException
     {
-        core.addProjectsFromUrl( metadataUrl, MavenOneContinuumProjectBuil=
der.ID );
+        Map context =3D new HashMap();
+
+        context.put( CreateProjectsFromMetadata.KEY_PROJECT_BUILDER_ID, Ma=
venOneContinuumProjectBuilder.ID );
+
+        context.put( CreateProjectsFromMetadata.KEY_URL, metadataUrl );
+
+        context.put( CreateProjectsFromMetadata.KEY_WORKING_DIRECTORY, cor=
e=2EgetWorkingDirectory() );
+
+        try
+        {
+            // -----------------------------------------------------------=
-----------
+            // During the execution of the this action we may find that th=
e metadata
+            // isn't good enough for the following reasons:
+            //
+            // 1) No scm element (repository element for m1)
+            // 2) Invalid scm element (repository element for m1)
+            // 3) No ciManagement (m2)
+            // 4) Invalid ciManagement element (m2)
+            // -----------------------------------------------------------=
-----------
+
+            actionManager.lookup( "create-projects-from-metadata" ).execut=
e( context );
+
+            ContinuumProjectBuildingResult result =3D (ContinuumProjectBui=
ldingResult) context.get( CreateProjectsFromMetadata.KEY_PROJECT_BUILDING_R=
ESULT );
+
+            List projects =3D result.getProjects();
+
+            for ( Iterator i =3D projects.iterator(); i.hasNext(); )
+            {
+                ContinuumProject project =3D (ContinuumProject) i.next();
+
+                context.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJE=
CT, project );
+
+                actionManager.lookup( "validate-project" ).execute( contex=
t );
+
+                actionManager.lookup( "store-project" ).execute( context );
+
+                actionManager.lookup( "add-project-to-checkout-queue" ).ex=
ecute( context );
+            }
+        }
+        catch ( Exception e )
+        {
+            throw new ContinuumException( "Error adding m1 project: ", e );
+        }
     }
=20
     public void addMavenOneProject( MavenOneProject project )
@@ -293,13 +335,26 @@
=20
         configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOA=
LS, project.getGoals() );
=20
-        core.addProjectFromScm( project.getScmUrl(),
-                                MavenOneBuildExecutor.ID,
-                                project.getName(),
-                                project.getNagEmailAddress(),
-                                project.getVersion(),
-                                project.getCommandLineArguments(),
-                                configuration );
+        // ---------------------------------------------------------------=
-------
+        //
+        // ---------------------------------------------------------------=
-------
+
+        Map context =3D new HashMap();
+
+        context.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJECT, proj=
ect );
+
+        try
+        {
+            actionManager.lookup( "validate-project" ).execute( context );
+
+            actionManager.lookup( "store-project" ).execute( context );
+
+            actionManager.lookup( "add-project-to-checkout-queue" ).execut=
e( context );
+        }
+        catch ( Exception e )
+        {
+            throw new ContinuumException( "Error adding m1 project: ", e );
+        }
     }
=20
     public MavenOneProject getMavenOneProject( String id )
@@ -383,17 +438,32 @@
     public void addMavenTwoProject( MavenTwoProject project )
         throws ContinuumException
     {
+        //TODO: these need to go away
+
         Properties configuration =3D new Properties();
=20
         configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOA=
LS, project.getGoals() );
=20
-        core.addProjectFromScm( project.getScmUrl(),
-                                MavenTwoBuildExecutor.ID,
-                                project.getName(),
-                                project.getNagEmailAddress(),
-                                project.getVersion(),
-                                project.getCommandLineArguments(),
-                                configuration );
+        // ---------------------------------------------------------------=
-------
+        //
+        // ---------------------------------------------------------------=
-------
+
+        Map context =3D new HashMap();
+
+        context.put( AbstractContinuumAction.KEY_UNVALIDATED_PROJECT, proj=
ect );
+
+        try
+        {
+            actionManager.lookup( "validate-project" ).execute( context );
+
+            actionManager.lookup( "store-project" ).execute( context );
+
+            actionManager.lookup( "add-project-to-checkout-queue" ).execut=
e( context );
+        }
+        catch ( Exception e )
+        {
+            throw new ContinuumException( "Error adding m2 project: ", e );
+        }
     }
=20
     public MavenTwoProject getMavenTwoProject( String id )

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav=
en/continuum/core/action/StoreProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src=
/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?r=
ev=3D180208&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/core/action/StoreProjectAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/core/action/StoreProjectAction.java Sun Jun  5 21:08:40 2005
@@ -27,7 +27,9 @@
         //
         // ---------------------------------------------------------------=
-------
=20
+        String projectId =3D getStore().addProject( project );
=20
+        /*
         String projectId =3D getStore().addProject( project.getName(),
                                                   project.getScmUrl(),
                                                   project.getNagEmailAddre=
ss(),
@@ -36,8 +38,7 @@
                                                   project.getExecutorId(),
                                                   null,
                                                   project.getConfiguration=
() );
-
-        System.out.println( "projectId =3D " + projectId );
+        */
=20
         context.put( KEY_PROJECT_ID, projectId );
=20
@@ -57,7 +58,7 @@
         // figure out what it is.
=20
         project.setWorkingDirectory( projectWorkingDirectory.getAbsolutePa=
th() );
-       =20
+
         getStore().setWorkingDirectory( projectId, projectWorkingDirectory=
.getAbsolutePath() );
     }
 }

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav=
en/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src=
/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilde=
rHelper.java?rev=3D180208&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/execution/maven/m2/DefaultMavenBuilderHelper.java Sun Jun  5 21:08:4=
0 2005
@@ -24,10 +24,12 @@
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayou=
t;
 import org.apache.maven.continuum.project.ContinuumProject;
+import org.apache.maven.continuum.project.ContinuumDeveloper;
 import org.apache.maven.model.CiManagement;
 import org.apache.maven.model.Notifier;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.Scm;
+import org.apache.maven.model.Developer;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.settings.MavenSettingsBuilder;
@@ -43,6 +45,8 @@
     extends AbstractLogEnabled
     implements MavenBuilderHelper
 {
+    public static final String DEFAULT_TEST_OUTPUT_DIRECTORY =3D "target/s=
urefire-reports";
+
     /** @requirement */
     private MavenProjectBuilder projectBuilder;
=20
@@ -88,6 +92,56 @@
         if ( StringUtils.isEmpty( configuration.getProperty( MavenTwoBuild=
Executor.CONFIGURATION_GOALS ) ) )
         {
             configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION=
_GOALS, "clean:clean install" );
+        }
+
+        // ---------------------------------------------------------------=
-------
+        // Group
+        // ---------------------------------------------------------------=
-------
+
+        System.out.println( "mavenProject.getGroupId() =3D " + mavenProjec=
t=2EgetGroupId() );
+
+        if ( mavenProject.getGroupId() !=3D null )
+        {
+           continuumProject.setGroupId( mavenProject.getGroupId() );
+        }
+
+        // ---------------------------------------------------------------=
-------
+        // Project Url
+        // ---------------------------------------------------------------=
-------
+
+        System.out.println( "mavenProject.getUrl() =3D " + mavenProject.ge=
tUrl() );
+
+        if ( mavenProject.getUrl() !=3D null )
+        {
+           continuumProject.setUrl( mavenProject.getUrl() );
+        }
+
+        // ---------------------------------------------------------------=
-------
+        // Test output directory
+        // ---------------------------------------------------------------=
-------
+
+        continuumProject.setTestOutputDirectory( DEFAULT_TEST_OUTPUT_DIREC=
TORY );
+
+        // ---------------------------------------------------------------=
-------
+        //
+        // ---------------------------------------------------------------=
-------
+
+        if ( mavenProject.getDevelopers() !=3D null )
+        {
+            for ( Iterator i =3D mavenProject.getDevelopers().iterator(); =
i=2EhasNext(); )
+            {
+                Developer d =3D (Developer) i.next();
+
+                ContinuumDeveloper cd =3D new ContinuumDeveloper();
+
+                cd.setId( d.getId() );
+
+                cd.setName( d.getName() );
+
+                cd.setEmail( d.getEmail() );
+
+                continuumProject.addDeveloper( cd );
+            }
         }
     }
=20

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/mav=
en/continuum/store/ModelloJPoxContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src=
/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java?=
rev=3D180208&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/store/ModelloJPoxContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/con=
tinuum/store/ModelloJPoxContinuumStore.java Sun Jun  5 21:08:40 2005
@@ -81,6 +81,24 @@
     // ContinuumProject
     // -------------------------------------------------------------------=
---
=20
+    public String addProject( ContinuumProject project )
+        throws ContinuumStoreException
+    {
+        try
+        {
+            Object id =3D store.addContinuumProject( project );
+
+            project =3D store.getContinuumProjectByJdoId( id, true );
+        }
+        catch ( Exception e )
+        {
+            throw new ContinuumStoreException( "Error while adding a proje=
ct.", e );
+        }
+
+        return project.getId();
+    }
+
+
     public String addProject( String name,
                               String scmUrl,
                               String nagEmailAddress,

Modified: maven/continuum/trunk/continuum-plexus-application/app.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-a=
pplication/app.properties?rev=3D180208&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-plexus-application/app.properties (orig=
inal)
+++ maven/continuum/trunk/continuum-plexus-application/app.properties Sun J=
un  5 21:08:40 2005
@@ -21,18 +21,18 @@
 # Development properties
 # ----------------------------------------------------------
=20
-#localization.directory=3D${plexus.home}/../../../../../continuum-web/src/=
main/resources/localization
-#velocity.templates.directory=3D${plexus.home}/../../../../../continuum-we=
b/src/main/resources/templates
-#velocimacro.reload =3D true
-#forms.directory=3D${plexus.home}/../../../../../continuum-web/src/main/re=
sources/forms
-#jetty.port=3D8080
+localization.directory=3D${plexus.home}/../../../../../continuum-web/src/m=
ain/resources/localization
+velocity.templates.directory=3D${plexus.home}/../../../../../continuum-web=
/src/main/resources/templates
+velocimacro.reload =3D true
+forms.directory=3D${plexus.home}/../../../../../continuum-web/src/main/res=
ources/forms
+jetty.port=3D8080
=20
 # ----------------------------------------------------------
 # Production properties
 # ----------------------------------------------------------
=20
-localization.directory=3D${plexus.home}/webapp/localization
-velocity.templates.directory=3D${plexus.home}/webapp/templates
-velocimacro.reload =3D false
-forms.directory=3D${plexus.home}/webapp/forms
-jetty.port=3D8080
+#localization.directory=3D${plexus.home}/webapp/localization
+#velocity.templates.directory=3D${plexus.home}/webapp/templates
+#velocimacro.reload =3D false
+#forms.directory=3D${plexus.home}/webapp/forms
+#jetty.port=3D8080

Modified: maven/continuum/trunk/continuum-web/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/pom.=
xml?rev=3D180208&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-web/pom.xml (original)
+++ maven/continuum/trunk/continuum-web/pom.xml Sun Jun  5 21:08:40 2005
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-summit</artifactId>
-      <version>1.0-beta-4</version>
+      <version>1.0-beta-5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/mave=
n/continuum/web/pipeline/valve/LoginValve.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/=
main/java/org/apache/maven/continuum/web/pipeline/valve/LoginValve.java?rev=
=3D180208&r1=3D180207&r2=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/cont=
inuum/web/pipeline/valve/LoginValve.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/cont=
inuum/web/pipeline/valve/LoginValve.java Sun Jun  5 21:08:40 2005
@@ -20,17 +20,18 @@
=20
 import org.codehaus.plexus.summit.exception.SummitException;
 import org.codehaus.plexus.summit.pipeline.valve.AbstractValve;
+import org.codehaus.plexus.summit.pipeline.valve.ValveInvocationException;
 import org.codehaus.plexus.summit.rundata.RunData;
=20
 /**
  * @author <a href=3D"mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: LoginValve.java,v 1.1 2005/04/04 14:05:38 jvanzyl Exp $
+ * @version $Id$
  */
 public class LoginValve
     extends AbstractValve
 {
     public void invoke( RunData data )
-        throws IOException, SummitException
+        throws IOException, ValveInvocationException
     {
         String skip =3D data.getRequest().getParameter( "skipLogin" );
=20

Modified: maven/continuum/trunk/continuum-web/src/main/resources/META-INF/p=
lexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/=
main/resources/META-INF/plexus/components.xml?rev=3D180208&r1=3D180207&r2=
=3D180208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 Sun Jun  5 21:08:40 2005
@@ -28,12 +28,13 @@
       <implementation>org.codehaus.plexus.summit.pipeline.SummitPipeline</=
implementation>
       <lifecycle-handler>plexus-configurable</lifecycle-handler>
       <configuration>
+        <nocache>true</nocache>
         <valves>
           <valve>org.apache.maven.continuum.web.pipeline.valve.ContinuumVi=
ewContextValve</valve>
           <!--
           <valve>org.apache.maven.continuum.web.pipeline.valve.LoginValve<=
/valve>
           -->
-          <valve>org.codehaus.plexus.action.web.ActionValve</valve>
+          <valve>org.codehaus.plexus.summit.pipeline.valve.ActionValve</va=
lve>
           <valve>org.codehaus.plexus.summit.pipeline.valve.DetermineTarget=
Valve</valve>
           <valve>org.apache.maven.continuum.web.pipeline.valve.ContinuumVi=
ewContextPopulatorValve</valve>
           <valve>org.codehaus.plexus.summit.pipeline.valve.ResolverValve</=
valve>
@@ -60,6 +61,11 @@
             <scope>request</scope>
           </tool>
           <tool>
+            <name>page</name>
+            <role>pagetool</role>
+            <scope>request</scope>
+          </tool>
+          <tool>
             <name>css</name>
             <role>csstool</role>
             <scope>request</scope>
@@ -88,8 +94,6 @@
         </tools>
       </configuration>
     </component>
-
-
=20
     <component>
       <role>datetool</role>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/=
layouts/Index.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/=
main/resources/templates/layouts/Index.vm?rev=3D180208&r1=3D180207&r2=3D180=
208&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/layout=
s/Index.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/layout=
s/Index.vm Sun Jun  5 21:08:40 2005
@@ -2,12 +2,7 @@
=20
 <html>
 <head>
-#if( $project.name )
-  <title>Continuum - $project.name</title>
-#else
-  <title>Continuum</title>
-#end
-
+  <title>$page.title</title>
   <link rel=3D"stylesheet" type=3D"text/css" href=3D"$data.getLink("css/ti=
gris.css")" media=3D"screen" />
   <link rel=3D"stylesheet" type=3D"text/css" href=3D"$data.getLink("css/pr=
int.css")" media=3D"print" />
=20

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/=
screens/View.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/=
main/resources/templates/screens/View.vm?rev=3D180208&r1=3D180207&r2=3D1802=
08&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screen=
s/View.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screen=
s/View.vm Sun Jun  5 21:08:40 2005
@@ -18,5 +18,24 @@
       </table>
       #bar()
     </div>
+
+    $item.url
+    $item.groupId
+   =20
+
+    <h3>$i18n.getString( $form.view.titleKey )</h3>
+    <div class=3D"axial">
+      <table border=3D"1" cellspacing=3D"2" cellpadding=3D"3" width=3D"100=
%">
+        #foreach ( $developer in $item.developers )
+        <tr class=3D"b">
+          $developer.name
+          <th>$i18n.getString( $element.labelKey )</th>
+          <td>$formtool.getItem( $form, $element, $item )</td>
+        </tr>
+        #end
+      </table>
+      #bar()
+    </div>
+
   </div>
 </div>