continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r438620 - in /maven/continuum/branches/continuum-acegi: ./ continuum-api/src/main/java/org/apache/maven/continuum/execution/ continuum-core/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/main/java/o...
Date Wed, 30 Aug 2006 20:53:42 GMT
Author: carlos
Date: Wed Aug 30 13:53:39 2006
New Revision: 438620

URL: http://svn.apache.org/viewvc?rev=438620&view=rev
Log:
Merged rev# 437058-438596 from trunk

Added:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
      - copied unchanged from r438596, maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/surefireReport.jsp
      - copied unchanged from r438596, maven/continuum/trunk/continuum-webapp/src/main/webapp/surefireReport.jsp
Modified:
    maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
    maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
    maven/continuum/branches/continuum-acegi/continuum-model/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo
    maven/continuum/branches/continuum-acegi/continuum-sandbox/continuum-python/continuum.py
    maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
    maven/continuum/branches/continuum-acegi/continuum-test/pom.xml
    maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
    maven/continuum/branches/continuum-acegi/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
    maven/continuum/branches/continuum-acegi/continuum-webapp/   (props changed)
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResult.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/failureComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/groupSummary.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp
    maven/continuum/branches/continuum-acegi/pom.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java Wed Aug 30 13:53:39 2006
@@ -18,6 +18,7 @@
 
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.scm.TestResult;
 
 import java.io.File;
 import java.util.List;
@@ -41,5 +42,8 @@
     void killProcess( Project project );
 
     List getDeployableArtifacts( File workingDirectory, BuildDefinition buildDefinition )
+        throws ContinuumBuildExecutorException;
+
+    TestResult getTestResults(Project project)
         throws ContinuumBuildExecutorException;
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/pom.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/pom.xml Wed Aug 30 13:53:39 2006
@@ -137,7 +137,7 @@
       <version>1.0-alpha-3</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.continuum.jpox</groupId>
+      <groupId>jpox</groupId>
       <artifactId>jpox</artifactId>
     </dependency>
     <dependency>

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Wed Aug 30 13:53:39 2006
@@ -24,6 +24,7 @@
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.scm.ScmResult;
+import org.apache.maven.continuum.model.scm.TestResult;
 import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.store.ContinuumStore;
@@ -162,9 +163,20 @@
             project.setState( build.getState() );
 
             // ----------------------------------------------------------------------
-            // Copy over the build result
+            // Set the test result
             // ----------------------------------------------------------------------
 
+             try {
+                 TestResult testResult = buildExecutor.getTestResults( project );
+                 build.setTestResult(testResult);
+            } catch (Throwable t) {
+                getLogger().error("Error getting test results", t);
+            }
+
+            // ----------------------------------------------------------------------
+            // Copy over the build result
+            // ----------------------------------------------------------------------
+                                                          
             store.updateBuildResult( build );
 
             build = store.getBuildResult( build.getId() );

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Wed Aug 30 13:53:39 2006
@@ -18,6 +18,8 @@
 
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.project.BuildDefinition;
+import org.apache.maven.continuum.model.scm.TestResult;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
 import org.apache.maven.continuum.utils.shell.ExecutionResult;
 import org.apache.maven.continuum.utils.shell.ShellCommandHelper;
@@ -217,5 +219,10 @@
     public File getWorkingDirectory( Project project )
     {
         return workingDirectoryService.getWorkingDirectory( project );
+    }
+
+    public TestResult getTestResults(Project project)
+            throws ContinuumBuildExecutorException {
+        return null;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Wed Aug 30 13:53:39 2006
@@ -27,11 +27,21 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
+import org.apache.maven.continuum.model.scm.TestResult;
+import org.apache.maven.continuum.model.scm.SuiteResult;
+import org.apache.maven.continuum.model.scm.TestCaseFailure;
 import org.codehaus.plexus.util.StringUtils;
-
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.xml.pull.XmlPullParser;
+import org.codehaus.plexus.util.xml.pull.MXParser;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+  
 import java.io.File;
+import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.IOException;
+import java.io.FileNotFoundException;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -241,5 +251,94 @@
         }
 
         return artifacts;
