Author: jdumay
Date: Sat Jul 5 01:32:04 2008
New Revision: 674160
URL: http://svn.apache.org/viewvc?rev=674160&view=rev
Log:
Last commit
Added:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
Added:
archiva/branches/archiva-MRM-829/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-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml?rev=674160&view=auto
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml
(added)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction-validation.xml
Sat Jul 5 01:32:04 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
+<!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="organisationName">
+ <field-validator type="requiredstring">
+ <message>You must enter a name</message>
+ </field-validator>
+ </field>
+ <field name="organisationUrl">
+ <field-validator type="url">
+ <message>You must enter a URL</message>
+ </field-validator>
+ </field>
+ <field name="organisationLogo">
+ <field-validator type="url">
+ <message>You must enter a URL</message>
+ </field-validator>
+ </field>
+</validators>
\ No newline at end of file
Modified:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=674160&r1=674159&r2=674160&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
(original)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
Sat Jul 5 01:32:04 2008
@@ -36,7 +36,7 @@
<ww:set name="editOrganisationInfo" value="editOrganisationInfo"/>
<ww:actionmessage/>
<ww:form method="post" action="saveAppearance" namespace="/admin"
validate="true" theme="xhtml">
- <ww:textfield name="organisationName" value="${organisationName}"
label="Name" size="50" />
+ <ww:textfield name="organisationName" value="${organisationName}"
label="Name" size="50" />
<ww:textfield name="organisationUrl" value="${organisationUrl}"
label="URL" size="50"/>
<ww:textfield name="organisationLogo" value="${organisationLogo}"
label="Logo URL" size="50" />
<ww:submit value="Save"/>
Added:
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java?rev=674160&view=auto
==============================================================================
---
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
(added)
+++
archiva/branches/archiva-MRM-829/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
Sat Jul 5 01:32:04 2008
@@ -0,0 +1,47 @@
+package org.apache.maven.archiva.web.action.admin.appearance;
+
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
+import org.easymock.MockControl;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a>
+ */
+public abstract class AbstractOrganizationInfoActionTest extends
AbstractWebworkTestCase
+{
+ protected MockControl archivaConfigurationControl;
+
+ protected ArchivaConfiguration configuration;
+
+ protected AbstractAppearanceAction action;
+
+ protected Configuration config;
+
+ protected abstract AbstractAppearanceAction getAction();
+
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ config = new Configuration();
+ archivaConfigurationControl = MockControl.createControl(
ArchivaConfiguration.class );
+ configuration = (ArchivaConfiguration)
archivaConfigurationControl.getMock();
+
+ configuration.getConfiguration();
+ archivaConfigurationControl.setReturnValue(config, 1, 2);
+
+ configuration.save(config);
+ archivaConfigurationControl.setVoidCallable(1, 2);
+
+ archivaConfigurationControl.replay();
+ }
+
+ protected void reloadAction()
+ {
+ action = getAction();
+ action.setConfiguration( configuration );
+ }
+}
