You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2006/06/28 17:40:38 UTC
svn commit: r417796 [1/2] - in
/maven/continuum/trunk/continuum-webapp/src/main: resources/
resources/org/apache/maven/continuum/web/action/ webapp/WEB-INF/
Author: trygvis
Date: Wed Jun 28 08:40:37 2006
New Revision: 417796
URL: http://svn.apache.org/viewvc?rev=417796&view=rev
Log:
o Cleaning up XML files.
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionEditAction-buildDefinitionSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ConfigurationAction-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/LoginAction-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/osuser.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-application.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/validators.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/extremecomponents.tld
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionEditAction-buildDefinitionSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionEditAction-buildDefinitionSave-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionEditAction-buildDefinitionSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/BuildDefinitionEditAction-buildDefinitionSave-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,11 +1,11 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="buildFile">
- <field-validator type="required">
- <message key="BuildDefinition.buildFile.required"/>
- </field-validator>
- </field>
+ <field name="buildFile">
+ <field-validator type="required">
+ <message key="BuildDefinition.buildFile.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ConfigurationAction-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ConfigurationAction-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ConfigurationAction-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ConfigurationAction-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,24 +1,24 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="workingDirectory">
- <field-validator type="requiredstring">
- <message key="configuration.missing.workingDirectory"/>
- </field-validator>
- </field>
- <field name="buildOutputDirectory">
- <field-validator type="requiredstring">
- <message key="configuration.missing.buildOutputDirectory"/>
- </field-validator>
- </field>
- <field name="baseUrl">
- <field-validator type="requiredstring" short-circuit="true">
- <message key="configuration.missing.baseUrl"/>
- </field-validator>
- <field-validator type="url">
- <message key="configuration.invalid.baseUrl"/>
- </field-validator>
- </field>
+ <field name="workingDirectory">
+ <field-validator type="requiredstring">
+ <message key="configuration.missing.workingDirectory"/>
+ </field-validator>
+ </field>
+ <field name="buildOutputDirectory">
+ <field-validator type="requiredstring">
+ <message key="configuration.missing.buildOutputDirectory"/>
+ </field-validator>
+ </field>
+ <field name="baseUrl">
+ <field-validator type="requiredstring" short-circuit="true">
+ <message key="configuration.missing.baseUrl"/>
+ </field-validator>
+ <field-validator type="url">
+ <message key="configuration.invalid.baseUrl"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/IrcNotifierEditAction-ircNotifierSave-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,23 +1,23 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="host">
- <field-validator type="required">
- <message key="ircNotifier.host.required"/>
- </field-validator>
- </field>
- <field name="port">
- <field-validator type="int">
- <param name="min">0</param>
- <param name="max">65535</param>
- <message key="ircNotifier.port.invalid"/>
- </field-validator>
- </field>
- <field name="channel">
- <field-validator type="required">
- <message key="ircNotifier.channel.required"/>
- </field-validator>
- </field>
+ <field name="host">
+ <field-validator type="required">
+ <message key="ircNotifier.host.required"/>
+ </field-validator>
+ </field>
+ <field name="port">
+ <field-validator type="int">
+ <param name="min">0</param>
+ <param name="max">65535</param>
+ <message key="ircNotifier.port.invalid"/>
+ </field-validator>
+ </field>
+ <field name="channel">
+ <field-validator type="required">
+ <message key="ircNotifier.channel.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/JabberNotifierEditAction-jabberNotifierSave-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,33 +1,33 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="host">
- <field-validator type="required">
- <message key="jabberNotifier.host.required"/>
- </field-validator>
- </field>
- <field name="port">
- <field-validator type="int">
- <param name="min">0</param>
- <param name="max">65535</param>
- <message key="jabberNotifier.port.invalid"/>
- </field-validator>
- </field>
- <field name="login">
- <field-validator type="required">
- <message key="jabberNotifier.login.required"/>
- </field-validator>
- </field>
- <field name="password">
- <field-validator type="required">
- <message key="jabberNotifier.password.required"/>
- </field-validator>
- </field>
- <field name="address">
- <field-validator type="required">
- <message key="jabberNotifier.address.required"/>
- </field-validator>
- </field>
+ <field name="host">
+ <field-validator type="required">
+ <message key="jabberNotifier.host.required"/>
+ </field-validator>
+ </field>
+ <field name="port">
+ <field-validator type="int">
+ <param name="min">0</param>
+ <param name="max">65535</param>
+ <message key="jabberNotifier.port.invalid"/>
+ </field-validator>
+ </field>
+ <field name="login">
+ <field-validator type="required">
+ <message key="jabberNotifier.login.required"/>
+ </field-validator>
+ </field>
+ <field name="password">
+ <field-validator type="required">
+ <message key="jabberNotifier.password.required"/>
+ </field-validator>
+ </field>
+ <field name="address">
+ <field-validator type="required">
+ <message key="jabberNotifier.address.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/LoginAction-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/LoginAction-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/LoginAction-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/LoginAction-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,16 +1,16 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="username">
- <field-validator type="required">
- <message key="login.username.required"/>
- </field-validator>
- </field>
- <field name="password">
- <field-validator type="required">
- <message key="login.password.required"/>
- </field-validator>
- </field>
+ <field name="username">
+ <field-validator type="required">
+ <message key="login.username.required"/>
+ </field-validator>
+ </field>
+ <field name="password">
+ <field-validator type="required">
+ <message key="login.password.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MailNotifierEditAction-mailNotifierSave-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,11 +1,11 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="address">
- <field-validator type="required">
- <message key="mailNotifier.address.required"/>
- </field-validator>
- </field>
+ <field name="address">
+ <field-validator type="required">
+ <message key="mailNotifier.address.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/MsnNotifierEditAction-msnNotifierSave-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,21 +1,21 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="login">
- <field-validator type="required">
- <message key="jabberNotifier.login.required"/>
- </field-validator>
- </field>
- <field name="password">
- <field-validator type="required">
- <message key="jabberNotifier.password.required"/>
- </field-validator>
- </field>
- <field name="address">
- <field-validator type="required">
- <message key="jabberNotifier.address.required"/>
- </field-validator>
- </field>
+ <field name="login">
+ <field-validator type="required">
+ <message key="jabberNotifier.login.required"/>
+ </field-validator>
+ </field>
+ <field name="password">
+ <field-validator type="required">
+ <message key="jabberNotifier.password.required"/>
+ </field-validator>
+ </field>
+ <field name="address">
+ <field-validator type="required">
+ <message key="jabberNotifier.address.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-validation.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ProjectEditAction-validation.xml Wed Jun 28 08:40:37 2006
@@ -1,21 +1,21 @@
-<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
<validators>
- <field name="name">
- <field-validator type="required">
- <message key="projectEdit.name.required"/>
- </field-validator>
- </field>
- <field name="version">
- <field-validator type="required">
- <message key="projectEdit.version.required"/>
- </field-validator>
- </field>
- <field name="scmUrl">
- <field-validator type="required">
- <message key="projectEdit.scmUrl.required"/>
- </field-validator>
- </field>
+ <field name="name">
+ <field-validator type="required">
+ <message key="projectEdit.name.required"/>
+ </field-validator>
+ </field>
+ <field name="version">
+ <field-validator type="required">
+ <message key="projectEdit.version.required"/>
+ </field-validator>
+ </field>
+ <field name="scmUrl">
+ <field-validator type="required">
+ <message key="projectEdit.scmUrl.required"/>
+ </field-validator>
+ </field>
</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/osuser.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/osuser.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/osuser.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/osuser.xml Wed Jun 28 08:40:37 2006
@@ -1,16 +1,15 @@
<opensymphony-user>
- <provider class="com.opensymphony.user.provider.memory.MemoryAccessProvider" />
- <provider class="com.opensymphony.user.provider.memory.MemoryCredentialsProvider" />
- <provider class="com.opensymphony.user.provider.memory.MemoryProfileProvider" />
+ <provider class="com.opensymphony.user.provider.memory.MemoryAccessProvider"/>
+ <provider class="com.opensymphony.user.provider.memory.MemoryCredentialsProvider"/>
+ <provider class="com.opensymphony.user.provider.memory.MemoryProfileProvider"/>
- <!--
- Authenticators can take properties just like providers.
+ <!--
+ Authenticators can take properties just like providers.
- This smart authenticator should work for 'most' cases - it dynamically looks up
- the most appropriate authenticator for the current server.
- -->
- <authenticator class="org.apache.maven.continuum.security.ContinuumAuthenticator" />
+ This smart authenticator should work for 'most' cases - it dynamically looks up
+ the most appropriate authenticator for the current server.
+ -->
+ <authenticator class="org.apache.maven.continuum.security.ContinuumAuthenticator"/>
-
</opensymphony-user>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-application.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-application.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/plexus-application.xml Wed Jun 28 08:40:37 2006
@@ -98,31 +98,31 @@
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>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>
- </property>
- <property>
- <name>org.jpox.poid.transactionIsolation</name>
- <value>READ_UNCOMMITTED</value>
- </property>
+ <property>
+ <name>org.jpox.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ <property>
+ <name>org.jpox.poid.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
-->
<property>
<name>org.jpox.transactionIsolation</name>
@@ -141,6 +141,7 @@
<implementation>org.apache.maven.continuum.web.rememberme.DefaultRememberMeServices</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
+
<!--
| Logger manager
-->
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/validators.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/validators.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/validators.xml Wed Jun 28 08:40:37 2006
@@ -1,13 +1,13 @@
<validators>
- <validator name="required" class="com.opensymphony.webwork.validators.JavaScriptRequiredFieldValidator"/>
- <validator name="requiredstring" class="com.opensymphony.webwork.validators.JavaScriptRequiredStringValidator"/>
- <validator name="int" class="com.opensymphony.webwork.validators.JavaScriptIntRangeFieldValidator"/>
- <validator name="date" class="com.opensymphony.webwork.validators.JavaScriptDateRangeFieldValidator"/>
- <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="com.opensymphony.webwork.validators.JavaScriptEmailValidator"/>
- <validator name="url" class="com.opensymphony.webwork.validators.JavaScriptURLValidator"/>
- <validator name="visitor" class="com.opensymphony.webwork.validators.JavaScriptVisitorFieldValidator"/>
- <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
- <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
+ <validator name="required" class="com.opensymphony.webwork.validators.JavaScriptRequiredFieldValidator"/>
+ <validator name="requiredstring" class="com.opensymphony.webwork.validators.JavaScriptRequiredStringValidator"/>
+ <validator name="int" class="com.opensymphony.webwork.validators.JavaScriptIntRangeFieldValidator"/>
+ <validator name="date" class="com.opensymphony.webwork.validators.JavaScriptDateRangeFieldValidator"/>
+ <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="com.opensymphony.webwork.validators.JavaScriptEmailValidator"/>
+ <validator name="url" class="com.opensymphony.webwork.validators.JavaScriptURLValidator"/>
+ <validator name="visitor" class="com.opensymphony.webwork.validators.JavaScriptVisitorFieldValidator"/>
+ <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
</validators>
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?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed Jun 28 08:40:37 2006
@@ -1,223 +1,188 @@
<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.0.dtd">
<xwork>
+ <include file="webwork-default.xml"/>
+ <package name="default" extends="webwork-default">
- <include file="webwork-default.xml"/>
+ <interceptors>
+ <interceptor-stack name="defaultContinuumStack">
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="component"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="static-params"/>
+ <interceptor-ref name="params"/>
+ <!-- interceptor-ref name="conversionError"/ -->
+ <interceptor-ref name="validation"/>
+ <interceptor-ref name="workflow"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <default-interceptor-ref name="defaultContinuumStack"/>
+
+ <global-results>
+ <result name="error">error.jsp</result>
+ </global-results>
+
+ <action name="checkConfiguration" class="checkConfigurationAction">
+ <result name="input">/redirectToContinuumInitialization.jsp</result>
+ </action>
+
+ <action name="configuration" class="configurationAction">
+ <result name="input">configurationEdit.jsp</result>
+ <result name="success">configuration.jsp</result>
+ </action>
+
+ <action name="companyInfo" class="configurationAction">
+ <result name="success">/components/companyLogo.jsp</result>
+ </action>
+
+ <action name="login" class="loginAction">
+ <result name="input">login.jsp</result>
+ <result name="success" type="redirect">summary.action</result>
+ </action>
+
+ <action name="summary" class="summaryAction">
+ <result name="success">summary.jsp</result>
+ </action>
+
+ <action name="addMavenTwoProject" class="addMavenTwoProject">
+ <result name="input">addMavenTwoProject.jsp</result>
+ <result name="success" type="redirect">summary.action</result>
+ </action>
+
+ <action name="addMavenOneProject" class="addMavenOneProject">
+ <result name="input">addMavenOneProject.jsp</result>
+ <result name="success" type="redirect">summary.action</result>
+ </action>
+
+ <action name="addProject" class="addProject">
+ <result name="input">addProject.jsp</result>
+ <result name="success" type="redirect">summary.action</result>
+ </action>
+
+ <action name="deleteProject" class="deleteProject">
+ <result name="delete">deleteProject.jsp</result>
+ <result name="success" type="redirect">summary.action</result>
+ </action>
+
+ <action name="buildProject" class="buildProject">
+ <result name="success" type="redirect">summary.action</result>
+ </action>
+
+ <action name="projectView" class="projectView">
+ <result name="success">projectView.jsp</result>
+ </action>
+
+ <action name="projectEdit" class="projectEdit">
+ <result name="input">projectEdit.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="projectSave" class="projectEdit">
+ <result name="input">projectEdit.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="buildDefinitionEdit" class="buildDefinitionEdit">
+ <result name="input">buildDefinitionEdit.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="buildDefinitionSave" class="buildDefinitionEdit">
+ <result name="input">buildDefinitionEdit.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="deleteBuildDefinition" class="deleteBuildDefinition">
+ <result name="delete">deleteBuildDefinition.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="addBuildDefinition" class="addBuildDefinition">
+ <result name="input">buildDefinitionEdit.jsp</result>
+ </action>
+
+ <action name="deleteNotifier" class="deleteNotifier">
+ <result name="delete">deleteNotifier.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="addNotifier" class="addNotifier">
+ <result name="input">notifierSelectType.jsp</result>
+ <result name="mail_input">notifierMail.jsp</result>
+ <result name="irc_input">notifierIrc.jsp</result>
+ <result name="msn_input">notifierMsn.jsp</result>
+ <result name="jabber_input">notifierJabber.jsp</result>
+ </action>
+
+ <action name="mailNotifierEdit" class="mailNotifierEdit">
+ <result name="input">notifierMail.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="mailNotifierSave" class="mailNotifierEdit">
+ <result name="input">notifierMail.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="ircNotifierEdit" class="ircNotifierEdit">
+ <result name="input">notifierIrc.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="ircNotifierSave" class="ircNotifierEdit">
+ <result name="input">notifierIrc.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="jabberNotifierEdit" class="jabberNotifierEdit">
+ <result name="input">notifierJabber.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="jabberNotifierSave" class="jabberNotifierEdit">
+ <result name="input">notifierJabber.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="msnNotifierEdit" class="msnNotifierEdit">
+ <result name="input">notifierMsn.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="msnNotifierSave" class="msnNotifierEdit">
+ <result name="input">notifierMsn.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="buildResults" class="buildResults">
+ <result name="success">buildResults.jsp</result>
+ </action>
+
+ <action name="buildResult" class="buildResult">
+ <result name="success">buildResult.jsp</result>
+ </action>
+
+ <action name="workingCopy" class="workingCopy">
+ <result name="success">workingCopy.jsp</result>
+ </action>
+
+ <action name="schedules" class="schedules">
+ <result name="success">schedules.jsp</result>
+ </action>
+
+ <action name="addSchedule" class="addSchedule">
+ <result name="input">editSchedule.jsp</result>
+ <result name="success" type="chain">schedules</result>
+ </action>
+
+ <action name="editSchedule" class="editSchedule">
+ <result name="input">editSchedule.jsp</result>
+ <result name="success" type="chain">schedules</result>
+ </action>
- <package name="default" extends="webwork-default">
-
- <interceptors>
- <interceptor-stack name="defaultContinuumStack">
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="servlet-config"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="model-driven"/>
- <interceptor-ref name="component"/>
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="static-params"/>
- <interceptor-ref name="params"/>
- <!-- interceptor-ref name="conversionError"/ -->
- <interceptor-ref name="validation"/>
- <interceptor-ref name="workflow"/>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="defaultContinuumStack"/>
-
- <global-results>
- <result name="error">error.jsp</result>
- </global-results>
-
- <action name="checkConfiguration"
- class="checkConfigurationAction">
- <result name="input">/redirectToContinuumInitialization.jsp</result>
- </action>
-
- <action name="configuration"
- class="configurationAction">
- <result name="input">configurationEdit.jsp</result>
- <result name="success">configuration.jsp</result>
- </action>
-
- <action name="companyInfo"
- class="configurationAction">
- <result name="success">/components/companyLogo.jsp</result>
- </action>
-
- <action name="login"
- class="loginAction">
- <result name="input">login.jsp</result>
- <result name="success" type="redirect">summary.action</result>
- </action>
-
- <action name="summary"
- class="summaryAction">
- <result name="success">summary.jsp</result>
- </action>
-
- <action name="addMavenTwoProject"
- class="addMavenTwoProject">
- <result name="input">addMavenTwoProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
- </action>
-
- <action name="addMavenOneProject"
- class="addMavenOneProject">
- <result name="input">addMavenOneProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
- </action>
-
- <action name="addProject"
- class="addProject">
- <result name="input">addProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
- </action>
-
- <action name="deleteProject"
- class="deleteProject">
- <result name="delete">deleteProject.jsp</result>
- <result name="success" type="redirect">summary.action</result>
- </action>
-
- <action name="buildProject"
- class="buildProject">
- <result name="success" type="redirect">summary.action</result>
- </action>
-
- <action name="projectView"
- class="projectView">
- <result name="success">projectView.jsp</result>
- </action>
-
- <action name="projectEdit"
- class="projectEdit">
- <result name="input">projectEdit.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="projectSave"
- class="projectEdit">
- <result name="input">projectEdit.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="buildDefinitionEdit"
- class="buildDefinitionEdit">
- <result name="input">buildDefinitionEdit.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="buildDefinitionSave"
- class="buildDefinitionEdit">
- <result name="input">buildDefinitionEdit.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="deleteBuildDefinition"
- class="deleteBuildDefinition">
- <result name="delete">deleteBuildDefinition.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="addBuildDefinition"
- class="addBuildDefinition">
- <result name="input">buildDefinitionEdit.jsp</result>
- </action>
-
- <action name="deleteNotifier"
- class="deleteNotifier">
- <result name="delete">deleteNotifier.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="addNotifier"
- class="addNotifier">
- <result name="input">notifierSelectType.jsp</result>
- <result name="mail_input">notifierMail.jsp</result>
- <result name="irc_input">notifierIrc.jsp</result>
- <result name="msn_input">notifierMsn.jsp</result>
- <result name="jabber_input">notifierJabber.jsp</result>
- </action>
-
- <action name="mailNotifierEdit"
- class="mailNotifierEdit">
- <result name="input">notifierMail.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="mailNotifierSave"
- class="mailNotifierEdit">
- <result name="input">notifierMail.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="ircNotifierEdit"
- class="ircNotifierEdit">
- <result name="input">notifierIrc.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="ircNotifierSave"
- class="ircNotifierEdit">
- <result name="input">notifierIrc.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="jabberNotifierEdit"
- class="jabberNotifierEdit">
- <result name="input">notifierJabber.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="jabberNotifierSave"
- class="jabberNotifierEdit">
- <result name="input">notifierJabber.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="msnNotifierEdit"
- class="msnNotifierEdit">
- <result name="input">notifierMsn.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="msnNotifierSave"
- class="msnNotifierEdit">
- <result name="input">notifierMsn.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="buildResults"
- class="buildResults">
- <result name="success">buildResults.jsp</result>
- </action>
-
- <action name="buildResult"
- class="buildResult">
- <result name="success">buildResult.jsp</result>
- </action>
-
- <action name="workingCopy"
- class="workingCopy">
- <result name="success">workingCopy.jsp</result>
- </action>
-
- <action name="schedules"
- class="schedules">
- <result name="success">schedules.jsp</result>
- </action>
-
- <action name="addSchedule"
- class="addSchedule">
- <result name="input">editSchedule.jsp</result>
- <result name="success" type="chain">schedules</result>
- </action>
-
- <action name="editSchedule"
- class="editSchedule">
- <result name="input">editSchedule.jsp</result>
- <result name="success" type="chain">schedules</result>
- </action>
-
- </package>
+ </package>
</xwork>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld Wed Jun 28 08:40:37 2006
@@ -1,88 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
- <tlibversion>1.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>continuum</shortname>
- <uri>continuum</uri>
+ <tlibversion>1.1</tlibversion>
+ <jspversion>1.2</jspversion>
+ <shortname>continuum</shortname>
+ <uri>continuum</uri>
- <tag>
- <name>data</name>
- <tagclass>org.apache.maven.continuum.web.view.jsp.ui.DataTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>data tag</info>
- <attribute>
- <name>label</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
+ <tag>
+ <name>data</name>
+ <tagclass>org.apache.maven.continuum.web.view.jsp.ui.DataTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <info>data tag</info>
+ <attribute>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
- <tag>
- <name>submitcancel</name>
- <tagclass>org.apache.maven.continuum.web.view.jsp.ui.SubmitCancelTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>An HTML Submit-Cancel UI widget</info>
- <attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>cssClass</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>cssStyle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>label</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>labelposition</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>theme</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>template</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>align</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>cancel</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
+ <tag>
+ <name>submitcancel</name>
+ <tagclass>org.apache.maven.continuum.web.view.jsp.ui.SubmitCancelTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <info>An HTML Submit-Cancel UI widget</info>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cssClass</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cssStyle</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>label</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>labelposition</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>theme</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>template</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>align</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>cancel</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
</taglib>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml?rev=417796&r1=417795&r2=417796&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml Wed Jun 28 08:40:37 2006
@@ -1,8 +1,8 @@
<decorators defaultdir="/decorators">
- <decorator name="none" page="none.jsp">
- <pattern>/initializeConfiguration*</pattern>
- </decorator>
- <decorator name="default" page="default.jsp">
- <pattern>/*</pattern>
- </decorator>
+ <decorator name="none" page="none.jsp">
+ <pattern>/initializeConfiguration*</pattern>
+ </decorator>
+ <decorator name="default" page="default.jsp">
+ <pattern>/*</pattern>
+ </decorator>
</decorators>