You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/09/25 02:40:27 UTC
svn commit: r449533 [2/3] - in /maven/continuum/trunk: ./
continuum-api/src/main/java/org/apache/maven/continuum/
continuum-api/src/main/java/org/apache/maven/continuum/project/builder/
continuum-api/src/main/java/org/apache/maven/continuum/store/ cont...
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PrepareReleaseAction.java Sun Sep 24 17:40:23 2006
@@ -83,15 +83,19 @@
scmUsername = project.getScmUsername();
scmPassword = project.getScmPassword();
scmTag = project.getScmTag();
+
+ if ( StringUtils.isEmpty( scmTag ) )
+ {
+ scmTag = "myRelease";
+ }
+
String scmUrl = project.getScmUrl();
//skip scm:provider in scm url
int idx = scmUrl.indexOf( ":", 4 ) + 1;
- scmUrl = scmUrl.substring( idx );
-
if ( scmUrl.endsWith( "/trunk" ) )
{
- scmTagBase = scmUrl.substring( 0 , scmUrl.lastIndexOf( "/trunk" ) ) + "/branches";
+ scmTagBase = scmUrl.substring( idx , scmUrl.lastIndexOf( "/trunk" ) ) + "/branches";
}
else
{
@@ -189,7 +193,7 @@
listener = (ContinuumReleaseManagerListener) releaseManager.getListeners().get( releaseId );
- if ( listener != null )
+ if ( listener == null || ( listener.getState() == ContinuumReleaseManagerListener.FINISHED ) )
{
if ( listener.getState() == ContinuumReleaseManagerListener.FINISHED )
{
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Sun Sep 24 17:40:23 2006
@@ -23,7 +23,7 @@
* ProjectGroupAction:
*
* @author Jesse McConnell <jm...@apache.org>
- * @version $ID:$
+ * @version $Id$
*
* @plexus.component
* role="com.opensymphony.xwork.Action"
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Sun Sep 24 17:40:23 2006
@@ -52,4 +52,9 @@
{
return project;
}
+
+ public int getProjectId()
+ {
+ return projectId;
+ }
}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Sun Sep 24 17:40:23 2006
@@ -69,73 +69,54 @@
}
public String input()
+ throws ContinuumException
{
if ( id != 0 )
{
- try
- {
- schedule = getContinuum().getSchedule( id );
- active = schedule.isActive();
-
- String[] cronEx = schedule.getCronExpression().split( " " );
- second = cronEx[0];
- minute = cronEx[1];
- hour = cronEx[2];
- dayOfMonth = cronEx[3];
- month = cronEx[4];
- dayOfWeek = cronEx[5];
-
- try
- {
- year = cronEx[6];
- }
- catch ( Exception xe )
- {
+ schedule = getContinuum().getSchedule( id );
+ active = schedule.isActive();
- }
-
- description = schedule.getDescription();
- name = schedule.getName();
- delay = schedule.getDelay();
- maxJobExecutionTime = schedule.getMaxJobExecutionTime();
- }
- catch ( ContinuumException e )
- {
- addActionError( "unable to retrieve schedule for editting" );
- return ERROR;
- }
+ String[] cronEx = schedule.getCronExpression().split( " " );
+ second = cronEx[0];
+ minute = cronEx[1];
+ hour = cronEx[2];
+ dayOfMonth = cronEx[3];
+ month = cronEx[4];
+ dayOfWeek = cronEx[5];
+ if ( cronEx.length > 6 )
+ {
+ year = cronEx[6];
+ }
+
+ description = schedule.getDescription();
+ name = schedule.getName();
+ delay = schedule.getDelay();
+ maxJobExecutionTime = schedule.getMaxJobExecutionTime();
}
return SUCCESS;
}
public String save()
+ throws ContinuumException
{
- if ( id == 0 )
+ if ( ( "".equals( name ) ) || ( name == null ) )
{
- try
- {
- getContinuum().addSchedule( setFields( new Schedule() ) );
- }
- catch ( ContinuumException e )
- {
- addActionError( "unable to add schedule" );
- return ERROR;
- }
- return SUCCESS;
+ getLogger().error( "Can't create schedule. No schedule name was supplied." );
+ addActionError( "buildDefinition.noname.save.error.message");
+ return ERROR;
}
else
{
- try
+ if ( id == 0 )
{
- getContinuum().updateSchedule( setFields( getContinuum().getSchedule( id ) ) );
+ getContinuum().addSchedule( setFields( new Schedule() ) );
+ return SUCCESS;
}
- catch ( ContinuumException e )
+ else
{
- addActionError( "unable to edit schedule" );
- return ERROR;
- }
-
- return SUCCESS;
+ getContinuum().updateSchedule( setFields( getContinuum().getSchedule( id ) ) );
+ return SUCCESS;
+ }
}
}
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Sun Sep 24 17:40:23 2006
@@ -28,6 +28,8 @@
import java.util.Map;
/**
+ * Used to render the list of projects in the project group page.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
* @plexus.component role="com.opensymphony.xwork.Action"
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Sun Sep 24 17:40:23 2006
@@ -31,7 +31,7 @@
* BuildDefinitionSummaryAction:
*
* @author Jesse McConnell <jm...@apache.org>
- * @version $ID:$
+ * @version $Id$
* @plexus.component role="com.opensymphony.xwork.Action"
* role-hint="buildDefinitionSummary"
*/
@@ -41,6 +41,8 @@
private int projectGroupId;
private int projectId;
+
+ private ProjectGroup projectGroup;
private List projectBuildDefinitionSummaries = new ArrayList();
@@ -52,7 +54,8 @@
{
try
{
- projectGroupId = getContinuum().getProjectGroupByProjectId( projectId ).getId();
+ projectGroup = getContinuum().getProjectGroupByProjectId( projectId );
+ projectGroupId = projectGroup.getId();
groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
projectBuildDefinitionSummaries = gatherProjectBuildDefinitionSummaries( projectId );
@@ -74,7 +77,7 @@
{
groupBuildDefinitionSummaries = gatherGroupBuildDefinitionSummaries( projectGroupId );
- ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
+ projectGroup = getContinuum().getProjectGroup( projectGroupId );
for (Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); )
{
@@ -120,7 +123,7 @@
{
List summaryList = new ArrayList();
- ProjectGroup projectGroup = getContinuum().getProjectGroup( projectGroupId );
+ projectGroup = getContinuum().getProjectGroup( projectGroupId );
for ( Iterator i = projectGroup.getBuildDefinitions().iterator(); i.hasNext(); )
{
@@ -196,5 +199,15 @@
public void setAllBuildDefinitionSummaries( List allBuildDefinitionSummaries )
{
this.allBuildDefinitionSummaries = allBuildDefinitionSummaries;
+ }
+
+ public ProjectGroup getProjectGroup()
+ {
+ return projectGroup;
+ }
+
+ public void setProjectGroup( ProjectGroup projectGroup )
+ {
+ this.projectGroup = projectGroup;
}
}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java Sun Sep 24 17:40:23 2006
@@ -19,7 +19,7 @@
* ContinuumActionException:
*
* @author Jesse McConnell <jm...@apache.org>
- * @version $ID:$
+ * @version $Id$
*/
public class ContinuumActionException
extends Exception
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/exception/ContinuumActionException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Sun Sep 24 17:40:23 2006
@@ -30,6 +30,9 @@
/**
* Used in Summary view
*
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildNowCell.java Sun Sep 24 17:40:23 2006
@@ -24,6 +24,9 @@
/**
* Used in Summary view
+ *
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Sun Sep 24 17:40:23 2006
@@ -31,6 +31,9 @@
/**
* Used in Summary view
*
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java Sun Sep 24 17:40:23 2006
@@ -27,6 +27,9 @@
/**
* Used in BuildResults
*
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/commons/DateCell.java Sun Sep 24 17:40:23 2006
@@ -27,6 +27,10 @@
import java.util.Locale;
/**
+ *
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierEventCell.java Sun Sep 24 17:40:23 2006
@@ -24,6 +24,9 @@
/**
* Used in Project view
*
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierFromCell.java Sun Sep 24 17:40:23 2006
@@ -24,6 +24,9 @@
/**
* Used in Project view
*
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/projectview/NotifierRecipientCell.java Sun Sep 24 17:40:23 2006
@@ -24,6 +24,9 @@
/**
* Used in Project view
*
+ * @deprecated use of cells is discouraged due to lack of i18n and design in java code.
+ * Use jsp:include instead.
+ *
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
@@ -57,7 +60,14 @@
}
else
{
- return notifier.getConfiguration().get( "address" ).toString();
+ if ( notifier.getConfiguration().get( "address" ) == null )
+ {
+ return "";
+ }
+ else
+ {
+ return notifier.getConfiguration().get( "address" ).toString();
+ }
}
}
}
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Sun Sep 24 17:40:23 2006
@@ -87,7 +87,7 @@
this address instead the address specified in the project
configuration
-->
- <to-override></to-override>
+ <to-override>${mail.override.to.address}</to-override>
</configuration>
</component>
@@ -240,17 +240,21 @@
</configuration>
</component>
+ <!-- TODO share db configuration between components -->
<component>
<role>org.codehaus.plexus.jdo.JdoFactory</role>
- <implementation>org.codehaus.plexus.jdo.DefaultJdoFactory</implementation>
+ <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
<configuration>
- <properties>
+ <!-- Database Configuration -->
+ <driverName>${db.driverName}</driverName>
+ <url>${db.url}</url>
+ <userName>${db.userName}</userName>
+ <password>${db.password}</password>
+ <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+
+ <otherProperties>
<!-- JPOX and JDO configuration -->
<property>
- <name>javax.jdo.PersistenceManagerFactoryClass</name>
- <value>org.jpox.PersistenceManagerFactoryImpl</value>
- </property>
- <property>
<name>org.jpox.autoCreateSchema</name>
<value>true</value>
</property>
@@ -267,7 +271,6 @@
<value>false</value>
</property>
-<!--
<property>
<name>org.jpox.autoStartMechanism</name>
<value>SchemaTable</value>
@@ -276,68 +279,6 @@
<name>org.jpox.autoStartMechanismMode</name>
<value>Ignored</value>
</property>
--->
- <!-- Apache Derby Configuration -->
- <property>
- <name>javax.jdo.option.ConnectionDriverName</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:derby:${plexus.home}/database;create=true</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionUserName</name>
- <value>sa</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
- </property>
-
- <!-- Postgresql Configuration -->
- <!--
- <property>
- <name>javax.jdo.option.ConnectionDriverName</name>
- <value>org.postgresql.Driver</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:postgresql://localhost/continuum</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionUserName</name>
- <value>trygvis</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
- </property>
- -->
-
- <!-- HSQLDB Configuration -->
- <!--
- NOTE: NO NOT USE THIS CONFIGURATION FOR A PRODUCTION SYSTEM.
- HSQLDB keeps all data in memory at all times.
- -->
- <!--
- <property>
- <name>javax.jdo.option.ConnectionDriverName</name>
- <value>org.hsqldb.jdbcDriver</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:hsqldb:${plexus.home}/database</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionUserName</name>
- <value>sa</value>
- </property>
- <property>
- <name>javax.jdo.option.ConnectionPassword</name>
- <value></value>
- </property>
-
<property>
<name>org.jpox.transactionIsolation</name>
<value>READ_UNCOMMITTED</value>
@@ -346,16 +287,12 @@
<name>org.jpox.poid.transactionIsolation</name>
<value>READ_UNCOMMITTED</value>
</property>
- -->
+ <!-- this is required for MySQL -->
<property>
- <name>org.jpox.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
+ <name>org.jpox.rdbms.stringDefaultLength</name>
+ <value>255</value>
</property>
- <property>
- <name>org.jpox.poid.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
- </properties>
+ </otherProperties>
</configuration>
</component>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Sun Sep 24 17:40:23 2006
@@ -14,6 +14,7 @@
delete = Delete
save = Save
add = Add
+back = Back
workingCopy = Working Copy
builds = Builds
info = Info
@@ -38,6 +39,9 @@
menu.administration = Administration
menu.administration.configuration = Configuration
menu.administration.schedules = Schedules
+menu.administration.users = Users
+menu.administration.userGroups = User Groups
+menu.account.options = My account
# ----------------------------------------------------------------------
# Page: error
@@ -105,10 +109,11 @@
# ----------------------------------------------------------------------
add.project.field.required.error = Either POM URL or Upload POM is required.
add.project.unknown.host.error = The specified host is either unknown or inaccessible.
+add.project.connect.error = Unable to connect to remote server
add.project.malformed.url.error = The URL provided is malformed.
add.project.xml.parse.error = The XML content of the POM can not be parsed.
add.project.extend.error = Cannot use a POM with an 'extend' element.
-add.project.missing.pom.error = POM file does not exist.
+add.project.missing.pom.error = POM file does not exist. Either the POM you specified or one of its modules does not exist.
add.project.missing.groupid.error = Missing 'groupId' element in the POM.
add.project.missing.artifactid.error = Missing 'artifactId' element in the POM.
add.project.missing.version.error = Missing 'version' element in the POM.
@@ -119,6 +124,9 @@
add.project.missing.notifier.type.error = Missing 'type' sub-element in the 'notifier' element in the POM.
add.project.missing.notifier.configuration.error = Missing 'configuration' sub-element in the 'notifier' element in the POM.
add.project.metadata.transfer.error = Transfer of Metadata has failed.
+add.project.unauthorized.error = You are not authorized to access the requested URL. Please verify that the correct username and password are provided.
+add.project.artifact.not.found.error = Missing artifact trying to build the POM. Check that its parent POM is available or add it first in Continuum.
+add.project.project.building.error = Unknown error trying to build POM.
add.project.unknown.error = The specified resource cannot be accessed. Please try again later or contact your administrator.
# ----------------------------------------------------------------------
@@ -155,6 +163,7 @@
projectName.label = Project Name
projectName.error = You must provide a project name
+projectName.already.exist.error = Project name already exist
projectName.message = Enter the project name
projectScm.label = Scm
@@ -213,6 +222,12 @@
projectView.developers = Developers
projectView.developer.name = Name
projectView.developer.email = Email
+projectView.username = User Name
+projectView.role.view = View
+projectView.role.edit = Edit
+projectView.role.delete = Delete
+projectView.role.build = Build
+projectView.role.administer = Administer
# ----------------------------------------------------------------------
# Page: ProjectEdit
@@ -239,6 +254,8 @@
buildDefinition.arguments.label = Arguments
buildDefinition.defaultForProject.label = Is it default?
buildDefinition.schedule.label = Schedule
+buildDefinition.noname.save.error.message = There was an error saving the schedule, no schedule name was supplied.
+buildDefinition.duplicatename.save.error.message = There was an error saving the schedule, a schedule with the same name already exists.
# ----------------------------------------------------------------------
# Page: DeleteBuildDefinition
@@ -294,7 +311,6 @@
buildResults.startTime = Start Time
buildResults.endTime = End Time
buildResults.state = State
-buildResults.noChanges = No changes
# ----------------------------------------------------------------------
# Page: BuildResults
@@ -303,13 +319,14 @@
buildResult.section.title = Build result for {0}
buildResult.startTime = Start Time
buildResult.endTime = End Time
-buildResult.buildTrigger = Build Trigger
+buildResult.trigger = Build Trigger
buildResult.state = State
buildResult.buildNumber = Build#
buildResult.buildError = Build Error
buildResult.buildOutput = Output
buildResult.noOutput = No output.
buildResult.changes = Changes
+buildResult.noChanges = No changes
buildResult.changes.author = Author
buildResult.changes.date = Date
buildResult.changes.comment = Comment
@@ -318,6 +335,19 @@
buildResult.generatedReports.title = Generated Reports
buildResult.generatedReports.surefire = Surefire Report
+# From ContinuumProjectState
+buildResult.trigger.0 = Scheduled
+buildResult.trigger.1 = Forced
+buildResult.state.1 = New
+buildResult.state.2 = OK
+buildResult.state.3 = Failed
+buildResult.state.4 = Error
+buildResult.state.6 = Building
+buildResult.state.7 = Checking out
+buildResult.state.8 = Updating
+buildResult.state.9 = Warning
+buildResult.state.10 = Checked out
+
# ----------------------------------------------------------------------
# Page: WorkingCopy
# ----------------------------------------------------------------------
@@ -409,4 +439,4 @@
viewReleaseResult.summary=Release Project Details
viewReleaseResult.success=SUCCESSFUL
viewReleaseResult.error=ERROR
-viewReleaseResult.output=Release Execution Output
\ No newline at end of file
+viewReleaseResult.output=Release Execution Output
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Sun Sep 24 17:40:23 2006
@@ -22,22 +22,25 @@
<interceptor-ref name="static-params"/>
<interceptor-ref name="params"/>
<!-- interceptor-ref name="conversionError"/ -->
- <interceptor-ref name="validation"/>
- <interceptor-ref name="workflow"/>
+ <interceptor-ref name="validation">
+ <param name="excludeMethods">input,back,cancel,browse,edit</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param name="excludeMethods">input,back,cancel,browse,edit</param>
+ </interceptor-ref>
</interceptor-stack>
</interceptors>
<default-interceptor-ref name="defaultContinuumStack"/>
<global-results>
- <result name="error">/error.jsp</result>
- <result name="internalError" type="redirect">/error.jsp</result>
- <result name="continuumInitialization" type="redirect">/configuration!input.action</result>
+ <result name="error-internal">/error/error.jsp?id=500</result>
+ <result name="continuumInitialization" type="redirect">/configuration!input.action?isNew=true</result>
</global-results>
<global-exception-mappings>
<exception-mapping exception="org.apache.maven.continuum.initialization.ContinuumInitializationException" result="continuumInitialization"/>
- <exception-mapping exception="java.lang.Exception" result="internalError"/>
+ <exception-mapping exception="java.lang.Exception" result="error-internal"/>
</global-exception-mappings>
<action name="checkConfiguration" class="checkConfiguration">
@@ -163,7 +166,7 @@
* build definition actions
-->
<action name="buildDefinition" class="buildDefinition" method="input">
- <result name="success">buildDefinitionEdit.jsp</result>
+ <result name="input">buildDefinitionEdit.jsp</result>
</action>
<action name="saveProjectBuildDefinition" class="buildDefinition" method="saveToProject">
@@ -177,10 +180,10 @@
</action>
<action name="saveGroupBuildDefinition" class="buildDefinition" method="saveToGroup">
- <result name="success" type="chain">projectGroupView</result>
+ <result name="success" type="chain">projectGroupBuildDefinition</result>
</action>
- <action name="removeGroupBuildDefinition" class="buildDefinition" method="removeFromGroup">
+ <action name="removeGroupBuildDefinition" class="buildDefinition" method="removeFromProjectGroup">
<result name="confirm">confirmBuildDefinitionRemoval.jsp</result>
<result name="success" type="chain">projectGroupBuildDefinition</result>
</action>
@@ -189,14 +192,14 @@
<!--
* project group actions
-->
- <action name="projectGroupMembers" class="projectGroup" method="members">
- <result name="success">projectGroupMembers.jsp</result>
- </action>
-
<action name="projectGroupSummary" class="projectGroup" method="summary">
<result name="success">projectGroupSummary.jsp</result>
</action>
+ <action name="projectGroupMembers" class="projectGroup" method="members">
+ <result name="success">projectGroupMembers.jsp</result>
+ </action>
+
<action name="projectGroupBuildDefinition" class="projectGroup" method="buildDefinitions">
<result name="success">projectGroupBuildDefinition.jsp</result>
</action>
@@ -296,8 +299,8 @@
<action name="saveSchedule" class="schedule" method="save">
<result name="input">editSchedule.jsp</result>
<result name="success" type="chain">schedules</result>
+ <result name="error" type="chain">schedule</result>
</action>
-
<action name="removeSchedule" class="schedule" method="remove">
<result name="confirm">confirmation.jsp</result>
<result name="success" type="chain">schedules</result>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Sep 24 17:40:23 2006
@@ -0,0 +1,2 @@
+user
+META-INF
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep 24 17:40:23 2006
@@ -1,4 +1,6 @@
database
logs
temp
-working-directory
+lib
+classes
+tld
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Sun Sep 24 17:40:23 2006
@@ -50,4 +50,19 @@
<listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
</listener>
+ <!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->
+
+ <error-page>
+ <error-code>403</error-code>
+ <location>/error/error.jsp?id=403</location>
+ </error-page>
+ <error-page>
+ <error-code>404</error-code>
+ <location>/error/error.jsp?id=404</location>
+ </error-page>
+ <error-page>
+ <error-code>500</error-code>
+ <location>/error/error.jsp?id=500</location>
+ </error-page>
+
</web-app>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp Sun Sep 24 17:40:23 2006
@@ -1,5 +1,6 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<ww:i18n name="localization.Continuum">
<html>
<head>
@@ -25,6 +26,13 @@
</h3>
<div class="axial">
<ww:form method="post" action="addProject" validate="true">
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <c:forEach items="${actionErrors}" var="actionError">
+ <p><ww:text name="${actionError}"/></p>
+ </c:forEach>
+ </div>
+ </c:if>
<input type="hidden" name="projectType" value="<ww:property value="projectType"/>">
<table>
<tbody>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildDefinitionEdit.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildDefinitionEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildDefinitionEdit.jsp Sun Sep 24 17:40:23 2006
@@ -15,10 +15,10 @@
<ww:if test="${projectId != 0}">
- <ww:url id="actionUrl" action="saveProjectBuildDefinition"/>
+ <ww:url id="actionUrl" action="saveProjectBuildDefinition" includeContext="false" />
</ww:if>
<ww:else>
- <ww:url id="actionUrl" action="saveGroupBuildDefinition"/>
+ <ww:url id="actionUrl" action="saveGroupBuildDefinition" includeContext="false" />
</ww:else>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResult.jsp Sun Sep 24 17:40:23 2006
@@ -9,13 +9,8 @@
</head>
<body>
<div id="h3">
- <div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="projectView"/>'><ww:text name="info"/></a>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="buildResults"/>'><ww:text name="builds"/></a>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="workingCopy"/>'><ww:text name="workingCopy"/></a>
- </p>
- </div>
+
+ <jsp:include page="/navigations/ProjectMenu.jsp"/>
<h3>
<ww:text name="buildResult.section.title">
@@ -31,11 +26,11 @@
<c1:data label="%{getText('buildResult.endTime')}">
<ww:param name="after"><c1:date name="buildResult.endTime"/></ww:param>
</c1:data>
- <c1:data label="%{getText('buildResult.buildTrigger')}">
- <ww:param name="after">TODO<ww:property value="buildResult.trigger"/></ww:param>
+ <c1:data label="%{getText('buildResult.trigger')}">
+ <ww:param name="after"><ww:text name="buildResult.trigger.%{buildResult.trigger}"/></ww:param>
</c1:data>
<c1:data label="%{getText('buildResult.state')}">
- <ww:param name="after">TODO<ww:property value="buildResult.state"/></ww:param>
+ <ww:param name="after"><ww:text name="buildResult.state.%{buildResult.state}"/></ww:param>
</c1:data>
<c1:data label="%{getText('buildResult.buildNumber')}">
<ww:param name="after">
@@ -58,12 +53,13 @@
showExports="false"
showPagination="false"
showStatusBar="false"
+ sortable="false"
filterable="false">
<ec:row>
<ec:column property="author" title="buildResult.changes.author"/>
<ec:column property="date" title="buildResult.changes.date" cell="date"/>
- <ec:column property="comment" title="buildResult.changes.comment" sortable="false"/>
- <ec:column property="files" title="buildResult.changes.files" sortable="false">
+ <ec:column property="comment" title="buildResult.changes.comment" />
+ <ec:column property="files" title="buildResult.changes.files">
<c:forEach var="scmFile" items="${pageScope.change.files}">
<c:out value="${scmFile.name}"/><br />
</c:forEach>
@@ -94,12 +90,13 @@
showExports="false"
showPagination="false"
showStatusBar="false"
+ sortable="false"
filterable="false">
<ec:row>
<ec:column property="author" title="buildResult.changes.author"/>
<ec:column property="date" title="buildResult.changes.date" cell="date"/>
- <ec:column property="comment" title="buildResult.changes.comment" sortable="false"/>
- <ec:column property="files" title="buildResult.changes.files" sortable="false">
+ <ec:column property="comment" title="buildResult.changes.comment" />
+ <ec:column property="files" title="buildResult.changes.files">
<c:forEach var="scmFile" items="${pageScope.change.files}">
<c:out value="${scmFile.name}"/><br />
</c:forEach>
@@ -110,21 +107,19 @@
<ww:if test="buildResult.state == 4">
<h4><ww:text name="buildResult.buildError"/></h4>
- <p>
- <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
- <code><pre><ww:property value="buildResult.error"/></pre></code>
- </div>
- </p>
+ <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
+ <pre><ww:property value="buildResult.error"/></pre>
+ </div>
</ww:if>
<ww:else>
<h4><ww:text name="buildResult.buildOutput"/></h4>
<p>
- <ww:if test="buildResult.output == ''">
+ <ww:if test="buildOutput == ''">
<ww:text name="buildResult.noOutput"/>
</ww:if>
<ww:else>
<div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
- <code><pre>buildResult.output</pre></code>
+ <pre><ww:property value="buildOutput"/></pre>
</div>
</ww:else>
</p>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/buildResults.jsp Sun Sep 24 17:40:23 2006
@@ -8,13 +8,10 @@
</head>
<body>
<div id="h3">
- <div>
- <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="projectView"/>'><ww:text name="info"/></a>
- <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="builds"/></b>
- <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href='<ww:url action="workingCopy"/>'><ww:text name="workingCopy"/></a>
- </p>
- </div>
+
+ <jsp:include page="/navigations/ProjectMenu.jsp">
+ <jsp:param name="tab" value="buildResults"/>
+ </jsp:include>
<h3>
<ww:text name="buildResults.section.title">
@@ -30,9 +27,9 @@
filterable="false"
sortable="false">
<ec:row highlightRow="true">
- <ec:column property="buildNumber" title="buildResults.buildNumber">
- <c:if test="${!(pageScope.buildResult.state == 2)}">
- ${pageScope.buildResult.buildNumber}
+ <ec:column property="buildNumberIfNotZero" title="buildResults.buildNumber">
+ <c:if test="${pageScope.buildResult.state == 2}">
+ <c:out value="${pageScope.buildResult.buildNumber}"/>
</c:if>
</ec:column>
<ec:column property="startTime" title="buildResults.startTime" cell="date"/>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp Sun Sep 24 17:40:23 2006
@@ -19,7 +19,7 @@
<ec:column property="from" title="projectView.buildDefinition.from"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
<ec:column property="actions" title=" ">
- <!-- if the from is PROJECT then render the links differently -->
+ <%-- if the from is PROJECT then render the links differently --%>
<ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
<ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
@@ -33,18 +33,20 @@
</ww:if>
<ww:else>
<ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+ <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
</ww:url>
<ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+ <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
<ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
<ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
<ww:param name="confirmed" value="false"/>
</ww:url>
</ww:else>
- <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
+ <ww:a href="%{editUrl}"><ww:text name="edit"/></ww:a>
- <ww:a href="%{removeUrl}"><ww:text name="delete"/></ww:a>
+ <ww:a href="%{removeUrl}"><ww:text name="delete"/></ww:a>
</ec:column>
</ec:row>
</ec:table>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/buildDefinitionSummaryComponent.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/companyLogo.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/companyLogo.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/companyLogo.jsp Sun Sep 24 17:40:23 2006
@@ -2,12 +2,13 @@
<ww:i18n name="localization.Continuum">
<ww:if test="companyLogo != null && companyLogo != ''">
<ww:if test="companyUrl != null && companyUrl != ''">
- <a href="<ww:property value="companyUrl"/>">
- </ww:if>
- <img src="<ww:property value="companyLogo"/>" alt="<ww:property value="companyName"/>" title="<ww:property value="companyName"/>" border="0"/>
- <ww:if test="companyUrl != null && companyUrl != ''">
- </a>
+ <a href="<ww:property value='companyUrl'/>">
+ <img src="<ww:property value='companyLogo'/>" alt="<ww:property value='companyName'/>" title="<ww:property value='companyName'/>" border="0"/>
+ </a>
</ww:if>
+ <ww:else>
+ <img src="<ww:property value='companyLogo'/>" alt="<ww:property value='companyName'/>" title="<ww:property value='companyName'/>" border="0"/>
+ </ww:else>
</ww:if>
<ww:else>
<a href="http://maven.apache.org/continuum/"><img src="<ww:url value="/images/asf_logo_wide.gif"/>" alt="Apache Software Foundation" title="Apache Software Foundation" border="0"></a>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp Sun Sep 24 17:40:23 2006
@@ -3,13 +3,19 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<ww:i18n name="localization.Continuum">
+
<ec:table items="projects"
var="project"
showExports="false"
showPagination="false"
showStatusBar="false"
+ sortable="false"
filterable="false">
<ec:row highlightRow="true">
+
+ <%-- needed to access project in included pages --%>
+ <c:set var="project" value="${pageScope.project}" scope="request"/>
+
<ec:column property="state" title=" " width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
<ec:column property="name" title="summary.projectTable.name" width="48%">
<ww:url id="projectUrl" action="projectView" namespace="/">
@@ -21,14 +27,15 @@
<ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
cell="org.apache.maven.continuum.web.view.BuildCell"/>
<ec:column property="projectGroupName" title="summary.projectTable.group" width="13%"/>
- <ec:column property="buildNowAction" title=" " width="1%"
- cell="org.apache.maven.continuum.web.view.BuildNowCell" sortable="false"/>
- <ec:column property="buildHistoryAction" title=" " width="1%" sortable="false">
+ <ec:column property="buildNowAction" title=" " width="1%">
+ <jsp:include page="/components/buildNowCell.jsp"/>
+ </ec:column>
+ <ec:column property="buildHistoryAction" title=" " width="1%">
<c:choose>
<c:when test="${pageScope.project.latestBuildId > 0}">
<ww:url id="buildResultsUrl" action="buildResults" namespace="/">
<ww:param name="projectId" value="${project.id}"/>
- <ww:param name="projectName" value="${project.name}"/>
+ <ww:param name="projectName">${project.name}</ww:param>
</ww:url>
<ww:a href="%{buildResultsUrl}"><img src="<ww:url value='/images/buildhistory.gif'/>" alt="Build History"
title="Build History" border="0"></ww:a>
@@ -39,14 +46,13 @@
</c:otherwise>
</c:choose>
</ec:column>
- <ec:column property="workingCopyAction" title=" " width="1%" sortable="false">
+ <ec:column property="workingCopyAction" title=" " width="1%">
<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}">
+ <c:when test="${pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state == 6}">
<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"
+ <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>
@@ -55,39 +61,39 @@
</c:otherwise>
</c:choose>
</ec:column>
- <ec:column property="releaseAction" title=" " width="1%" sortable="false">
- <c:choose>
- <c:when test="${pageScope.project.state == 2}">
- <ww:url id="releaseProjectUrl" action="releaseProject!promptReleaseGoal.action" namespace="/">
- <ww:param name="projectId" value="${project.id}"/>
- </ww:url>
- <ww:a href="%{releaseProjectUrl}">
- <img src="<ww:url value='/images/releaseproject.gif'/>" alt="Release Project" title="Release Project"
- border="0"/>
- </ww:a>
- </c:when>
- <c:otherwise>
- <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="Release Project"
- title="Release Project" border="0"/>
- </c:otherwise>
- </c:choose>
+ <ec:column property="releaseAction" title=" " width="1%">
+ <c:choose>
+ <c:when test="${pageScope.project.state == 2}">
+ <ww:url id="releaseProjectUrl" action="releaseProject!promptReleaseGoal.action" namespace="/">
+ <ww:param name="projectId" value="${project.id}"/>
+ </ww:url>
+ <ww:a href="%{releaseProjectUrl}">
+ <img src="<ww:url value='/images/releaseproject.gif'/>" alt="Release Project" title="Release Project"
+ border="0"/>
+ </ww:a>
+ </c:when>
+ <c:otherwise>
+ <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="Release Project"
+ title="Release Project" border="0"/>
+ </c:otherwise>
+ </c:choose>
</ec:column>
- <ec:column property="deleteAction" title=" " width="1%" sortable="false">
- <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}">
- <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">
- </ww:a>
- </c:when>
- <c:otherwise>
- <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete" title="Delete" border="0">
- </c:otherwise>
- </c:choose>
+ <ec:column property="deleteAction" title=" " width="1%">
+ <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}">
+ <ww:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
+ <ww:param name="projectId" value="${project.id}"/>
+ <ww:param name="projectName">${project.name}</ww:param>
+ </ww:url>
+ <ww:a href="%{deleteProjectUrl}">
+ <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete" border="0">
+ </ww:a>
+ </c:when>
+ <c:otherwise>
+ <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete" title="Delete" border="0">
+ </c:otherwise>
+ </c:choose>
</ec:column>
</ec:row>
</ec:table>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/components/projectSummaryComponent.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmBuildDefinitionRemoval.jsp Sun Sep 24 17:40:23 2006
@@ -19,8 +19,9 @@
</p>
</div>
<div class="functnbar3">
- <ww:form action="removeProjectBuildDefinition">
+ <ww:form action="removeGroupBuildDefinition">
<ww:hidden name="buildDefinitionId"/>
+ <ww:hidden name="projectGroupId"/>
<ww:hidden name="projectId"/>
<ww:hidden name="confirmed" value="true"/>
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp Sun Sep 24 17:40:23 2006
@@ -1,4 +1,4 @@
-<%@ taglib uri="sitemesh-decorator" prefix="decorator" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
<%@ taglib uri="/webwork" prefix="ww" %>
<html>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp Sun Sep 24 17:40:23 2006
@@ -1,4 +1,4 @@
-<%@ taglib uri="sitemesh-decorator" prefix="decorator" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
<html>
<head>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/editSchedule.jsp Sun Sep 24 17:40:23 2006
@@ -1,3 +1,4 @@
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
@@ -12,6 +13,13 @@
<div class="axial">
<ww:form action="saveSchedule" method="post" validate="true">
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <c:forEach items="${actionErrors}" var="actionError">
+ <p><ww:text name="${actionError}"/></p>
+ </c:forEach>
+ </div>
+ </c:if>
<ww:hidden name="id"/>
<table>
<ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp Sun Sep 24 17:40:23 2006
@@ -1,7 +1,6 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ 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>
<ww:i18n name="localization.Continuum">
<head>
@@ -19,67 +18,26 @@
No Project Groups Known.
</ww:if>
- <c:forEach items="${groups}" var="group">
-
- <ww:set name="group" value="${group}"/>
- <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" namespace="/">
- <ww:param name="projectGroupId" value="%{'${group.id}'}"/>
- </ww:url>
-
- <div class="body">
- <table border="2" cellspacing="2" cellpadding="3" width="100%">
- <tr>
- <td>Name:</td>
- <td><ww:a href="%{projectGroupSummaryUrl}">${group.name}</ww:a></td>
- </tr>
- <tr>
- <td>Group Id:</td>
- <td>${group.groupId}</td>
- </tr>
- <tr>
- <td>Project Type:</td>
- <td>${group.projectType}</td>
- </tr>
- <tr>
- <td>Number of Projects:</td>
- <td>${group.numProjects}</td>
- </tr>
- <tr>
- <td>Build Status:</td>
- <td>
- <table>
- <tr>
- <td><img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text name="message.success"/>"
- title="<ww:text name="message.success"/>"/></td>
- <td><ww:property value="${group.numSuccesses}"/></td>
- </tr>
- <tr>
- <td><img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text name="message.failed"/>"
- title="<ww:text name="message.failed"/>"/></td>
- <td><ww:property value="${group.numFailures}"/></td>
- </tr>
- <tr>
- <td><img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text name="message.error"/>"
- title="<ww:text name="message.error"/>"/></td>
- <td><ww:property value="${group.numErrors}"/></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>Next Scheduled Build:</td>
- <td>${group.nextScheduledBuild}</td>
- </tr>
- <tr>
- <td>Status Message:</td>
- <td>${group.statusMessage}</td>
- </tr>
- </table>
- <hr/>
- <p/>
- </div>
- </c:forEach>
- </div>
+ <div class="eXtremeTable" >
+ <ec:table items="groups"
+ var="group"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row highlightRow="true">
+ <ec:column property="name" title="Name" width="20%" style="white-space: nowrap">
+ <a href="<ww:url action="projectGroupSummary" namespace="/"><ww:param name="projectGroupId" value="%{'${group.id}'}"/></ww:url>">${group.name}</a>
+ </ec:column>
+ <ec:column property="groupId" title="Group Id" width="20%"/>
+ <ec:column property="numProjects" title="Projects" width="1%" style="text-align: center"/>
+ <ec:column property="numSuccesses" title="Build Status" width="1%" style="white-space: nowrap" cell="org.apache.maven.continuum.web.view.BuildStatusCell"/>
+ <ec:column property="nextScheduledBuild" title="Next Build" width="1%" style="white-space: nowrap"/>
+ <ec:column property="statusMessage" title="Status Message"/>
+ </ec:row>
+ </ec:table>
+ </div>
</body>
</ww:i18n>
</html>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp Sun Sep 24 17:40:23 2006
@@ -1 +1 @@
-<% response.sendRedirect( request.getContextPath() + "/summary.action" ); %>
+<% response.sendRedirect( request.getContextPath() + "/groupSummary.action" ); %>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp Sun Sep 24 17:40:23 2006
@@ -1,5 +1,4 @@
<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ 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">
@@ -8,44 +7,44 @@
<div class="label">Continuum</div>
<div>
<div class="body">
- <a href="<ww:url value="/about.jsp"/>"><ww:text name="menu.continuum.about"/></a>
+ <a href="<ww:url value="/about.jsp" includeParams="none"/>"><ww:text name="menu.continuum.about"/></a>
</div>
<div class="body">
- <a href="<ww:url value="/groupSummary.action"/>"><ww:text name="menu.continuum.showProjectGroups"/></a>
+ <a href="<ww:url value="/groupSummary.action" includeParams="none"/>"><ww:text name="menu.continuum.showProjectGroups"/></a>
</div>
</div>
</div>
- <div id="projectmenu" class="toolgroup">
- <div class="label"><ww:text name="menu.addProject"/></div>
- <div>
- <div class="body">
- <a href="<ww:url value="addMavenTwoProject!default.action"/>"><ww:text name="menu.add.m2Project"/></a>
- </div>
- <div class="body">
- <a href="<ww:url value="addMavenOneProject!default.action"/>"><ww:text name="menu.add.m1Project"/></a>
- </div>
- <div class="body">
- <a href="<ww:url value="addProjectInput.action"><ww:param name="projectType">ant</ww:param></ww:url>"><ww:text name="menu.add.antProject"/></a>
- </div>
- <div class="body">
- <a href="<ww:url value="addProjectInput.action"><ww:param name="projectType">shell</ww:param></ww:url>"><ww:text name="menu.add.shellProject"/></a>
+
+ <div id="projectmenu" class="toolgroup">
+ <div class="label"><ww:text name="menu.addProject"/></div>
+ <div>
+ <div class="body">
+ <a href="<ww:url value="/addMavenTwoProject!default.action" includeParams="none"/>"><ww:text name="menu.add.m2Project"/></a>
+ </div>
+ <div class="body">
+ <a href="<ww:url value="/addMavenOneProject!default.action" includeParams="none"/>"><ww:text name="menu.add.m1Project"/></a>
+ </div>
+ <div class="body">
+ <a href="<ww:url value="/addProject!default.action" includeParams="none"><ww:param name="projectType">ant</ww:param></ww:url>"><ww:text name="menu.add.antProject"/></a>
+ </div>
+ <div class="body">
+ <a href="<ww:url value="/addProject!default.action" includeParams="none"><ww:param name="projectType">shell</ww:param></ww:url>"><ww:text name="menu.add.shellProject"/></a>
+ </div>
</div>
</div>
- </div>
- <div id="projectmenu" class="toolgroup">
- <div class="label"><ww:text name="menu.administration"/></div>
- <div>
+ <div id="projectmenu" class="toolgroup">
+ <div class="label"><ww:text name="menu.administration"/></div>
+ <div>
<c1:ifAuthorized permission="manageSchedule">
- <div class="body">
- <a href="<ww:url value="schedules.action"/>"><ww:text name="menu.administration.schedules"/></a>
- </div>
+ <div class="body">
+ <a href="<ww:url value="/schedules.action" includeParams="none"/>"><ww:text name="menu.administration.schedules"/></a>
+ </div>
</c1:ifAuthorized>
<c1:ifAuthorized permission="manageConfiguration">
- <div class="body">
- <a href="<ww:url value="configuration!default.action"/>"><ww:text
- name="menu.administration.configuration"/></a>
- </div>
+ <div class="body">
+ <a href="<ww:url value="/configuration!default.action" includeParams="none"/>"><ww:text name="menu.administration.configuration"/></a>
+ </div>
</c1:ifAuthorized>
<c1:ifAuthorized permission="manageUsers">
<div class="body">
@@ -57,8 +56,9 @@
<ww:a href="%{userGroupManagementUrl}">User Groups</ww:a>
</div>
</c1:ifAuthorized>
+ </div>
</div>
- </div>
+
<div id="projectmenu" class="toolgroup">
<div class="label">Legend</div>
<div id="legend">
Copied: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp (from r448283, maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp)
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp?view=diff&rev=449533&p1=maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp&r1=448283&p2=maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp&r2=449533
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/ProjectGroupMenu.jsp Sun Sep 24 17:40:23 2006
@@ -17,9 +17,6 @@
<ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier">
<ww:param name="projectGroupId" value="projectGroupId"/>
</ww:url>
- <ww:url id="projectGroupPermissionsUrl" action="projectGroupPermissions">
- <ww:param name="projectGroupId" value="projectGroupId"/>
- </ww:url>
<c:choose>
<c:when test="${param.tab == 'summary'}">
@@ -58,16 +55,6 @@
</c:otherwise>
</c:choose>
--%>
- <c:if test="${projectGroup.permissions.administer}">
- <c:choose>
- <c:when test="${param.tab == 'permissions'}">
- <b class="tabMenuDisabled">Permissions</b>
- </c:when>
- <c:otherwise>
- <ww:a cssClass="tabMenuEnabled" href="%{projectGroupPermissionsUrl}">Permissions</ww:a>
- </c:otherwise>
- </c:choose>
- </c:if>
</p>
</div>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp Sun Sep 24 17:40:23 2006
@@ -15,7 +15,7 @@
<table>
<tbody>
<ww:select label="%{getText('notifier.type.label')}" name="notifierType"
- list="#@java.util.LinkedHashMap@{ 'mail' : 'Mail', 'irc' : 'IRC', 'jabber' : 'Jabber', 'msn' : 'MSN'}"/>
+ list="#@java.util.LinkedHashMap@{'mail':'Mail', 'irc':'IRC', 'jabber':'Jabber', 'msn':'MSN'}"/>
</tbody>
</table>
<div class="functnbar3">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/performRelease.jsp Sun Sep 24 17:40:23 2006
@@ -13,11 +13,11 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<ww:if test="releaseId.equals(\"\")">
- <ww:textfield label="SCM Connection URL" name="scmUrl"/>
+ <ww:textfield label="SCM Connection URL" name="scmUrl" required="true"/>
<ww:textfield label="SCM Username" name="scmUsername"/>
<ww:textfield label="SCM Password" name="scmPassword"/>
- <ww:textfield label="SCM Tag" name="scmTag"/>
- <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
+ <ww:textfield label="SCM Tag" name="scmTag" required="true"/>
+ <ww:textfield label="SCM Tag Base" name="scmTagBase" required="true"/>
</ww:if>
<ww:textfield label="Maven Arguments" name="goals"/>
<ww:checkbox label="Use Release Profile" name="useReleaseProfile" value="true"/>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/prepareRelease.jsp Sun Sep 24 17:40:23 2006
@@ -13,10 +13,10 @@
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<ww:textfield label="SCM Username" name="scmUsername"/>
<ww:textfield label="SCM Password" name="scmPassword"/>
- <ww:textfield label="SCM Tag" name="scmTag"/>
- <ww:textfield label="SCM Tag Base" name="scmTagBase"/>
- <ww:textfield label="Preparation Goals" name="prepareGoals"/>
- </table>
+ <ww:textfield label="SCM Tag" name="scmTag" required="true"/>
+ <ww:textfield label="SCM Tag Base" name="scmTagBase" required="true"/>
+ <ww:textfield label="Preparation Goals" name="prepareGoals" required="true"/>
+ </table>
</div>
<ww:iterator value="projects">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp Sun Sep 24 17:40:23 2006
@@ -5,23 +5,17 @@
<html>
<ww:i18n name="localization.Continuum">
<head>
- <title><ww:text name="projectView.page.title"/></title>
+ <title><ww:text name="projectView.page.title"/></title>
</head>
- <body>
+
+ <body>
<div id="h3">
- <ww:action name="projectGroupTab" executeResult="true">
- <ww:param name="tabName" value="'Build Definitions'"/>
- </ww:action>
-
+
+ <jsp:include page="/navigations/ProjectGroupMenu.jsp">
+ <jsp:param name="tab" value="buildDefinition"/>
+ </jsp:include>
+
<h3>Project Group Build Definitions</h3>
-
- <div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
- <c1:data label="Group Id" name="projectGroup.groupId"/>
- <c1:data label="Description" name="projectGroup.description"/>
- </table>
- </div>
<ww:action name="groupBuildDefinitionSummary" executeResult="true" namespace="component">
<ww:param name="projectGroupId" value="%{projectGroupId}"/>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp?view=diff&rev=449533&r1=449532&r2=449533
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp Sun Sep 24 17:40:23 2006
@@ -3,89 +3,84 @@
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
-<ww:i18n name="localization.Continuum">
- <head>
- <title><ww:text name="projectView.page.title"/></title>
- </head>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="projectView.page.title"/></title>
+ </head>
+
+ <body>
+ <div id="h3">
+
+ <jsp:include page="/navigations/ProjectGroupMenu.jsp">
+ <jsp:param name="tab" value="members"/>
+ </jsp:include>
+
+<%--
+ <h3>Membership Actions</h3>
+
+ <div class="axial">
+ Scan for new Projects?
+ </div>
+--%>
+
+ <h3>Member Projects</h3>
+
+ <ec:table items="projectGroup.projects"
+ var="project"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row highlightRow="true">
+ <ec:column property="name" title="summary.projectTable.name" width="48%">
+ <ww:url id="projectViewUrl" action="projectView">
+ <ww:param name="projectId" value="${pageScope.project.id}"/>
+ </ww:url>
+ <ww:a href="%{projectViewUrl}">${pageScope.project.name}</ww:a>
+ </ec:column>
+ <ec:column property="editAction" title="Edit" width="1%">
+ <center>
+ <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}">
+ <ww:url id="editProjectUrl" action="projectEdit">
+ <ww:param name="projectId" value="${pageScope.project.id}"/>
+ <ww:param name="projectName" value="${pageScope.project.name}"/>
+ </ww:url>
+ <ww:a href="%{editProjectUrl}">
+ <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit" border="0">
+ </ww:a>
+ </c:when>
+ <c:otherwise>
+ <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit" title="Edit" border="0">
+ </c:otherwise>
+ </c:choose>
+ </center>
+ </ec:column>
+ <ec:column property="deleteAction" title="Remove" width="1%">
+ <center>
+ <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}">
+ <ww:url id="removeProjectUrl" action="deleteProject">
+ <ww:param name="projectId" value="${pageScope.project.id}"/>
+ <ww:param name="projectName" value="${pageScope.project.name}"/>
+ </ww:url>
+ <ww:a href="%{removeProjectUrl}">
+ <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete" border="0">
+ </ww:a>
+ </c:when>
+ <c:otherwise>
+ <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete" title="Delete" border="0">
+ </c:otherwise>
+ </c:choose>
+ </center>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </div>
+ </body>
+ </ww:i18n>
- <body>
- <div id="h3">
- <ww:action name="projectGroupTab" executeResult="true">
- <ww:param name="tabName" value="'Members'"/>
- </ww:action>
-
- <h3>Project Group Information</h3>
-
- <div class="axial">
- <table border="1" cellspacing="2" cellpadding="3" width="100%">
- <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
- <c1:data label="Group Id" name="projectGroup.groupId"/>
- <c1:data label="Description" name="projectGroup.description"/>
- </table>
- </div>
-
- <h3>Membership Actions</h3>
-
- <div class="axial">
- Scan for new Projects?
- </div>
-
- <h3>Member Projects</h3>
-
- <ec:table items="projectGroup.projects"
- var="project"
- showExports="false"
- showPagination="false"
- showStatusBar="false"
- filterable="false">
- <ec:row highlightRow="true">
- <ec:column property="name" title="summary.projectTable.name" width="48%">
- <ww:url id="projectViewUrl" action="projectView">
- <ww:param name="projectId" value="projectId"/>
- </ww:url>
- <ww:a href="%{projectViewUrl}">${pageScope.project.name}</ww:a>
- </ec:column>
- <ec:column property="editAction" title="Edit" width="1%" sortable="false">
- <center>
- <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}">
- <ww:url id="editProjectUrl" action="projectEdit">
- <ww:param name="projectId" value="${pageScope.project.id}"/>
- <ww:param name="projectName" value="${project.name}"/>
- </ww:url>
- <ww:a href="%{editProjectUrl}">
- <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit" border="0">
- </ww:a>
- </c:when>
- <c:otherwise>
- <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit" title="Edit" border="0">
- </c:otherwise>
- </c:choose>
- </center>
- </ec:column>
- <ec:column property="deleteAction" title="Remove" width="1%" sortable="false">
- <center>
- <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}">
- <ww:url id="removeProjectUrl" action="deleteProject">
- <ww:param name="projectId" value="${pageScope.project.id}"/>
- <ww:param name="projectName" value="${pageScope.project.name}"/>
- </ww:url>
- <ww:a href="%{removeProjectUrl">
- <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete" border="0">
- </ww:a>
- </c:when>
- <c:otherwise>
- <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete" title="Delete" border="0">
- </c:otherwise>
- </c:choose>
- </center>
- </ec:column>
- </ec:row>
- </ec:table>
- </div>
- </body>
-</ww:i18n>
</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"