+    }
+
+    public TestResult getTestResults(Project project)
+            throws ContinuumBuildExecutorException {
+        return getTestResults(getWorkingDirectory(project));
+    }
+
+    private TestResult getTestResults(File workingDir)
+            throws ContinuumBuildExecutorException {
+        DirectoryScanner scanner = new DirectoryScanner();
+        scanner.setBasedir(workingDir);
+        scanner.setIncludes(new String[] {
+                "**/target/surefire-reports/TEST-*.xml",
+                "**/target/surefire-it-reports/TEST-*.xml"
+        });
+        scanner.scan();
+
+        TestResult testResult = new TestResult();
+        int testCount = 0;
+        int failureCount = 0;
+        int totalTime = 0;
+        String[] testResultFiles = scanner.getIncludedFiles();
+        for (int i = 0; i < testResultFiles.length; i++) {
+            File xmlFile = new File(workingDir, testResultFiles[i]);
+            SuiteResult suite = new SuiteResult();
+            try {
+                XmlPullParser parser = new MXParser();
+                parser.setInput(new FileReader(xmlFile));
+                if (parser.next() != XmlPullParser.START_TAG || !"testsuite".equals(parser.getName())) {
+                    continue;
+                }
+
+                suite.setName(parser.getAttributeValue(null, "name"));
+
+                int suiteFailureCount =
+                        Integer.parseInt(parser.getAttributeValue(null, "errors")) +
+                        Integer.parseInt(parser.getAttributeValue(null, "failures"));
+
+                long suiteTotalTime =
+                        (long) (1000 * Double.parseDouble(parser.getAttributeValue(null, "time")));
+
+                // TODO: add tests attribute to testsuite element so we only
+                // have to parse the rest of the file if there are failures
+                int suiteTestCount = 0;
+                while (!(parser.next() == XmlPullParser.END_TAG && "testsuite".equals(parser.getName()))) {
+                    if (parser.getEventType() == XmlPullParser.START_TAG && "testcase".equals(parser.getName())) {
+                        suiteTestCount++;
+                        String name = parser.getAttributeValue(null, "name");
+                        do {
+                            parser.next();
+                        } while (parser.getEventType() != XmlPullParser.START_TAG &&
+                                 parser.getEventType() != XmlPullParser.END_TAG);
+                        if (parser.getEventType() == XmlPullParser.START_TAG &&
+                                ("error".equals(parser.getName()) || "failure".equals(parser.getName()))) {
+                            TestCaseFailure failure = new TestCaseFailure();
+                            failure.setName(name);
+                            if (parser.next() == XmlPullParser.TEXT) {
+                                failure.setException(parser.getText());
+                            }
+                            suite.addFailure(failure);
+                        }
+                    }
+                }
+
+                testCount += suiteTestCount;
+                failureCount += suiteFailureCount;
+                totalTime += suiteTotalTime;
+
+                suite.setTestCount(suiteTestCount);
+                suite.setFailureCount(suiteFailureCount);
+                suite.setTotalTime(suiteTotalTime);
+            } catch (XmlPullParserException xppex) {
+                throw new ContinuumBuildExecutorException(
+                        "Error parsing file: " + xmlFile, xppex);
+            } catch (FileNotFoundException fnfex) {
+                throw new ContinuumBuildExecutorException(
+                        "Test file not found", fnfex);
+            } catch (IOException ioex) {
+                throw new ContinuumBuildExecutorException(
+                        "Parsing error for file: " + xmlFile, ioex);
+            }
+            testResult.addSuiteResult(suite);
+        }
+
+        testResult.setTestCount(testCount);
+        testResult.setFailureCount(failureCount);
+        testResult.setTotalTime(totalTime);
+
+        return testResult;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java Wed Aug 30 13:53:39 2006
@@ -84,6 +84,9 @@
 
     public String formatTimestamp( long timestamp )
     {
+        if (timestamp <= 0) {
+            return null;
+        }
         return getSimpleDateFormat( timestampFormat, timestampFormatString ).format( new Date( timestamp ) );
     }
 
@@ -132,5 +135,12 @@
         }
 
         return dateFormat;
