Author: brett
Date: Mon Feb 12 06:43:47 2007
New Revision: 506466
URL: http://svn.apache.org/viewvc?view=rev&rev=506466
Log:
use new shared app configuration
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java?view=diff&rev=506466&r1=506465&r2=506466
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java
Mon Feb 12 06:43:47 2007
@@ -28,10 +28,8 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.shared.app.company.CompanyPomHandler;
import org.apache.maven.shared.app.configuration.Configuration;
-import org.apache.maven.shared.app.configuration.ConfigurationChangeException;
-import org.apache.maven.shared.app.configuration.ConfigurationStore;
-import org.apache.maven.shared.app.configuration.ConfigurationStoreException;
-import org.apache.maven.shared.app.configuration.InvalidConfigurationException;
+import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
+import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.security.rbac.Resource;
import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
@@ -52,7 +50,7 @@
/**
* @plexus.requirement
*/
- private ConfigurationStore appConfigurationStore;
+ private MavenAppConfiguration appConfigurationStore;
/**
* The configuration.
@@ -67,9 +65,9 @@
private CompanyPomHandler companyPomHandler;
public String execute()
- throws IOException, ConfigurationStoreException,
InvalidConfigurationException, ConfigurationChangeException
+ throws IOException, RegistryException
{
- appConfigurationStore.storeConfiguration( configuration );
+ appConfigurationStore.save( configuration );
return SUCCESS;
}
@@ -80,9 +78,9 @@
}
public void prepare()
- throws ConfigurationStoreException, ProjectBuildingException,
ArtifactMetadataRetrievalException
+ throws ProjectBuildingException, ArtifactMetadataRetrievalException
{
- configuration = appConfigurationStore.getConfigurationFromStore();
+ configuration = appConfigurationStore.getConfiguration();
companyModel = companyPomHandler.getCompanyPomModel(
configuration.getCompanyPom(), createLocalRepository() );
}
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java?view=diff&rev=506466&r1=506465&r2=506466
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
Mon Feb 12 06:43:47 2007
@@ -30,10 +30,7 @@
import org.apache.maven.shared.app.company.CompanyPomHandler;
import org.apache.maven.shared.app.configuration.CompanyPom;
import org.apache.maven.shared.app.configuration.Configuration;
-import org.apache.maven.shared.app.configuration.ConfigurationChangeException;
-import org.apache.maven.shared.app.configuration.ConfigurationStore;
-import org.apache.maven.shared.app.configuration.ConfigurationStoreException;
-import org.apache.maven.shared.app.configuration.InvalidConfigurationException;
+import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
import org.codehaus.plexus.security.rbac.Resource;
import org.codehaus.plexus.security.ui.web.interceptor.SecureAction;
import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle;
@@ -54,7 +51,7 @@
/**
* @plexus.requirement
*/
- private ConfigurationStore appConfigurationStore;
+ private MavenAppConfiguration appConfigurationStore;
/**
* The configuration.
@@ -69,8 +66,7 @@
private Model companyModel;
public String execute()
- throws IOException, ConfigurationStoreException,
InvalidConfigurationException, ConfigurationChangeException,
- ArtifactInstallationException
+ throws IOException, ArtifactInstallationException
{
// TODO: hack for passed in String[]
String[] logo = (String[]) companyModel.getProperties().get(
"organization.logo" );
@@ -90,9 +86,9 @@
}
public void prepare()
- throws ConfigurationStoreException, ProjectBuildingException,
ArtifactMetadataRetrievalException
+ throws ProjectBuildingException, ArtifactMetadataRetrievalException
{
- configuration = appConfigurationStore.getConfigurationFromStore();
+ configuration = appConfigurationStore.getConfiguration();
CompanyPom companyPom = configuration.getCompanyPom();
companyModel = companyPomHandler.getCompanyPomModel( companyPom,
createLocalRepository() );
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java?view=diff&rev=506466&r1=506465&r2=506466
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java
Mon Feb 12 06:43:47 2007
@@ -22,7 +22,7 @@
import org.apache.maven.archiva.web.action.AbstractConfiguredAction;
import org.apache.maven.model.Model;
import org.apache.maven.shared.app.company.CompanyPomHandler;
-import org.apache.maven.shared.app.configuration.ConfigurationStore;
+import org.apache.maven.shared.app.configuration.MavenAppConfiguration;
/**
* Stores the company information for displaying on the page.
@@ -46,12 +46,12 @@
/**
* @plexus.requirement
*/
- private ConfigurationStore appConfigurationStore;
+ private MavenAppConfiguration appConfigurationStore;
public String execute()
throws Exception
{
- Model model = handler.getCompanyPomModel(
appConfigurationStore.getConfigurationFromStore().getCompanyPom(),
+ Model model = handler.getCompanyPomModel(
appConfigurationStore.getConfiguration().getCompanyPom(),
createLocalRepository() );
if ( model != null )
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=506466&r1=506465&r2=506466
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Mon Feb 12 06:43:47 2007
@@ -31,7 +31,9 @@
<jndi prefix="java:comp/env" config-optional="true"/>
<xml fileName="${user.home}/.m2/archiva.xml" config-optional="true"
config-name="org.apache.maven.archiva"
config-at="org.apache.maven.archiva" config-forceCreate="true"/>
- <xml fileName="${user.home}/.m2/shared.xml" config-optional="true"/>
+ <xml fileName="${user.home}/.m2/shared.xml" config-optional="true"
+ config-name="org.apache.maven.shared.app"
config-at="org.apache.maven.shared.app"
+ config-forceCreate="true"/>
<properties fileName="${user.home}/.m2/security.properties"
config-optional="true"
config-at="org.codehaus.plexus.security"/>
<properties fileName="${user.home}/.m2/archiva.properties"
config-optional="true"
