You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2014/01/27 14:24:25 UTC
svn commit: r1561667 [2/3] - in /archiva/branches/archiva-1.3.x: ./
archiva-cli/ archiva-modules/archiva-base/archiva-artifact-converter/
archiva-modules/archiva-base/archiva-common/
archiva-modules/archiva-base/archiva-configuration/ archiva-modules/a...
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/UploadAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/UploadAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/UploadAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/UploadAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="groupId">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="indexPath">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,8 @@
-->
<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="organisationUrl">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="id">
@@ -27,7 +28,7 @@
<message>You must enter the repository identifier.</message>
</field-validator>
<!--field-validator type="regex">
- <param name="expression"><![CDATA[([A-Z][a-z][0-9])]]></param>
+ <param name="regex"><![CDATA[([A-Z][a-z][0-9])]]></param>
<message>Id must not have special characters.</message>
</field-validator-->
</field>
@@ -44,13 +45,13 @@
</field>
<field name="snapshotsInterval">
<field-validator type="regex">
- <param name="expression"><![CDATA[([0-9])]]></param>
+ <param name="regex"><![CDATA[([0-9])]]></param>
<message>The value must be numeric</message>
</field-validator>
</field>
<field name="releasesInterval">
<field-validator type="regex">
- <param name="expression"><![CDATA[([0-9])]]></param>
+ <param name="regex"><![CDATA[([0-9])]]></param>
<message>The value must be numeric</message>
</field-validator>
</field>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="id">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="id">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="method">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="organisationName">
@@ -28,7 +29,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^([-a-zA-Z0-9._/~:?!&=\\]|\s)+$</param>
+ <param name="regex">^([-a-zA-Z0-9._/~:?!&=\\]|\s)+$</param>
<message>Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
</field-validator>
</field>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnector-saveProxyConnector-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnector-saveProxyConnector-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnector-saveProxyConnector-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnector-saveProxyConnector-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="connector.sourceRepoId">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/database/DatabaseAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/database/DatabaseAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/database/DatabaseAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/database/DatabaseAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="cron">
<field-validator type="requiredstring">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<!-- validate temporarily-trimmed inputs, actual values are then carried over to the action class to be trimmed once more. -->
<validators>
@@ -29,7 +30,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/\\]+$</param>
+ <param name="regex">^[-a-zA-Z0-9._/\\]+$</param>
<message>Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\), underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -39,7 +40,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -49,7 +50,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -59,7 +60,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -67,7 +68,7 @@
<!-- no requiredstring validation, because there was none before(being consistent). -->
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]*$</param>
+ <param name="regex">^[a-zA-Z0-9._-]*$</param>
<message>Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -77,7 +78,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction-saveNetworkProxy-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
@@ -37,7 +38,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -48,7 +49,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9./:\\]+$</param>
+ <param name="regex">^[-a-zA-Z0-9./:\\]+$</param>
<message>Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\), dots(.), colons(:), and dashes(-).</message>
</field-validator>
</field>
@@ -59,7 +60,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
+ <param name="regex">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
<message>Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
</field-validator>
</field>
@@ -77,7 +78,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[0-9]+$</param>
+ <param name="regex">^[0-9]+$</param>
<message>Port must only contain numeric characters.</message>
</field-validator>
</field>
@@ -85,7 +86,7 @@
<!-- no requiredstring validation, because there was none before(being consistent). -->
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9.@/_\\]*$</param>
+ <param name="regex">^[-a-zA-Z0-9.@/_\\]*$</param>
<message>Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\), underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="repository.id">
@@ -28,7 +29,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -38,7 +39,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
+ <param name="regex">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
<message>Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
</field-validator>
</field>
@@ -46,7 +47,7 @@
<!-- no requiredstring validation, because there was none before(being consistent). -->
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
+ <param name="regex">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
<message>Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
</field-validator>
</field>
@@ -56,7 +57,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
+ <param name="regex">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
<message>Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="repository.id">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="repository.id">
@@ -28,7 +29,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[a-zA-Z0-9._-]+$</param>
+ <param name="regex">^[a-zA-Z0-9._-]+$</param>
<message>Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
@@ -38,7 +39,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
+ <param name="regex">^[-a-zA-Z0-9._/~:?!&=\\]+$</param>
<message>Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
</field-validator>
</field>
@@ -46,7 +47,7 @@
<!-- no requiredstring validation, because there was none before(being consistent). -->
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
+ <param name="regex">^[-a-zA-Z0-9._/~:?!&=\\]*$</param>
<message>Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).</message>
</field-validator>
</field>
@@ -56,7 +57,7 @@
</field-validator>
<field-validator type="regex">
<param name="trim">true</param>
- <param name="expression">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
+ <param name="regex">^([a-zA-Z0-9.)/_(-]|\s)+$</param>
<message>Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-).</message>
</field-validator>
</field>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction-validation.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction-validation.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction-validation.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction-validation.xml Mon Jan 27 13:24:23 2014
@@ -18,8 +18,9 @@
~ under the License.
-->
-<!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
+ "-//Apache Struts//XWork Validator 1.0.2//EN"
+ "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
<validators>
<field name="repository.id">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties Mon Jan 27 13:24:23 2014
@@ -28,7 +28,5 @@ struts.multipart.parser=jakarta
# 10M default
struts.multipart.maxSize=10485760
-# TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
-
# Localization
struts.custom.i18n.resources=org.codehaus.plexus.redback.struts2.default,org.apache.maven.archiva.redback.custom
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml Mon Jan 27 13:24:23 2014
@@ -22,51 +22,12 @@
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
+ <constant name="struts.action.excludePattern" value="^/$,^/repository/.*" />
+
<!-- Include plexus-security xwork configurations. -->
<include file="struts-security.xml"/>
- <package name="default-stacks" extends="struts-default">
- <interceptors>
- <interceptor-stack name="defaultStack">
- <interceptor-ref name="exception"/>
- <interceptor-ref name="alias"/>
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="i18n"/>
- <interceptor-ref name="chain"/>
- <interceptor-ref name="debugging"/>
- <interceptor-ref name="profiling"/>
- <interceptor-ref name="scopedModelDriven"/>
- <interceptor-ref name="modelDriven"/>
- <interceptor-ref name="fileUpload"/>
- <interceptor-ref name="checkbox"/>
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="params">
- <param name="excludeParams">dojo\..*,^struts\..*,.*\\.*,.*\(.*,.*\).*,.*@.*</param>
- </interceptor-ref>
- <interceptor-ref name="conversionError"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- </interceptor-stack>
-
- <interceptor-stack name="basicStack">
- <interceptor-ref name="exception"/>
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="checkbox"/>
- <interceptor-ref name="params">
- <param name="excludeParams">dojo\..*,^struts\..*,.*\\.*,.*\(.*,.*\).*,.*@.*</param>
- </interceptor-ref>
- <interceptor-ref name="conversionError"/>
- </interceptor-stack>
- </interceptors>
- </package>
-
- <package name="base" extends="default-stacks">
+ <package name="base" extends="struts-default">
<interceptors>
<interceptor name="configuration" class="configurationInterceptor"/>
<interceptor name="redbackForceAdminUser" class="redbackForceAdminUserInterceptor"/>
@@ -130,43 +91,43 @@
<global-results>
<!-- The following security-* result names arrive from the plexus-security package -->
- <result name="security-login-success" type="redirect-action">index</result>
- <result name="security-login-cancel" type="redirect-action">index</result>
- <result name="security-login-locked" type="redirect-action">
+ <result name="security-login-success" type="redirectAction">index</result>
+ <result name="security-login-cancel" type="redirectAction">index</result>
+ <result name="security-login-locked" type="redirectAction">
<param name="actionName">index</param>
<param name="infoMessage">Account Locked</param>
</result>
- <result name="security-logout" type="redirect-action">index</result>
- <result name="requires-authentication" type="redirect-action">
+ <result name="security-logout" type="redirectAction">index</result>
+ <result name="requires-authentication" type="redirectAction">
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
- <result name="requires-authorization" type="redirect-action">
+ <result name="requires-authorization" type="redirectAction">
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
- <result name="security-register-success" type="redirect-action">
+ <result name="security-register-success" type="redirectAction">
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
- <result name="security-register-cancel" type="redirect-action">
+ <result name="security-register-cancel" type="redirectAction">
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
- <result name="security-account-success" type="redirect-action">index</result>
- <result name="security-account-cancel" type="redirect-action">
+ <result name="security-account-success" type="redirectAction">index</result>
+ <result name="security-account-cancel" type="redirectAction">
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
- <result name="security-admin-user-created" type="redirect-action">
+ <result name="security-admin-user-created" type="redirectAction">
<param name="actionName">login</param>
<param name="namespace">/security</param>
</result>
- <result name="security-admin-user-needed" type="redirect-action">
+ <result name="security-admin-user-needed" type="redirectAction">
<param name="actionName">addadmin</param>
<param name="namespace">/security</param>
</result>
- <result name="security-must-change-password" type="redirect-action">
+ <result name="security-must-change-password" type="redirectAction">
<param name="actionName">password</param>
<param name="namespace">/security</param>
</result>
@@ -187,7 +148,7 @@
allowing plexus-security to call out from its own set of actions
into the application webapp, using global result names. -->
<action name="redbackRedirect" class="redback-redirect" method="redirect">
- <result type="redirect-action">browse</result>
+ <result type="redirectAction">browse</result>
</action>
<action name="index" class="searchAction" method="input">
@@ -212,13 +173,21 @@
<action name="upload" class="uploadAction" method="input">
<result name="input">/WEB-INF/jsp/upload.jsp</result>
+ </action>
+
+ <action name="upload_submit" class="uploadAction" method="doUpload">
+ <result name="input">/WEB-INF/jsp/upload.jsp</result>
<result name="error">/WEB-INF/jsp/upload.jsp</result>
<result name="success">/WEB-INF/jsp/upload.jsp</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
<interceptor-ref name="fileUpload"/>
</action>
- <action name="deleteArtifact" class="deleteArtifactAction" method="input">
+ <action name="deleteArtifact" class="deleteArtifactAction" method="input">
+ <result name="input">/WEB-INF/jsp/deleteArtifact.jsp</result>
+ </action>
+
+ <action name="deleteArtifact_submit" class="deleteArtifactAction" method="doDelete">
<result name="input">/WEB-INF/jsp/deleteArtifact.jsp</result>
<result name="error">/WEB-INF/jsp/deleteArtifact.jsp</result>
<result name="success">/WEB-INF/jsp/deleteArtifact.jsp</result>
@@ -277,7 +246,7 @@
</package>
- <package name="components" namespace="/components" extends="default-stacks">
+ <package name="components" namespace="/components" extends="struts-default">
<default-interceptor-ref name="basicStack"/>
<action name="companyInfo" class="organisationInfo">
<result>/WEB-INF/jsp/components/companyLogo.jsp</result>
@@ -300,7 +269,7 @@
<action name="addRepositoryGroup" class="repositoryGroupsAction" method="addRepositoryGroup">
<result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
+ <result name="success" type="redirectAction">repositoryGroups</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -316,7 +285,7 @@
<action name="deleteRepositoryGroup" class="deleteRepositoryGroupAction" method="delete">
<result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
<result name="error">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
+ <result name="success" type="redirectAction">repositoryGroups</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -325,28 +294,28 @@
<action name="addRepositoryToGroup" class="repositoryGroupsAction" method="addRepositoryToGroup">
<result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
+ <result name="success" type="redirectAction">repositoryGroups</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="removeRepositoryFromGroup" class="repositoryGroupsAction" method="removeRepositoryFromGroup">
<result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
+ <result name="success" type="redirectAction">repositoryGroups</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="sortDownRepositoryFromGroup" class="sortRepositoriesAction" method="sortDown">
<result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
+ <result name="success" type="redirectAction">repositoryGroups</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="sortUpRepositoryFromGroup" class="sortRepositoriesAction" method="sortUp">
<result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
<result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
+ <result name="success" type="redirectAction">repositoryGroups</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
@@ -354,25 +323,34 @@
<action name="repositories" class="repositoriesAction" method="input">
<result name="input">/WEB-INF/jsp/admin/repositories.jsp</result>
- <result name="confirm" type="redirect-action">deleteRepository</result>
+ <result name="confirm" type="redirectAction">deleteRepository</result>
</action>
<action name="indexRepository" class="schedulerAction" method="scanRepository">
- <result type="redirect-action">repositories</result>
+ <result type="redirectAction">repositories</result>
</action>
<action name="addRepository" class="addManagedRepositoryAction" method="input">
<result name="input">/WEB-INF/jsp/admin/addRepository.jsp</result>
+ </action>
+
+ <action name="addRepository_commit" class="addManagedRepositoryAction" method="commit">
+ <result name="input">/WEB-INF/jsp/admin/addRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/addRepository.jsp</result>
<result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
+ <result name="success" type="redirectAction">repositories</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="editRepository" class="editManagedRepositoryAction" method="input">
<result name="input">/WEB-INF/jsp/admin/editRepository.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="editRepository_commit" class="editManagedRepositoryAction" method="commit">
+ <result name="input">/WEB-INF/jsp/admin/editRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/editRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
+ <result name="success" type="redirectAction">repositories</result>
<result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
@@ -387,7 +365,7 @@
<action name="deleteRepository" class="deleteManagedRepositoryAction" method="delete">
<result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
+ <result name="success" type="redirectAction">repositories</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -395,15 +373,20 @@
<action name="addRemoteRepository" class="addRemoteRepositoryAction" method="input">
<result name="input">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="addRemoteRepository_commit" class="addRemoteRepositoryAction" method="commit">
+ <result name="input">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
+ <result name="success" type="redirectAction">repositories</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="editRemoteRepository" class="editRemoteRepositoryAction" method="input">
<result name="input">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
+ <result name="success" type="redirectAction">repositories</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
@@ -415,7 +398,7 @@
<action name="deleteRemoteRepository" class="deleteRemoteRepositoryAction" method="delete">
<result name="input">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
+ <result name="success" type="redirectAction">repositories</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
@@ -427,31 +410,31 @@
<action name="addProxyConnector" class="addProxyConnectorAction" method="input">
<result name="input">/WEB-INF/jsp/admin/addProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="editProxyConnector" class="editProxyConnectorAction" method="input">
<result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="sortUpProxyConnector" class="sortProxyConnectorsAction" method="sortUp">
<result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="sortDownProxyConnector" class="sortProxyConnectorsAction" method="sortDown">
<result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="deleteProxyConnector" class="deleteProxyConnectorAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/deleteProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -459,13 +442,13 @@
<action name="enableProxyConnector" class="enableProxyConnectorAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/enableProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="disableProxyConnector" class="disableProxyConnectorAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/disableProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
+ <result name="success" type="redirectAction">proxyConnectors</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -480,19 +463,19 @@
<action name="addNetworkProxy" class="configureNetworkProxyAction" method="add">
<result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
+ <result name="success" type="redirectAction">networkProxies</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="editNetworkProxy" class="configureNetworkProxyAction" method="edit">
<result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
+ <result name="success" type="redirectAction">networkProxies</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="saveNetworkProxy" class="configureNetworkProxyAction" method="save">
<result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
+ <result name="success" type="redirectAction">networkProxies</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -500,7 +483,14 @@
<action name="deleteNetworkProxy" class="configureNetworkProxyAction" method="confirm">
<result name="input">/WEB-INF/jsp/admin/deleteNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
+ <interceptor-ref name="configuredPrepareParamsStack">
+ <param name="tokenSession.includeMethods">*</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="deleteNetworkProxy_submit" class="configureNetworkProxyAction" method="delete">
+ <result name="input">/WEB-INF/jsp/admin/deleteNetworkProxy.jsp</result>
+ <result name="success" type="redirectAction">networkProxies</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
@@ -510,11 +500,45 @@
<action name="repositoryScanning" class="repositoryScanningAction" method="input">
<result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
- <result name="success" type="redirect-action">
+ </action>
+
+ <action name="repositoryScanning_addFiletypePattern" class="repositoryScanningAction" method="addFiletypePattern">
+ <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
+ <result name="success" type="redirectAction">
<param name="actionName">repositoryScanning</param>
</result>
<interceptor-ref name="configuredArchivaStack">
- <param name="tokenSession.includeMethods">removeFiletypePattern,addFiletypePattern,updateKnownConsumers,updateInvalidConsumers</param>
+ <param name="tokenSession.includeMethods">addFiletypePattern</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="repositoryScanning_removeFiletypePattern" class="repositoryScanningAction" method="removeFiletypePattern">
+ <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
+ <result name="success" type="redirectAction">
+ <param name="actionName">repositoryScanning</param>
+ </result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">removeFiletypePattern</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="repositoryScanning_updateKnownConsumers" class="repositoryScanningAction" method="updateKnownConsumers">
+ <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
+ <result name="success" type="redirectAction">
+ <param name="actionName">repositoryScanning</param>
+ </result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">updateKnownConsumers</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="repositoryScanning_updateInvalidConsumers" class="repositoryScanningAction" method="updateInvalidConsumers">
+ <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
+ <result name="success" type="redirectAction">
+ <param name="actionName">repositoryScanning</param>
+ </result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">updateInvalidConsumers</param>
</interceptor-ref>
</action>
@@ -522,16 +546,40 @@
<action name="database" class="databaseAction" method="input">
<result name="input">/WEB-INF/jsp/admin/database.jsp</result>
- <result name="success" type="redirect-action">
+ </action>
+
+ <action name="database_updateSchedule" class="databaseAction" method="updateSchedule">
+ <result name="input">/WEB-INF/jsp/admin/database.jsp</result>
+ <result name="success" type="redirectAction">
+ <param name="actionName">database</param>
+ </result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">updateSchedule</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="database_updateUnprocessedConsumers" class="databaseAction" method="updateUnprocessedConsumers">
+ <result name="input">/WEB-INF/jsp/admin/database.jsp</result>
+ <result name="success" type="redirectAction">
<param name="actionName">database</param>
</result>
<interceptor-ref name="configuredArchivaStack">
- <param name="tokenSession.includeMethods">updateSchedule,updateUnprocessedConsumers,updateCleanupConsumers</param>
+ <param name="tokenSession.includeMethods">updateUnprocessedConsumers</param>
+ </interceptor-ref>
+ </action>
+
+ <action name="database_updateCleanupConsumers" class="databaseAction" method="updateCleanupConsumers">
+ <result name="input">/WEB-INF/jsp/admin/database.jsp</result>
+ <result name="success" type="redirectAction">
+ <param name="actionName">database</param>
+ </result>
+ <interceptor-ref name="configuredArchivaStack">
+ <param name="tokenSession.includeMethods">updateCleanupConsumers</param>
</interceptor-ref>
</action>
<action name="updateDatabase" class="schedulerAction" method="updateDatabase">
- <result type="redirect-action">database</result>
+ <result type="redirectAction">database</result>
</action>
<!-- .\ CONFIGURATION \.___________________________________________ -->
@@ -546,7 +594,7 @@
<action name="saveAppearance" class="editOrganisationInfo">
<result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
- <result type="redirect-action">
+ <result type="redirectAction">
<param name="actionName">configureAppearance</param>
<param name="namespace">/admin</param>
</result>
@@ -560,22 +608,26 @@
<action name="legacyArtifactPath" class="legacyArtifactPathAction" method="input">
<result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
- <result name="success" type="redirect-action">
+ <result name="success" type="redirectAction">
<param name="actionName">legacyArtifactPath</param>
</result>
</action>
<action name="addLegacyArtifactPath" class="addLegacyArtifactPathAction" method="input">
<result name="input">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
+ </action>
+
+ <action name="addLegacyArtifactPath_commit" class="addLegacyArtifactPathAction" method="commit">
+ <result name="input">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
<result name="error">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
- <result name="success" type="redirect-action">legacyArtifactPath</result>
+ <result name="success" type="redirectAction">legacyArtifactPath</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<action name="deleteLegacyArtifactPath" class="deleteLegacyArtifactPathAction" method="delete">
<result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
<result name="error">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
- <result name="success" type="redirect-action">legacyArtifactPath</result>
+ <result name="success" type="redirectAction">legacyArtifactPath</result>
<interceptor-ref name="configuredPrepareParamsStack">
<param name="tokenSession.includeMethods">*</param>
</interceptor-ref>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml Mon Jan 27 13:24:23 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+ "-//Apache Struts//XWork Validator Config 1.0//EN"
+ "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd">
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp Mon Jan 27 13:24:23 2014
@@ -82,13 +82,13 @@
</ul>
</s:if>
- <s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
- <s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
- <s:textfield name="groupId" label="GroupId" size="20" required="true"/>
- <s:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>
- <s:textfield name="version" label="Version" size="20" required="true"/>
- <s:textfield name="classifier" label="Classifier" size="20" required="false"/>
- <s:textfield name="type" label="Type" size="20" required="true"/>
+ <s:form method="post" action="addLegacyArtifactPath_commit" namespace="/admin" validate="true">
+ <s:textfield name="legacyArtifactPath.path" label="Path" size="50" requiredLabel="true" onchange="parse( this.value )"/>
+ <s:textfield name="groupId" label="GroupId" size="20" requiredLabel="true"/>
+ <s:textfield name="artifactId" label="ArtifactId" size="20" requiredLabel="true"/>
+ <s:textfield name="version" label="Version" size="20" requiredLabel="true"/>
+ <s:textfield name="classifier" label="Classifier" size="20" requiredLabel="false"/>
+ <s:textfield name="type" label="Type" size="20" requiredLabel="true"/>
<s:submit value="Add Legacy Artifact Path"/>
</s:form>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp Mon Jan 27 13:24:23 2014
@@ -33,8 +33,8 @@
<div id="contentArea">
<s:actionmessage/>
- <s:form method="post" action="addRemoteRepository!commit" namespace="/admin" validate="true">
- <s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
+ <s:form method="post" action="addRemoteRepository_commit" namespace="/admin" validate="true">
+ <s:textfield name="repository.id" label="Identifier" size="10" requiredLabel="true"/>
<%@ include file="/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf" %>
<s:submit value="Add Repository"/>
</s:form>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp Mon Jan 27 13:24:23 2014
@@ -46,8 +46,8 @@
</s:iterator>
</ul>
</s:if>
- <s:form method="post" action="addRepository!commit" namespace="/admin" validate="true">
- <s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
+ <s:form method="post" action="addRepository_commit" namespace="/admin" validate="true">
+ <s:textfield name="repository.id" label="Identifier" size="10" requiredLabel="true"/>
<%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
<s:submit value="Add Repository"/>
</s:form>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmAddRepository.jsp Mon Jan 27 13:24:23 2014
@@ -126,8 +126,8 @@
<s:hidden name="repository.deleteReleasedSnapshots" value="%{#attr.repository.deleteReleasedSnapshots}"/>
<c:choose>
- <c:when test="${action == 'addRepository'}">
- <s:submit value="Save" method="confirmAdd"/>
+ <c:when test="${action == 'addRepository_commit'}">
+ <s:submit value="Save" name="confirm" />
</c:when>
<c:otherwise>
<s:submit value="Save" method="confirmUpdate"/>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp Mon Jan 27 13:24:23 2014
@@ -46,7 +46,7 @@
<h2>Database - Unprocessed Artifacts Scanning</h2>
- <s:form method="post" action="database!updateSchedule"
+ <s:form method="post" action="database_updateSchedule"
namespace="/admin" validate="false" theme="simple">
<s:token/>
<table>
@@ -73,7 +73,7 @@
<c:otherwise>
<%-- Display the consumers. --%>
- <s:form method="post" action="database!updateUnprocessedConsumers"
+ <s:form method="post" action="database_updateUnprocessedConsumers"
namespace="/admin" validate="false" theme="simple">
<s:token/>
<table class="consumers">
@@ -129,7 +129,7 @@
<c:otherwise>
<%-- Display the consumers. --%>
- <s:form method="post" action="database!updateCleanupConsumers"
+ <s:form method="post" action="database_updateCleanupConsumers"
namespace="/admin" validate="false" theme="simple">
<s:token/>
<table class="consumers">
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp Mon Jan 27 13:24:23 2014
@@ -52,7 +52,7 @@
Are you sure you want to delete network proxy <code><c:out value="${proxyid}" /></code> ?
</p>
- <s:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
+ <s:form method="post" action="deleteNetworkProxy_submit" namespace="/admin" validate="true">
<s:hidden name="proxyid"/>
<s:token/>
<s:submit value="Delete"/>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editNetworkProxy.jsp Mon Jan 27 13:24:23 2014
@@ -70,7 +70,7 @@
<s:hidden name="proxy.id"/>
</c:when>
<c:otherwise>
- <s:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
+ <s:textfield name="proxy.id" label="Identifier" size="10" requiredLabel="true"/>
</c:otherwise>
</c:choose>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp Mon Jan 27 13:24:23 2014
@@ -48,7 +48,7 @@
</s:iterator>
</ul>
</s:if>
- <s:form method="post" action="editRepository!commit" namespace="/admin" validate="false">
+ <s:form method="post" action="editRepository_commit" namespace="/admin" validate="false">
<s:hidden name="repository.id"/>
<s:label label="ID" name="repository.id" />
<%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/networkProxyForm.jspf Mon Jan 27 13:24:23 2014
@@ -20,8 +20,8 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<s:textfield name="proxy.protocol" label="Protocol" size="5" required="true"/>
-<s:textfield name="proxy.host" label="Hostname" size="50" required="true"/>
-<s:textfield name="proxy.port" label="Port" size="5" required="true" />
-<s:textfield name="proxy.username" label="Username" size="25" required="false" />
-<s:password name="proxy.password" label="Password" size="25" required="false" />
+<s:textfield name="proxy.protocol" label="Protocol" size="5" requiredLabel="true"/>
+<s:textfield name="proxy.host" label="Hostname" size="50" requiredLabel="true"/>
+<s:textfield name="proxy.port" label="Port" size="5" requiredLabel="true" />
+<s:textfield name="proxy.username" label="Username" size="25" requiredLabel="false" />
+<s:password name="proxy.password" label="Password" size="25" requiredLabel="false" />
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf Mon Jan 27 13:24:23 2014
@@ -28,11 +28,11 @@
<s:hidden name="connector.order" />
-<s:select name="connector.proxyId" list="proxyIdOptions" label="Network Proxy" required="true"/>
+<s:select name="connector.proxyId" list="proxyIdOptions" label="Network Proxy" requiredLabel="true"/>
<s:select name="connector.sourceRepoId" list="managedRepoIdList"
- label="Managed Repository" required="true"/>
+ label="Managed Repository" requiredLabel="true"/>
<s:select name="connector.targetRepoId" list="remoteRepoIdList"
- label="Remote Repository" required="true"/>
+ label="Remote Repository" requiredLabel="true"/>
<tr>
<td valign="top"><label>Policies:</label>
@@ -42,7 +42,7 @@
<c:forEach items="${policyMap}" var="policy" varStatus="i">
<tr>
<td>
- <s:label for="policy_%{#attr.policy.key}" required="true"
+ <s:label for="policy_%{#attr.policy.key}" requiredLabel="true"
theme="simple">${policy.value.name}:
</s:label>
</td>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf Mon Jan 27 13:24:23 2014
@@ -20,10 +20,10 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:textfield name="repository.name" label="Name" size="50" required="true"/>
-<s:textfield name="repository.url" label="URL" size="50" required="true"/>
-<s:textfield name="repository.username" label="Username" size="25" required="false"/>
-<s:password name="repository.password" label="Password" size="25" required="false"/>
-<s:textfield name="repository.timeout" label="Timeout in seconds" size="3" required="false"/>
+<s:textfield name="repository.name" label="Name" size="50" requiredLabel="true"/>
+<s:textfield name="repository.url" label="URL" size="50" requiredLabel="true"/>
+<s:textfield name="repository.username" label="Username" size="25" requiredLabel="false"/>
+<s:password name="repository.password" label="Password" size="25" requiredLabel="false"/>
+<s:textfield name="repository.timeout" label="Timeout in seconds" size="3" requiredLabel="false"/>
<s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
name="repository.layout" label="Type"/>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf Mon Jan 27 13:24:23 2014
@@ -20,12 +20,12 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<s:textfield name="repository.name" label="Name" size="50" required="true"/>
-<s:textfield name="repository.location" label="Directory" size="50" required="true"/>
+<s:textfield name="repository.name" label="Name" size="50" requiredLabel="true"/>
+<s:textfield name="repository.location" label="Directory" size="50" requiredLabel="true"/>
<s:textfield name="repository.indexDir" label="Index Directory" size="50"/>
<s:select list="#@java.util.LinkedHashMap@{'default' : 'Maven 2.x Repository', 'legacy' : 'Maven 1.x Repository'}"
name="repository.layout" label="Type"/>
-<s:textfield name="repository.refreshCronExpression" label="Cron" size="40" required="true"/>
+<s:textfield name="repository.refreshCronExpression" label="Cron" size="40" requiredLabel="true"/>
<s:textfield name="repository.daysOlder" label="Repository Purge By Days Older Than" size="5"/>
<s:textfield name="repository.retentionCount" label="Repository Purge By Retention Count" size="5"/>
<s:checkbox name="repository.releases" value="repository.releases" label="Releases Included"/>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp Mon Jan 27 13:24:23 2014
@@ -1,131 +1,131 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- --%>
-
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
-<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
-
-<html>
-<head>
- <title>Administration - Legacy Support</title>
- <s:head/>
-</head>
-
-<body>
-
-<h1>Administration - Legacy Artifact Path Resolution</h1>
-
-<div id="contentArea">
-
-<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
-<s:if test="hasActionErrors()">
- <ul>
- <s:iterator value="actionErrors">
- <li><span class="errorMessage"><s:property escape="true" /></span></li>
- </s:iterator>
- </ul>
- </s:if>
- <s:if test="hasActionMessages()">
- <ul>
- <s:iterator value="actionMessages">
- <li><span class="actionMessage"><s:property escape="true" /></span></li>
- </s:iterator>
- </ul>
- </s:if>
-
-<div class="admin">
-<div class="controls">
- <redback:ifAuthorized permission="archiva-manage-configuration">
- <s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
- <s:a href="%{addLegacyArtifactPathUrl}">
- <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
- Add
- </s:a>
- </redback:ifAuthorized>
-</div>
-<h2>Path Mappings</h2>
-
-<c:choose>
-<c:when test="${empty (legacyArtifactPaths)}">
- <%-- No paths. --%>
- <p><strong>There are no legacy artifact paths configured yet.</strong></p>
-</c:when>
-<c:otherwise>
- <%-- Display the paths. --%>
-
-<c:forEach items="${legacyArtifactPaths}" var="legacyArtifactPath" varStatus="i">
-<c:choose>
- <c:when test='${(i.index)%2 eq 0}'>
- <c:set var="rowColor" value="dark" scope="page"/>
- </c:when>
- <c:otherwise>
- <c:set var="rowColor" value="lite" scope="page"/>
- </c:otherwise>
-</c:choose>
-
-<div class="legacyArtifactPath ${rowColor}">
-
-<div class="controls">
- <%-- TODO: make some icons --%>
- <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <s:token/>
- <s:url id="deleteLegacyArtifactPath" encode="true" action="deleteLegacyArtifactPath">
- <s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>
- <s:param name="struts.token.name">struts.token</s:param>
- <s:param name="struts.token"><s:property value="struts.token"/></s:param>
- </s:url>
- <s:a href="%{deleteLegacyArtifactPath}">
- <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
- Delete
- </s:a>
- </redback:ifAnyAuthorized>
-</div>
-
-<%-- used c:out in displaying EL's so that they would be escaped --%>
-<table class="infoTable">
-<tr>
- <th>Path</th>
- <td>
- <code><c:out value="${legacyArtifactPath.path}" /></code>
- </td>
-</tr>
-<tr>
- <th>Artifact</th>
- <td>
- <code><c:out value="${legacyArtifactPath.artifact}" /></code>
- </td>
-</tr>
-</table>
-
-</div>
-</c:forEach>
-
-</c:otherwise>
-</c:choose>
-
-
-
-</div>
-
-</div>
-
-</body>
-</html>
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
+<%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
+
+<html>
+<head>
+ <title>Administration - Legacy Support</title>
+ <s:head/>
+</head>
+
+<body>
+
+<h1>Administration - Legacy Artifact Path Resolution</h1>
+
+<div id="contentArea">
+
+<%-- changed the structure of displaying errorMessages & actionMessages in order for them to be escaped. --%>
+<s:if test="hasActionErrors()">
+ <ul>
+ <s:iterator value="actionErrors">
+ <li><span class="errorMessage"><s:property escape="true" /></span></li>
+ </s:iterator>
+ </ul>
+ </s:if>
+ <s:if test="hasActionMessages()">
+ <ul>
+ <s:iterator value="actionMessages">
+ <li><span class="actionMessage"><s:property escape="true" /></span></li>
+ </s:iterator>
+ </ul>
+ </s:if>
+
+<div class="admin">
+<div class="controls">
+ <redback:ifAuthorized permission="archiva-manage-configuration">
+ <s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
+ <s:a href="%{addLegacyArtifactPathUrl}">
+ <img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
+ Add
+ </s:a>
+ </redback:ifAuthorized>
+</div>
+<h2>Path Mappings</h2>
+
+<c:choose>
+<c:when test="${empty (legacyArtifactPaths)}">
+ <%-- No paths. --%>
+ <p><strong>There are no legacy artifact paths configured yet.</strong></p>
+</c:when>
+<c:otherwise>
+ <%-- Display the paths. --%>
+
+<c:forEach items="${legacyArtifactPaths}" var="legacyArtifactPath" varStatus="i">
+<c:choose>
+ <c:when test='${(i.index)%2 eq 0}'>
+ <c:set var="rowColor" value="dark" scope="page"/>
+ </c:when>
+ <c:otherwise>
+ <c:set var="rowColor" value="lite" scope="page"/>
+ </c:otherwise>
+</c:choose>
+
+<div class="legacyArtifactPath ${rowColor}">
+
+<div class="controls">
+ <%-- TODO: make some icons --%>
+ <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
+ <s:token/>
+ <s:url id="deleteLegacyArtifactPath" encode="true" action="deleteLegacyArtifactPath">
+ <s:param name="path" value="%{#attr.legacyArtifactPath.path}"/>
+ <s:param name="struts.token.name">token</s:param>
+ <s:param name="token"><s:property value="token"/></s:param>
+ </s:url>
+ <s:a href="%{deleteLegacyArtifactPath}">
+ <img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
+ Delete
+ </s:a>
+ </redback:ifAnyAuthorized>
+</div>
+
+<%-- used c:out in displaying EL's so that they would be escaped --%>
+<table class="infoTable">
+<tr>
+ <th>Path</th>
+ <td>
+ <code><c:out value="${legacyArtifactPath.path}" /></code>
+ </td>
+</tr>
+<tr>
+ <th>Artifact</th>
+ <td>
+ <code><c:out value="${legacyArtifactPath.artifact}" /></code>
+ </td>
+</tr>
+</table>
+
+</div>
+</c:forEach>
+
+</c:otherwise>
+</c:choose>
+
+
+
+</div>
+
+</div>
+
+</body>
+</html>
Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp?rev=1561667&r1=1561666&r2=1561667&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp Mon Jan 27 13:24:23 2014
@@ -89,10 +89,10 @@
<s:url id="editNetworkProxyUrl" encode="true" action="editNetworkProxy">
<s:param name="proxyid" value="%{#attr.proxy.id}" />
</s:url>
- <s:url id="deleteNetworkProxyUrl" encode="true" action="deleteNetworkProxy" method="confirm">
+ <s:url id="deleteNetworkProxyUrl" encode="true" action="deleteNetworkProxy">
<s:param name="proxyid" value="%{#attr.proxy.id}" />
- <s:param name="struts.token.name">struts.token</s:param>
- <s:param name="struts.token"><s:property value="struts.token"/></s:param>
+ <s:param name="struts.token.name">token</s:param>
+ <s:param name="token"><s:property value="token"/></s:param>
</s:url>
<s:a href="%{editNetworkProxyUrl}">
<img src="<c:url value="/images/icons/edit.png" />" />