+    }
+
+    public String trim(String str) {
+        if (str == null) {
+            return "";
+        }
+        return str.trim();
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/utils/DefaultWorkingDirectoryService.java Wed Aug 30 13:53:39 2006
@@ -47,6 +47,18 @@
 //        return new File( projectGroup.getWorkingDirectory(),
 //                         project.getPath() );
 
-        return new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );
+        File workDir;
+        if ( project.getWorkingDirectory() == null )
+        {
+           workDir  = new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );
+
+           project.setWorkingDirectory( workDir.getAbsolutePath() );
+        }
+        else
+        {
+            workDir = new File( project.getWorkingDirectory() );
+        }
+
+        return workDir;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original)
+++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Wed Aug 30 13:53:39 2006
@@ -32,26 +32,69 @@
   Java version : $javaVersion
 
 #if ( $build.scmResult )
-Changes
-  #if ( $build.scmResult.changes.size() == 0 )
-    No files changed
-  #else
-  #foreach ( $changeSet in $build.scmResult.changes )
-    #if ($changeSet.author) $changeSet.author #end
-    #if ($changeSet.date > 0) $date.format('medium',$changeSet.date) #end
-    #if ($changeSet.comment) $changeSet.comment #end
-    #foreach ( $file in $changeSet.files )
-        $!file.name
-    #end
-  #end
-  #end
+****************************************************************************
+Changes:
+****************************************************************************
+#if ( $build.scmResult.changes.size() == 0 )
+No files changed
+
+#else
+#foreach ( $changeSet in $build.scmResult.changes )
+#if ($changeSet.author)
+#set($author = $changeSet.author)
+#else
+#set($author = "no author")
+#end
+#set($date = $formatter.formatTimestamp($changeSet.date))
+#if (!$date)
+#set($date = "no date")
+#end
+#if ($changeSet.comment)
+#set($comment = $formatter.trim($changeSet.comment))
+#else
+#set($comment = "no comment")
+#end
+Changed: $author @ $date
+Comment: $comment
+Files changed:
+#foreach ( $file in $changeSet.files )
+  $!file.name (#if ($file.revision) $file.revision #else no revision #end)
+#end
+
+#end
+#end
 #end
+#if ( $build.testResult )
+****************************************************************************
+Test Summary:
+****************************************************************************
+Tests: $build.testResult.testCount
+Failures: $build.testResult.failureCount
+Total time: $build.testResult.totalTime
 
+#end
 #if ( $build.state == 4 )
 ****************************************************************************
 Build Error:
 ****************************************************************************
 $build.error
+
+#if ( $build.testResult && $build.testResult.failureCount > 0)
+****************************************************************************
+Test Failures:
+****************************************************************************
+
+#foreach( $suite in $build.testResult.suiteResults )
+#if ( $suite.failureCount > 0)
+$suite.name
+  #foreach( $failure in $suite.failures )
+  $failure.name
+  $failure.exception
+
+  #end
+#end
+#end
+#end
 #else
 ****************************************************************************
 Output:

Modified: maven/continuum/branches/continuum-acegi/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-model/pom.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-model/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-model/pom.xml Wed Aug 30 13:53:39 2006
@@ -34,7 +34,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jpox-maven-plugin</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

Modified: maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo (original)
+++ maven/continuum/branches/continuum-acegi/continuum-model/src/main/mdo/continuum.mdo Wed Aug 30 13:53:39 2006
@@ -441,6 +441,13 @@
             <type>ScmResult</type>
           </association>
         </field>
+        <field jpox.fetchGroupNames="build-result-with-details">
+          <name>testResult</name>
+          <version>1.0.0+</version>
+          <association>
+            <type>TestResult</type>
+          </association>
+        </field>
       </fields>
     </class>
 
@@ -618,6 +625,91 @@
           ]]></code>
         </codeSegment>
       </codeSegments>
