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 2007/08/03 17:32:39 UTC
svn commit: r562505 - in
/maven/archiva/trunk/archiva-web/archiva-webapp/src/main:
java/org/apache/maven/archiva/web/action/admin/connectors/proxy/
java/org/apache/maven/archiva/web/action/admin/networkproxies/
java/org/apache/maven/archiva/web/action/...
Author: brett
Date: Fri Aug 3 08:32:38 2007
New Revision: 562505
URL: http://svn.apache.org/viewvc?view=rev&rev=562505
Log:
[MRM-430] fix error display
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java Fri Aug 3 08:32:38 2007
@@ -585,10 +585,12 @@
catch ( RegistryException e )
{
addActionError( "Unable to save configuration: " + e.getMessage() );
+ return INPUT;
}
catch ( IndeterminateConfigurationException e )
{
addActionError( e.getMessage() );
+ return INPUT;
}
return SUCCESS;
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java Fri Aug 3 08:32:38 2007
@@ -216,10 +216,12 @@
catch ( RegistryException e )
{
addActionError( "Unable to save configuration: " + e.getMessage() );
+ return INPUT;
}
catch ( IndeterminateConfigurationException e )
{
addActionError( e.getMessage() );
+ return INPUT;
}
return SUCCESS;
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java Fri Aug 3 08:32:38 2007
@@ -113,6 +113,7 @@
return ERROR;
}
+ String result = SUCCESS;
if ( StringUtils.equals( mode, "delete-entry" ) || StringUtils.equals( mode, "delete-contents" ) )
{
AdminRepositoryConfiguration existingRepository = getRepository();
@@ -127,33 +128,40 @@
try
{
removeRepository( getRepoid() );
- removeRepositoryRoles( existingRepository );
- saveConfiguration();
+ result = saveConfiguration();
- if ( StringUtils.equals( mode, "delete-contents" ) )
+ if ( result.equals( SUCCESS ) )
{
- removeContents( existingRepository );
+ removeRepositoryRoles( existingRepository );
+ if ( StringUtils.equals( mode, "delete-contents" ) )
+ {
+ removeContents( existingRepository );
+ }
}
}
catch ( IOException e )
{
addActionError( "Unable to delete repository: " + e.getMessage() );
+ result = INPUT;
}
catch ( RoleManagerException e )
{
addActionError( "Unable to delete repository: " + e.getMessage() );
+ result = INPUT;
}
catch ( InvalidConfigurationException e )
{
addActionError( "Unable to delete repository: " + e.getMessage() );
+ result = INPUT;
}
catch ( RegistryException e )
{
addActionError( "Unable to delete repository: " + e.getMessage() );
+ result = INPUT;
}
}
- return SUCCESS;
+ return result;
}
public String edit()
@@ -236,29 +244,34 @@
removeRepository( repoId );
}
+ String result;
try
{
addRepository( getRepository() );
- saveConfiguration();
+ result = saveConfiguration();
}
catch ( IOException e )
{
addActionError( "I/O Exception: " + e.getMessage() );
+ result = INPUT;
}
catch ( RoleManagerException e )
{
addActionError( "Role Manager Exception: " + e.getMessage() );
+ result = INPUT;
}
catch ( InvalidConfigurationException e )
{
addActionError( "Invalid Configuration Exception: " + e.getMessage() );
+ result = INPUT;
}
catch ( RegistryException e )
{
addActionError( "Configuration Registry Exception: " + e.getMessage() );
+ result = INPUT;
}
- return SUCCESS;
+ return result;
}
private boolean validateFields( String mode )
@@ -412,6 +425,7 @@
catch ( IndeterminateConfigurationException e )
{
addActionError( e.getMessage() );
+ return INPUT;
}
return SUCCESS;
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml Fri Aug 3 08:32:38 2007
@@ -258,7 +258,7 @@
<action name="saveRepository" class="configureRepositoryAction" method="save">
<result name="success" type="redirect-action">repositories</result>
- <result name="input">/WEB-INF/jsp/admin/addRepository.jsp</result>
+ <result name="input">/WEB-INF/jsp/admin/editRepository.jsp</result>
<result name="error">/WEB-INF/jsp/admin/editRepository.jsp</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteNetworkProxy.jsp Fri Aug 3 08:32:38 2007
@@ -29,6 +29,8 @@
<h1>Admin: Delete Network Proxy</h1>
+<ww:actionerror/>
+
<div id="contentArea">
<h2>Delete Network Proxy</h2>
@@ -36,9 +38,9 @@
<blockquote>
<strong><span class="statusFailed">WARNING:</span> This operation can not be undone.</strong>
</blockquote>
-
+
<p>
- Are you sure you want to delete network proxy <code>${proxyid}</code> ?
+ Are you sure you want to delete network proxy <code>${proxyid}</code> ?
</p>
<ww:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxyConnector.jsp Fri Aug 3 08:32:38 2007
@@ -29,6 +29,8 @@
<h1>Admin: Delete Proxy Connector</h1>
+<ww:actionerror/>
+
<div id="contentArea">
<h2>Delete Proxy Connector</h2>
@@ -36,14 +38,14 @@
<blockquote>
<strong><span class="statusFailed">WARNING:</span> This operation can not be undone.</strong>
</blockquote>
-
+
<p>
- Are you sure you want to delete proxy connector <code>[ ${source} , ${target} ]</code> ?
+ Are you sure you want to delete proxy connector <code>[ ${source} , ${target} ]</code> ?
</p>
<ww:form method="post" action="deleteProxyConnector!delete" namespace="/admin" validate="true">
<ww:hidden name="target"/>
- <ww:hidden name="source"/>
+ <ww:hidden name="source"/>
<ww:submit value="Delete"/>
</ww:form>
</div>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp Fri Aug 3 08:32:38 2007
@@ -29,6 +29,8 @@
<h1>Admin: Delete Repository</h1>
+<ww:actionerror/>
+
<div id="contentArea">
<h2>Delete Repository</h2>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp?view=diff&rev=562505&r1=562504&r2=562505
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp Fri Aug 3 08:32:38 2007
@@ -29,13 +29,15 @@
<h1>Admin: Edit Repository</h1>
+<ww:actionerror/>
+
<div id="contentArea">
<h2>Edit Repository</h2>
<ww:actionmessage/>
<ww:form method="post" action="saveRepository" namespace="/admin" validate="false">
- <ww:hidden name="mode" value="edit"/>
+ <ww:hidden name="mode" value="edit"/>
<ww:hidden name="repository.id"/>
<%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
<ww:submit value="Update Repository"/>