Author: olamy
Date: Sat Sep 10 08:25:08 2011
New Revision: 1167475
URL: http://svn.apache.org/viewvc?rev=1167475&view=rev
Log:
[MRM-1514] api to configure OrganisationInfo : use it in webapp
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java?rev=1167475&r1=1167474&r2=1167475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java
Sat Sep 10 08:25:08 2011
@@ -20,9 +20,8 @@ package org.apache.maven.archiva.web.act
*/
import com.opensymphony.xwork2.Preparable;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.configuration.OrganisationInformation;
+import org.apache.archiva.admin.repository.admin.ArchivaAdministration;
+import org.apache.archiva.admin.repository.admin.OrganisationInformation;
import org.apache.maven.archiva.web.action.AbstractActionSupport;
import javax.inject.Inject;
@@ -38,7 +37,7 @@ public abstract class AbstractAppearance
{
@Inject
- protected ArchivaConfiguration configuration;
+ protected ArchivaAdministration archivaAdministration;
private String organisationLogo;
@@ -46,11 +45,6 @@ public abstract class AbstractAppearance
private String organisationName;
- public void setConfiguration( ArchivaConfiguration configuration )
- {
- this.configuration = configuration;
- }
-
public String getOrganisationLogo()
{
return organisationLogo;
@@ -84,16 +78,24 @@ public abstract class AbstractAppearance
public void prepare()
throws Exception
{
- Configuration config = configuration.getConfiguration();
- if ( config != null )
+
+ OrganisationInformation orgInfo =
archivaAdministration.getOrganisationInformation();
+ if ( orgInfo != null )
{
- OrganisationInformation orgInfo = config.getOrganisationInfo();
- if ( orgInfo != null )
- {
- setOrganisationLogo( orgInfo.getLogoLocation() );
- setOrganisationName( orgInfo.getName() );
- setOrganisationUrl( orgInfo.getUrl() );
- }
+ setOrganisationLogo( orgInfo.getLogoLocation() );
+ setOrganisationName( orgInfo.getName() );
+ setOrganisationUrl( orgInfo.getUrl() );
}
+
+ }
+
+ public ArchivaAdministration getArchivaAdministration()
+ {
+ return archivaAdministration;
+ }
+
+ public void setArchivaAdministration( ArchivaAdministration
archivaAdministration )
+ {
+ this.archivaAdministration = archivaAdministration;
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java?rev=1167475&r1=1167474&r2=1167475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java
Sat Sep 10 08:25:08 2011
@@ -20,13 +20,11 @@ package org.apache.maven.archiva.web.act
*/
import com.opensymphony.xwork2.Validateable;
+import org.apache.archiva.admin.repository.RepositoryAdminException;
+import org.apache.archiva.admin.repository.admin.OrganisationInformation;
import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.configuration.Configuration;
-import
org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
-import org.apache.maven.archiva.configuration.OrganisationInformation;
import org.codehaus.plexus.redback.rbac.Resource;
-import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
@@ -44,23 +42,16 @@ public class EditOrganisationInfoAction
{
@Override
public String execute()
- throws RegistryException, IndeterminateConfigurationException
+ throws RepositoryAdminException
{
- Configuration config = configuration.getConfiguration();
- if ( config != null )
- {
- OrganisationInformation orgInfo = config.getOrganisationInfo();
- if ( orgInfo == null )
- {
- config.setOrganisationInfo( orgInfo );
- }
-
- orgInfo.setLogoLocation( getOrganisationLogo() );
- orgInfo.setName( getOrganisationName() );
- orgInfo.setUrl( getOrganisationUrl() );
- configuration.save( config );
- }
+ OrganisationInformation orgInfo =
archivaAdministration.getOrganisationInformation();
+
+ orgInfo.setLogoLocation( getOrganisationLogo() );
+ orgInfo.setName( getOrganisationName() );
+ orgInfo.setUrl( getOrganisationUrl() );
+
+ archivaAdministration.setOrganisationInformation( orgInfo );
return SUCCESS;
}
Modified:
archiva/trunk/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/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java?rev=1167475&r1=1167474&r2=1167475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractOrganizationInfoActionTest.java
Sat Sep 10 08:25:08 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.web.act
* under the License.
*/
+import org.apache.archiva.admin.repository.admin.DefaultArchivaAdministration;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
@@ -50,17 +51,22 @@ public abstract class AbstractOrganizati
configuration = (ArchivaConfiguration)
archivaConfigurationControl.getMock();
configuration.getConfiguration();
- archivaConfigurationControl.setReturnValue( config, 1, 2 );
+ archivaConfigurationControl.setReturnValue( config, 1, 5 );
configuration.save( config );
- archivaConfigurationControl.setVoidCallable( 1, 2 );
+ archivaConfigurationControl.setVoidCallable( 1, 4 );
archivaConfigurationControl.replay();
+
+ DefaultArchivaAdministration defaultArchivaAdministration = new
DefaultArchivaAdministration();
+ defaultArchivaAdministration.setArchivaConfiguration( configuration );
+ getAction().setArchivaAdministration( defaultArchivaAdministration );
}
protected void reloadAction()
{
action = getAction();
- action.setConfiguration( configuration );
+ ( (DefaultArchivaAdministration) action.getArchivaAdministration()
).setArchivaConfiguration( configuration );
+
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java?rev=1167475&r1=1167474&r2=1167475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
Sat Sep 10 08:25:08 2011
@@ -20,9 +20,9 @@ package org.apache.maven.archiva.web.act
*/
import com.opensymphony.xwork2.validator.ActionValidatorManager;
+import org.apache.archiva.web.validator.utils.ValidatorUtil;
import org.apache.maven.archiva.configuration.OrganisationInformation;
import
org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
-import org.apache.archiva.web.validator.utils.ValidatorUtil;
import java.util.ArrayList;
import java.util.HashMap;
@@ -89,6 +89,8 @@ public class EditOrganizationInfoActionT
action.execute();
+ orginfo = config.getOrganisationInfo();
+
assertEquals( "LOGO1", orginfo.getLogoLocation() );
assertEquals( "NAME1", orginfo.getName() );
assertEquals( "URL1", orginfo.getUrl() );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java?rev=1167475&r1=1167474&r2=1167475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/OrganizationInfoActionTest.java
Sat Sep 10 08:25:08 2011
@@ -49,8 +49,6 @@ public class OrganizationInfoActionTest
@Override
protected AbstractAppearanceAction getAction()
{
- //return (OrganisationInfoAction) lookup( Action.class.getName(),
"organisationInfo" );
-
return (OrganisationInfoAction) getActionProxy(
"/components/companyInfo.action" ).getAction();
}
}