+    </class>
+
+    <class>
+      <name>TestResult</name>
+      <packageName>org.apache.maven.continuum.model.scm</packageName>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>testCount</name>
+          <version>1.0.0+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>failureCount</name>
+          <version>1.0.0+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>totalTime</name>
+          <version>1.0.0+</version>
+          <type>long</type>
+        </field>
+        <field>
+          <name>suiteResults</name>
+          <version>1.0.0+</version>
+          <association stash.part="true" jpox.join="false">
+            <type>SuiteResult</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>SuiteResult</name>
+      <packageName>org.apache.maven.continuum.model.scm</packageName>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>name</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>testCount</name>
+          <version>1.0.0+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>failureCount</name>
+          <version>1.0.0+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>totalTime</name>
+          <version>1.0.0+</version>
+          <type>long</type>
+        </field>
+        <field>
+          <name>failures</name>
+          <version>1.0.0+</version>
+          <association stash.part="true" jpox.join="false">
+            <type>TestCaseFailure</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+
+    <class>
+      <name>TestCaseFailure</name>
+      <packageName>org.apache.maven.continuum.model.scm</packageName>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>name</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+        </field>
+        <field stash.maxSize="8192">
+          <name>exception</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+        </field>
+      </fields>
     </class>
 
     <class>

Modified: maven/continuum/branches/continuum-acegi/continuum-sandbox/continuum-python/continuum.py
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-sandbox/continuum-python/continuum.py?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-sandbox/continuum-python/continuum.py (original)
+++ maven/continuum/branches/continuum-acegi/continuum-sandbox/continuum-python/continuum.py Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 import os
-from time import strftime, gmtime
+from time import strftime, localtime
 import xmlrpclib
 
 class XmlRpcException:
@@ -327,10 +327,10 @@
         map[ "totalTime" ] = int( map[ "endTime" ] )/ 1000 - int( map[ "startTime" ] ) / 1000
 
         self.id = map[ "id" ]
+        self.state = int( map[ "state" ] )
         self.buildNumber = map[ "buildNumber" ]
-        if self.buildNumber == '0':
+        if ( self.state != Continuum.STATE_OK ):
             self.buildNumber = ''
-        self.state = int( map[ "state" ] )
         if ( map.has_key( "trigger" ) ):
             self.forced = map[ "trigger" ] == Continuum.TRIGGER_FORCED
             self.trigger = int( map[ "trigger" ] )
@@ -338,8 +338,8 @@
             self.forced = False
             self.trigger = 0
 
-        self.startTime = gmtime( int( map[ "startTime" ] ) / 1000 )
-        self.endTime = gmtime( int( map[ "endTime" ] ) / 1000 )
+        self.startTime = localtime( int( map[ "startTime" ] ) / 1000 )
+        self.endTime = localtime( int( map[ "endTime" ] ) / 1000 )
         self.totalTime = map[ "totalTime" ]
         self.error = map.get( "error" )
         self.map = map
@@ -412,7 +412,7 @@
         self.map = map
         self.author = map[ "author" ]
         self.comment = map[ "comment" ]
-        self.date = gmtime( int( map[ "date" ] ) / 1000 )
+        self.date = localtime( int( map[ "date" ] ) / 1000 )
 
         self.files = list()
         for f in map[ "files" ]:

Modified: maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/resources/META-INF/plexus/components.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/resources/META-INF/plexus/components.xml Wed Aug 30 13:53:39 2006
@@ -3,7 +3,7 @@
 
     <component>
       <role>org.apache.maven.continuum.Continuum</role>
-      <role-hint>acegi</role-hint>
+      <!-- <role-hint>acegi</role-hint> -->
       <implementation>org.apache.maven.continuum.security.acegi.AcegiContinuum</implementation>
       <requirements>
         <requirement>

