You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/02/19 21:49:19 UTC
svn commit: r509328 - in /maven/archiva/branches/archiva-MRM-239: ./
archiva-configuration/
archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/
archiva-core/
archiva-core/src/test/resources/org/apache/maven/archiva/reposito...
Author: joakime
Date: Mon Feb 19 12:49:18 2007
New Revision: 509328
URL: http://svn.apache.org/viewvc?view=rev&rev=509328
Log:
merge from trunk 507588:HEAD
Added:
maven/archiva/branches/archiva-MRM-239/archiva-site/src/site/apt/guides/security-configuration.apt
- copied unchanged from r509311, maven/archiva/trunk/archiva-site/src/site/apt/guides/security-configuration.apt
maven/archiva/branches/archiva-MRM-239/maven-meeper/src/bin/stats.sh
- copied unchanged from r509311, maven/archiva/trunk/maven-meeper/src/bin/stats.sh
Modified:
maven/archiva/branches/archiva-MRM-239/archiva-configuration/pom.xml
maven/archiva/branches/archiva-MRM-239/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml
maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml
maven/archiva/branches/archiva-MRM-239/archiva-site/src/site/site.xml
maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
maven/archiva/branches/archiva-MRM-239/pom.xml
Modified: maven/archiva/branches/archiva-MRM-239/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-configuration/pom.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-configuration/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-configuration/pom.xml Mon Feb 19 12:49:18 2007
@@ -46,9 +46,15 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-registry</artifactId>
+ <groupId>org.codehaus.plexus.registry</groupId>
+ <artifactId>plexus-registry-api</artifactId>
<version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus.registry</groupId>
+ <artifactId>plexus-registry-commons</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<!-- Test Deps -->
<dependency>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml Mon Feb 19 12:49:18 2007
@@ -34,7 +34,7 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>empty</role-hint>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
</configuration>
</component>
@@ -53,7 +53,7 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>configured</role-hint>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
<properties>
<system/>
@@ -77,7 +77,7 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>save</role-hint>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
<properties>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
@@ -100,7 +100,7 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
<role-hint>read-saved</role-hint>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
<properties>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
Modified: maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/pom.xml Mon Feb 19 12:49:18 2007
@@ -68,7 +68,13 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
- <!-- TEST DEPS -->
+ <dependency>
+ <groupId>org.codehaus.plexus.registry</groupId>
+ <artifactId>plexus-registry-commons</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- TEST DEPS -->
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositoriesTest.xml Mon Feb 19 12:49:18 2007
@@ -22,7 +22,7 @@
<components>
<component>
<role>org.codehaus.plexus.registry.Registry</role>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<role-hint>commons-configuration</role-hint>
<configuration>
<properties>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-core/src/test/resources/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutorTest.xml Mon Feb 19 12:49:18 2007
@@ -22,7 +22,7 @@
<components>
<component>
<role>org.codehaus.plexus.registry.Registry</role>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<role-hint>commons-configuration</role-hint>
<configuration>
<properties>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-site/src/site/site.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-site/src/site/site.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-site/src/site/site.xml Mon Feb 19 12:49:18 2007
@@ -29,9 +29,10 @@
<item name="Getting Started" href="/guides/getting-started/index.html"/>
<item name="FAQ" href="http://docs.codehaus.org/display/MAVENUSER/Archiva+FAQ"/>
<item name="Maven Configuration" href="/guides/getting-started/maven-configuration.html"/>
+ <item name="Security Configuration" href="/guides/security-configuration.html"/>
<item name="Developing" href="/guides/developing/index.html"/>
</menu>
-
+
<menu ref="reports" inherit="bottom"/>
</body>
<skin>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml Mon Feb 19 12:49:18 2007
@@ -98,6 +98,11 @@
<version>2.2.4</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus.registry</groupId>
+ <artifactId>plexus-registry-commons</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</dependency>
@@ -156,7 +161,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xwork-integration</artifactId>
- <version>1.0-alpha-5-SNAPSHOT</version>
+ <version>1.0-alpha-5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java Mon Feb 19 12:49:18 2007
@@ -97,6 +97,7 @@
{
companyModel = new Model();
companyModel.setModelVersion( "4.0.0" );
+ companyModel.setPackaging( "pom" );
if ( companyPom != null )
{
@@ -120,4 +121,4 @@
{
return companyModel;
}
-}
\ No newline at end of file
+}
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Mon Feb 19 12:49:18 2007
@@ -23,7 +23,7 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
- <implementation>org.codehaus.plexus.registry.CommonsConfigurationRegistry</implementation>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
<role-hint>commons-configuration</role-hint>
<configuration>
<properties>
@@ -41,12 +41,12 @@
<xml fileName="${appserver.base}/conf/archiva.xml" config-optional="true"
config-at="org.apache.maven.archiva"/>
<xml fileName="${appserver.base}/conf/common.xml" config-optional="true"/>
- <properties fileName="${appserver.base}/security.properties" config-optional="true"
+ <properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.security"/>
<xml fileName="${appserver.home}/conf/archiva.xml" config-optional="true"
config-at="org.apache.maven.archiva"/>
<xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>
- <properties fileName="${appserver.home}/security.properties" config-optional="true"
+ <properties fileName="${appserver.home}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.security"/>
<properties fileName="org/apache/maven/archiva/security.properties" config-at="org.codehaus.plexus.security"/>
</properties>
@@ -290,4 +290,35 @@
<role-hint>data-refresh</role-hint>
</component>
</load-on-start>
+
+ <lifecycle-handler-manager implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager">
+ <default-lifecycle-handler-id>plexus</default-lifecycle-handler-id>
+ <lifecycle-handlers>
+ <lifecycle-handler implementation="org.codehaus.plexus.personality.plexus.PlexusLifecycleHandler">
+ <id>plexus</id>
+ <name>Plexus Lifecycle Handler</name>
+ <begin-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.LogEnablePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.CompositionPhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.ContextualizePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.AutoConfigurePhase"/>
+ <phase implementation="org.codehaus.plexus.registry.RegistryConfigurePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.ServiceablePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.StartPhase"/>
+ </begin-segment>
+ <suspend-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.SuspendPhase"/>
+ </suspend-segment>
+ <resume-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.ResumePhase"/>
+ </resume-segment>
+ <end-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.StopPhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.DisposePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.LogDisablePhase"/>
+ </end-segment>
+ </lifecycle-handler>
+ </lifecycle-handlers>
+ </lifecycle-handler-manager>
</plexus>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml Mon Feb 19 12:49:18 2007
@@ -23,11 +23,12 @@
<xwork>
<!-- TODO: better error handling for exceptions needed! -->
+ <include file="webwork-default.xml"/>
<!-- Include plexus-security xwork configurations. -->
<include file="xwork-security.xml"/>
- <package name="base" extends="security">
+ <package name="base" extends="webwork-default">
<interceptors>
<interceptor name="configuration" class="configurationInterceptor"/>
<interceptor name="pssForceAdminUser" class="pssForceAdminUserInterceptor"/>
Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Mon Feb 19 12:49:18 2007
@@ -39,13 +39,13 @@
<ww:set name="companyPom" value="companyPom"/>
-<c:if test="${empty(companyPom)}">
+<c:if test="${empty(companyPom.groupId) || empty(companyPom.artifactId)}">
<p>
You have not yet specified a company POM. <a href="<ww:url action='editAppearance' />">Select a Company POM</a>
</p>
</c:if>
-<c:if test="${!empty(companyPom)}">
+<c:if test="${!empty(companyPom.groupId) && !empty(companyPom.artifactId)}">
<p>
Your selected company POM is below. If you would like to change the organization name, url or logo, you can
<a href="<ww:url action='editCompanyPom'/>">edit the POM</a>.
@@ -93,4 +93,4 @@
</c:choose>
</c:if>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: maven/archiva/branches/archiva-MRM-239/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/pom.xml?view=diff&rev=509328&r1=509327&r2=509328
==============================================================================
--- maven/archiva/branches/archiva-MRM-239/pom.xml (original)
+++ maven/archiva/branches/archiva-MRM-239/pom.xml Mon Feb 19 12:49:18 2007
@@ -550,7 +550,7 @@
</pluginRepository>
</pluginRepositories>
<properties>
- <maven.version>2.0.4</maven.version>
+ <maven.version>2.0.5</maven.version>
<wagon.version>1.0-beta-2</wagon.version>
<plexus-security.version>1.0-alpha-10-SNAPSHOT</plexus-security.version>
</properties>