Modified: maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-store/src/test/java/org/apache/maven/continuum/store/ContinuumStoreTest.java Wed Aug 30 13:53:39 2006
@@ -1781,7 +1781,7 @@
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/META-INF/package.jdo" )}, false );
+        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/META-INF/package.jdo" )}, null, false );
 
         PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory();
 

Modified: maven/continuum/branches/continuum-acegi/continuum-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-test/pom.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-test/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-test/pom.xml Wed Aug 30 13:53:39 2006
@@ -22,7 +22,7 @@
       <artifactId>plexus-jdo2</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.continuum.jpox</groupId>
+      <groupId>jpox</groupId>
       <artifactId>jpox-enhancer</artifactId>
     </dependency>
     <dependency>

Modified: maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-test/src/main/java/org/apache/maven/continuum/AbstractContinuumTest.java Wed Aug 30 13:53:39 2006
@@ -129,7 +129,7 @@
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/META-INF/package.jdo" )}, false );
+        SchemaTool.createSchemaTables( new URL[]{getClass().getResource( "/META-INF/package.jdo" )}, null, false );
 
         // ----------------------------------------------------------------------
         // Check the configuration

Modified: maven/continuum/branches/continuum-acegi/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm (original)
+++ maven/continuum/branches/continuum-acegi/continuum-web/src/main/resources/templates/screens/ProjectBuild.vm Wed Aug 30 13:53:39 2006
@@ -61,9 +61,9 @@
         <td>$state.generate($build)</td>
       </tr>
       <tr class="b">
-        <th>Build#</th>
+        <th>Build #</th>
         <td>
-        #if ( $build.buildNumber != 0 )
+        #if ( $build.state == 2 )
           $build.buildNumber
         #else
           &nbsp;

Propchange: maven/continuum/branches/continuum-acegi/continuum-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 30 13:53:39 2006
@@ -1,4 +1,3 @@
-
 target
 .classpath
 .project
@@ -7,3 +6,4 @@
 *.ipr
 *.iws
 ${plexus.home}
+derby.log

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Wed Aug 30 13:53:39 2006
@@ -18,6 +18,8 @@
 
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildResult;
+import org.apache.maven.continuum.model.project.Project;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.util.List;
 
@@ -44,11 +46,20 @@
 
     private List changeSet;
 
+    private boolean hasSurefireResults;
+
     public String execute()
         throws ContinuumException
     {
+        //todo get this working for other types of test case rendering other then just surefire
+        // check if there are surefire results to display
+        Project project = getContinuum().getProject( projectId );
+        hasSurefireResults = FileUtils.fileExists( project.getWorkingDirectory() + "/target/surefire-reports" );
+
+
         buildResult = getContinuum().getBuildResult( buildId );
 
+
         changeSet = getContinuum().getChangesSinceLastSuccess( projectId, buildId );
 
         return SUCCESS;
@@ -92,5 +103,15 @@
     public List getChangesSinceLastSuccess()
     {
         return changeSet;
+    }
+
+    public boolean isHasSurefireResults()
+    {
+        return hasSurefireResults;
+    }
+
+    public void setHasSurefireResults( boolean hasSurefireResults )
+    {
+        this.hasSurefireResults = hasSurefireResults;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Wed Aug 30 13:53:39 2006
@@ -35,6 +35,8 @@
 
     private int projectId;
 
+    private String projectName;
+
     public String execute()
         throws ContinuumException
     {
@@ -56,5 +58,15 @@
     public Collection getBuildResults()
     {
         return buildResults;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
+
+    public void setProjectName( String projectName )
+    {
+        this.projectName = projectName;
     }
 }

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Wed Aug 30 13:53:39 2006
@@ -123,6 +123,14 @@
         }
     }
 
+    public String remove()
+        throws ContinuumException
+    {
+       getContinuum().removeSchedule( id );
+
+       return SUCCESS; 
+    }
+
     public Collection getSchedules()
     {
         return schedules;

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Wed Aug 30 13:53:39 2006
@@ -706,7 +706,7 @@
       <lifecycle-handler>basic</lifecycle-handler>
 
       <configuration>
-        <threshold>DEBUG</threshold>
+        <threshold>INFO</threshold>
         <default-appender>console,rolling</default-appender>
         <appenders>
           <appender>
@@ -777,7 +777,7 @@
           </level>
           <level>
             <hierarchy>com.opensymphony.webwork</hierarchy>
-            <level>DEBUG</level>
+            <level>INFO</level>
           </level>
           <level>
             <hierarchy>org.extremecomponents</hierarchy>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Aug 30 13:53:39 2006
@@ -309,6 +309,8 @@
 buildResult.changes.comment = Comment
 buildResult.changes.files = Files
 buildResult.changesSinceLastSuccess = Other Changes Since Last Success
+buildResult.generatedReports.title = Generated Reports
+buildResult.generatedReports.surefire = Surefire Report
 
 # ----------------------------------------------------------------------
 # Page: WorkingCopy
@@ -344,6 +346,24 @@
 schedule.quietPeriod.message = Enter a quiet period period for this schedule
 schedule.enabled.label = Enabled
 schedule.enabled.message = Enable/Disable the schedule
+
+# ----------------------------------------------------------------------
+# Page: SurefireReport
+# ----------------------------------------------------------------------
+surefireReport.page.title = Continuum - Surefire Report
+surefireReport.section.title = Surefire Report for {0} Build Number {1}
+surefireReport.summary = Summary
+surefireReport.tests = Tests
+surefireReport.errors = Errors
+surefireReport.failures = Failures
+surefireReport.successRate = Success Rate
+surefireReport.time = Time
+surefireReport.packageList = Package List
+surefireReport.testCases = Test Cases
+surefireReport.package = Package Name
+surefireReport.class = Class
+surefireReport.testCase = Test Case
+surefireReport.failureDetails = Failure Details
 
 # ----------------------------------------------------------------------
 # Errors

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=438620&r1=438619&r2=438620&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 Wed Aug 30 13:53:39 2006
@@ -212,6 +212,10 @@
       <result name="success">buildResult.jsp</result>
     </action>
 
+    <action name="surefireReport" class="surefireReport">
+      <result name="success">surefireReport.jsp</result>
+    </action>
+
     <action name="workingCopy" class="workingCopy">
       <result name="success">workingCopy.jsp</result>
     </action>
@@ -230,6 +234,11 @@
     <action name="saveSchedule" class="schedule" method="save">
       <result name="success" type="chain">schedules</result>
     </action>
+    <action name="removeSchedule" class="schedule" method="remove">
+      <result name="success" type="chain">schedules</result>
+    </action>
+
+
   </package>
 
   <package name="component" extends="default">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/WEB-INF/web.xml Wed Aug 30 13:53:39 2006
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
   <display-name>Continuum Webapp</display-name>
 
@@ -155,25 +157,6 @@
     <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
   </listener>
 
-  <taglib>
-    <taglib-uri>continuum</taglib-uri>
-    <taglib-location>/WEB-INF/continuum.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>sitemesh-page</taglib-uri>
-    <taglib-location>/WEB-INF/sitemesh-page.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>sitemesh-decorator</taglib-uri>
-    <taglib-location>/WEB-INF/sitemesh-decorator.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/tld/extremecomponents</taglib-uri>
-    <taglib-location>/WEB-INF/extremecomponents.tld</taglib-location>
-  </taglib>
 
   <error-page>
     <error-code>403</error-code>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResult.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResult.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResult.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib prefix="c1" uri="continuum" %>
 <html>
@@ -74,6 +74,17 @@
         <ww:else>
           <b><ww:text name="buildResult.noChanges"/></b>
         </ww:else>
+
+        <ww:if test="hasSurefireResults">
+          <h4><ww:text name="buildResult.generatedReports.title"/></h4>
+
+          <ww:url id="surefireReportUrl" action="surefireReport">
+            <ww:param name="projectId" value="projectId"/>
+            <ww:param name="buildId" value="buildId"/>
+            <ww:param name="projectName" value="projectName"/>
+          </ww:url>
+          <ww:a href="%{surefireReportUrl}"><ww:text name="buildResult.generatedReports.surefire"/></ww:a>
+        </ww:if>
 
         <ww:if test="changesSinceLastSuccess != null && changesSinceLastSuccess.size() > 0">
             <h4><ww:text name="buildResult.changesSinceLastSuccess"/></h4>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/buildResults.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <ww:i18n name="localization.Continuum">
@@ -39,11 +39,12 @@
             <ec:column property="endTime" title="buildResults.endTime" cell="date"/>
             <ec:column property="state" title="buildResults.state" cell="org.apache.maven.continuum.web.view.buildresults.StateCell"/>
             <ec:column property="actions" title="&nbsp;">
-              <a href='<ww:url action="buildResult">
+              <ww:url id="buildResultUrl" action="buildResult">
                 <ww:param name="projectId" value="${projectId}"/>
-                <ww:param name="projectName" value="${projectName}"/>
+                <ww:param name="projectName" value="%{projectName}"/>
                 <ww:param name="buildId" value="${buildResult.id}"/>
-              </ww:url>'>Result</a>
+              </ww:url>
+              <ww:a href="%{buildResultUrl}">Result</ww:a>
             </ec:column>
           </ec:row>
         </ec:table>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <ww:i18n name="localization.Continuum">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <ww:i18n name="localization.Continuum">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/failureComponent.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/failureComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/failureComponent.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <ww:i18n name="localization.Continuum">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <ww:i18n name="localization.Continuum">
@@ -12,9 +12,10 @@
     <ec:row highlightRow="true">
       <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
       <ec:column property="name" title="summary.projectTable.name" width="48%">
-        <a href="<ww:url action="projectView">
-                  <ww:param name="projectId" value="${project.id}"/>
-                </ww:url>">${project.name}</a>
+        <ww:url id="projectUrl" action="projectView" namespace="/">
+          <ww:param name="projectId" value="${project.id}"/>
+        </ww:url>
+        <ww:a href="%{projectUrl}">${pageScope.project.name}</ww:a>
       </ec:column>
       <ec:column property="version" title="summary.projectTable.version" width="13%"/>
       <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
@@ -25,10 +26,12 @@
       <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
         <c:choose>
           <c:when test="${pageScope.project.latestBuildId > 0}">
-            <a href='<ww:url action="buildResults">
-                      <ww:param name="projectId" value="${project.id}"/>
-                    </ww:url>'><img src="<ww:url value='/images/buildhistory.gif'/>" alt="Build History"
-                                    title="Build History" border="0"></a>
+            <ww:url id="buildResultsUrl" action="buildResults" namespace="/">
+              <ww:param name="projectId" value="${project.id}"/>
+              <ww:param name="projectName" value="${project.name}"/>
+            </ww:url>
+            <ww:a href="%{buildResultsUrl}"><img src="<ww:url value='/images/buildhistory.gif'/>" alt="Build History"
+                                                 title="Build History" border="0"></ww:a>
           </c:when>
           <c:otherwise>
             <img src="<ww:url value='/images/buildhistory_disabled.gif'/>" alt="Build History" title="Build History"
@@ -40,10 +43,11 @@
         <c:choose>
           <c:when
               test="${pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state == 6}">
-            <a href='<ww:url action="workingCopy">
-                      <ww:param name="projectId" value="${project.id}"/>
-                    </ww:url>'><img src="<ww:url value='/images/workingcopy.gif'/>" alt="Working Copy"
-                                    title="Working Copy" border="0"></a>
+            <ww:url id="workingCopyUrl" action="workingCopy" namespace="/">
+              <ww:param name="projectId" value="${project.id}"/>
+            </ww:url>
+            <ww:a href="%{workingCopyurl}"><img src="<ww:url value='/images/workingcopy.gif'/>" alt="Working Copy"
+                                                title="Working Copy" border="0"></ww:a>
           </c:when>
           <c:otherwise>
             <img src="<ww:url value='/images/workingcopy_disabled.gif'/>" alt="Working Copy" title="Working Copy"
@@ -55,12 +59,13 @@
         <c:choose>
           <c:when
               test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
-            <a href='<ww:url value="/deleteProject!default.action">
-                    <ww:param name="projectId" value="${project.id}"/>
-                    <ww:param name="projectName" value="${project.name}"/>
-                  </ww:url>'>
+            <ww:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
+              <ww:param name="projectId" value="${project.id}"/>
+              <ww:param name="projectName" value="${project.name}"/>
+            </ww:url>
+            <ww:a href="%{deleteProjectUrl}">
               <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete" border="0">
-            </a>
+            </ww:a>
           </c:when>
           <c:otherwise>
             <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete" title="Delete" border="0">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp Wed Aug 30 13:53:39 2006
@@ -12,7 +12,7 @@
 
     <div class="axial">
       <ww:form action="saveSchedule" method="post">
-        <input type="hidden" name="id" value="id"/>
+        <ww:hidden name="id"/>
         <table>
           <tbody>
             <ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/groupSummary.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/groupSummary.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/groupSummary.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <html>
 <ww:i18n name="localization.Continuum">

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupSummary.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/projectView.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <ww:i18n name="localization.Continuum">
@@ -22,12 +22,15 @@
             <ec:column property="delay" title="schedules.table.delay"/>
             <ec:column property="cronExpression" title="schedules.table.cronExpression"/>
             <ec:column property="actions" title="&nbsp;">
-                <ww:url id="editUrl" action="schedule">
+                <ww:url id="editScheduleUrl" action="schedule">
                   <ww:param name="id" value="${pageScope.schedule.id}"/>
                 </ww:url>
-                <ww:a href="%{editUrl}">Edit</ww:a>
+                <ww:url id="removeScheduleUrl" action="removeSchedule">
+                  <ww:param name="id" value="${pageScope.schedule.id}"/>
+                </ww:url>
+                <ww:a href="%{editScheduleUrl}">Edit</ww:a>
                 &nbsp;
-                <ww:text name="delete"/>
+                <ww:a href="%{removeScheduleUrl}">Delete</ww:a>
             </ec:column>
           </ec:row>
         </ec:table>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/summary.jsp Wed Aug 30 13:53:39 2006
@@ -1,5 +1,5 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <html>
 <ww:i18n name="localization.Continuum">

Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?rev=438620&r1=438619&r2=438620&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Wed Aug 30 13:53:39 2006
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>1</version>
+    <version>4</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <groupId>org.apache.maven.continuum</groupId>
@@ -294,44 +294,30 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.continuum</groupId>
+        <artifactId>continuum-webapp</artifactId>
+        <version>1.1-SNAPSHOT</version>
+        <type>war</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.continuum</groupId>
         <artifactId>continuum-security-acegi</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.continuum.jpox</groupId>
+        <groupId>jpox</groupId>
         <artifactId>jpox</artifactId>
-        <version>1.1.0-20060413</version>
+        <version>1.1.1</version>
         <exclusions>
           <exclusion>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>javax.sql</groupId>
             <artifactId>jdbc-stdext</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>javax.security</groupId>
-            <artifactId>jaas</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>ojdbc</groupId>
-            <artifactId>ojdbc</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.continuum.jpox</groupId>
+        <groupId>jpox</groupId>
         <artifactId>jpox-enhancer</artifactId>
-        <version>1.1.0-20060413</version>
+        <version>1.1.1</version>
         <exclusions>
           <exclusion>
             <groupId>javax.sql</groupId>
@@ -342,13 +328,7 @@
       <dependency>
         <groupId>jpox</groupId>
         <artifactId>jpox-dbcp</artifactId>
-        <version>1.1.0-rc-1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>jpox</groupId>
-            <artifactId>jpox</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -359,16 +339,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-jdo2</artifactId>
         <version>1.0-alpha-7-SNAPSHOT</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>



Mime
View raw message