Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change configuration base to org.apache.archiva instead of org.apache.maven.archiva, update "upgrading" document accordingly 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1177933 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2011-10-01 06:56:48 +00:00
parent cf8d566442
commit 0fa1fa6ac2
29 changed files with 92 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
archiva-docs/src/site/apt/adminguide/upgrade.apt
View File

@ -21,54 +21,51 @@
Upgrading Archiva
Upgrading Archiva is straightforward if the directions for separating the base from the installation above are followed. Simply retain the <<<data/repositories>>> and <<<data/databases/users>>> directories,
and the configuration files (in the conf directory, or the other locations specified above) and use a new extracted installation of Archiva.
Upgrading Archiva is straightforward, particularly if the directions for separating the base from the installation
are followed. You need to retain the following directories:
Note that the <<<users>>> database must always be retained as it contains the permissions and user information across versions. However,
in order to take advantage of the improvements in search in Archiva 1.1 (and higher versions), s.a. search by java class/package/method, the archiva database must
be re-created. So you need to delete the <<<data/databases/archiva>>> directory, delete the <<<.index>>> directories of your respective repositories, and execute the repository and database scanners after
starting Archiva.
* <<<conf>>> - the configuration files can be reused across different versions. Note that when the standalone
version is used, <<<wrapper.conf>>> and <<<jetty.xml>>> may need to be replaced after upgrade and changes
reapplied. See specific notes in the version details below.
The repository data is portable across versions, and multiple versions can be configured to look at the same repositories (though not run simultaneously).
* <<<data>>> - all Archiva data. More specifically:
* Upgrading Archiva from 1.1.x to 1.2.x
* <<<data/repositories>>> is portable across versions (both forwards and backwards).
Because of the changes in the search implementation starting in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.1.x to
1.2.x. Since the format of the index has changed in 1.2.x, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated.
To do this, you can force Archiva to scan all the artifacts by ticking the <<<Process All Artifacts>>> checkbox then clicking the <<<Scan Repository Now>>>
button in the Repositories page. Take note though that this feature is only available starting with version 1.3. Otherwise, you must execute
<<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides and then force execute the repository scanning so
that the new index will be generated.
* <<<data/databases/users>>> must always be retained as it contains the permissions and user information across
versions, even if LDAP is being used for authentication.
In 1.2.2, the length of the specified fields in the database tables below were changed to 1020:
* ARCHIVA_PROJECT - URL
* <<<data/databases/archiva>>> exists for Archiva 1.3.x and below. This can be retained through upgrades, but
can also be regenerated at any time. This no longer exists in Archiva 1.4+.
* ARCHIVA_MAILING_LISTS - MAIN_ARCHIVE_URL
[]
* ARCHIVA_ORGANIZATION - URL, FAV_ICON_URL
[]
* ARCHIVA_LICENSES - URL
The following describes instructions specific to upgrading between different versions.
* ARCHIVA_ISSUE_MANAGEMENT - ISSUE_MANAGEMENT_URL
* Upgrading Archiva to 1.4+
* ARCHIVA_CIMANAGEMENT - CI_URL
** Metadata Repository
* ARCHIVA_INDIVIDUAL - URL, ORGANIZATION_URL
~~TODO: metadata repository description
* ARCHIVA_DEPENDENCY - URL
** Java Package Changes and Library Changes
* ARCHIVA_SCM - SCM_URL, DEVELOPER_CONNECTION, URL
All Java packages have changed from <<<org.apache.maven.archiva>>> to <<<org.apache.archiva>>> and have undergone
significant changes. If you have written custom consumers, are using the XML-RPC client, or interfacing with other
Java libraries the code will need to be adjusted.
* ARCHIVA_PROJECT_REPOSITORIES - URL
[]
** Configuration References
If you had used the undocumented ability to modify <<<application.xml>>> to alter the configuration search path, note
that in Archiva 1.4+ you must use the <<<org.apache.archiva>>> configuration search path instead of
<<<org.apache.maven.archiva>>>.
* Upgrading Archiva to 1.2.2
If upgrading from a version lower than 1.2.2, you might also need to alter the lengths of the above fields as there is no upgrade task currently available for this.
Since Archiva 1.2.2, the Jetty version has been upgraded to 6.1.19.
If upgrading to Archiva 1.2.2 (or higher versions), there is a need to update the library contents listed in
<<<$ARCHIVA_BASE/conf/wrapper.conf>>> with the ones included in the new distribution especially if the
<<<$ARCHIVA_BASE>>> directory is separate from the installation.
<<<ARCHIVA_BASE/conf/wrapper.conf>>> with the ones included in the new distribution if the <<<ARCHIVA_BASE>>>
directory is separate from the installation.

8
archiva-modules/archiva-base/archiva-configuration/pom.xml
View File

@ -151,10 +151,10 @@
<instrumentation>
<!-- exclude generated -->
<excludes>
<exclude>org/apache/maven/archiva/configuration/io/**</exclude>
<exclude>org/apache/maven/archiva/configuration/*RepositoryConfiguration.*</exclude>
<exclude>org/apache/maven/archiva/configuration/Configuration.*</exclude>
<exclude>org/apache/maven/archiva/configuration/Proxy.*</exclude>
<exclude>org/apache/archiva/configuration/io/**</exclude>
<exclude>org/apache/archiva/configuration/*RepositoryConfiguration.*</exclude>
<exclude>org/apache/archiva/configuration/Configuration.*</exclude>
<exclude>org/apache/archiva/configuration/Proxy.*</exclude>
</excludes>
</instrumentation>
</configuration>

6
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -149,7 +149,7 @@ public class DefaultArchivaConfiguration
*/
private boolean isConfigurationDefaulted = false;
private static final String KEY = "org.apache.maven.archiva";
private static final String KEY = "org.apache.archiva";
public Configuration getConfiguration()
{
@ -547,11 +547,11 @@ public class DefaultArchivaConfiguration
// olamy hackish I know :-)
contents = "<configuration><xml fileName=\"" + fileLocation
+ "\" config-forceCreate=\"true\" config-name=\"org.apache.maven.archiva.user\"/>" + "</configuration>";
+ "\" config-forceCreate=\"true\" config-name=\"org.apache.archiva.user\"/>" + "</configuration>";
( (CommonsConfigurationRegistry) registry ).setProperties( contents );
( (CommonsConfigurationRegistry) registry ).initialize();
registry.initialize();
for ( RegistryListener regListener : registryListeners )
{

15
archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java
View File

@ -54,14 +54,6 @@ public class ArchivaConfigurationTest
return new File( FileUtil.getBasedir(), path );
}
/**
* @TODO to remove
*/
protected String getSpringConfigLocation()
{
return "org/apache/maven/archiva/configuration/spring-context.xml";
}
protected <T> T lookup( Class<T> clazz, String hint )
{
return componentContainer.getComponent( clazz, hint );
@ -221,10 +213,9 @@ public class ArchivaConfigurationTest
throws Exception
{
System.setProperty( "org.apache.maven.archiva.webapp.ui.appletFindEnabled", "false" );
System.setProperty( "org.apache.archiva.webapp.ui.appletFindEnabled", "false" );
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-configuration" );
ArchivaConfiguration archivaConfiguration = lookup( ArchivaConfiguration.class, "test-configuration" );
archivaConfiguration.reload();
@ -236,7 +227,7 @@ public class ArchivaConfigurationTest
}
finally
{
System.getProperties().remove( "org.apache.maven.archiva.webapp.ui.appletFindEnabled" );
System.getProperties().remove( "org.apache.archiva.webapp.ui.appletFindEnabled" );
}
}

7
archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/MavenProxyPropertyLoaderTest.java
View File

@ -39,13 +39,6 @@ public class MavenProxyPropertyLoaderTest
{
private MavenProxyPropertyLoader loader;
// TODO to remove
protected String getSpringConfigLocation()
{
return "org/apache/maven/archiva/configuration/spring-context.xml";
}
@Test
public void testLoadValidMavenProxyConfiguration()
throws IOException, InvalidConfigurationException

42
archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
View File

@ -48,7 +48,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/src/test/conf/archiva-0.9.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -66,7 +66,7 @@
<configuration>
<system/>
<xml fileName="${basedir}/src/test/conf/repository-manager.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -85,8 +85,8 @@
<configuration>
<system/>
<xml fileName="${basedir}/target/test-autodetect-v1/archiva-user.xml" config-optional="true"
config-name="org.apache.maven.archiva.user"
config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user"
config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -104,7 +104,7 @@
<configuration>
<system/>
<xml fileName="${basedir}/src/test/conf/archiva-v1.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -121,7 +121,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -138,9 +138,9 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -157,9 +157,9 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="false"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -176,9 +176,9 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -196,9 +196,9 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/src/test/conf/conf-user.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
<xml fileName="${basedir}/src/test/conf/conf-base.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -216,7 +216,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -235,7 +235,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -253,7 +253,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -273,9 +273,9 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/*intentionally:invalid*/.m2/archiva-user.xml" config-optional="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
<xml fileName="${basedir}/target/*intentionally:invalid*/conf/archiva.xml" config-optional="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -294,9 +294,9 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/target/*intentionally:invalid*/.m2/archiva-user.xml" config-optional="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
<xml fileName="${basedir}/target/test-appserver-base/conf/archiva.xml" config-optional="true"
config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
View File

@ -46,7 +46,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

4
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
View File

@ -39,7 +39,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/src/test/conf/repository-manager.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -58,7 +58,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

6
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-purge-consumer-test.xml
View File

@ -55,7 +55,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/src/test/conf/repository-manager.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -89,7 +89,7 @@
<![CDATA[
<configuration>
<xml fileName="${basedir}/src/test/conf/repository-manager-daysOld.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>
@ -108,7 +108,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context.xml
View File

@ -37,7 +37,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

3
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
View File

@ -18,6 +18,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
@ -37,7 +38,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-base/archiva-model/pom.xml
View File

@ -80,7 +80,7 @@
<instrumentation>
<!-- exclude generated -->
<excludes>
<exclude>org/apache/maven/archiva/reporting/model/**</exclude>
<exclude>org/apache/archiva/reporting/model/**</exclude>
</excludes>
</instrumentation>
</configuration>

2
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
View File

@ -49,7 +49,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context-repo-request-test.xml
View File

@ -41,7 +41,7 @@
<configuration>
<system/>
<xml fileName="${basedir}/src/test/resources/scanner-archiva.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml
View File

@ -42,7 +42,7 @@
<configuration>
<system/>
<xml fileName="${basedir}/src/test/resources/scanner-archiva.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml
View File

@ -51,7 +51,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
View File

@ -63,7 +63,7 @@
<configuration>
<system/>
<xml fileName="${basedir}/src/test/resources/archiva-test.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
View File

@ -50,7 +50,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

5
archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/ArchivaServletAuthenticatorTest.java
View File

@ -60,11 +60,6 @@ public class ArchivaServletAuthenticatorTest
setupRepository( "corporate" );
}
protected String getPlexusConfigLocation()
{
return "org/apache/maven/archiva/security/ArchivaServletAuthenticatorTest.xml";
}
protected void assignRepositoryManagerRole( String principal, String repoId )
throws Exception
{

2
archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
View File

@ -91,7 +91,7 @@
<system/>
<xml fileName="${basedir}/target/test-conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

4
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTreeTag.java
View File

@ -44,9 +44,9 @@ import javax.servlet.jsp.tagext.TryCatchFinally;
* It was easier to do it this way, vs accessing the dependency graph via a JSP.
*
* <pre>
* <archiva:dependency-tree groupId="org.apache.maven.archiva"
* <archiva:dependency-tree groupId="org.apache.archiva"
* artifactId="archiva-common"
* version="1.0"
* version="1.3.5"
* nodevar="node">
* <b>${node.groupId}</b>:<b>${node.artifactId}</b>:<b>${node.version}</b> (${node.scope})
* </archiva:dependency-tree>

4
archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
View File

@ -67,10 +67,6 @@
<level value="info"/>
</logger>
<logger name="org.apache.maven.archiva">
<level value="info"/>
</logger>
<logger name="org.codehaus.redback">
<level value="info"/>
</logger>

2
archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
View File

@ -42,4 +42,4 @@ struts.multipart.maxSize=10485760
# TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
# Localization
struts.custom.i18n.resources=org.codehaus.plexus.redback.struts2.default,org.apache.maven.archiva.redback.custom
struts.custom.i18n.resources=org.codehaus.plexus.redback.struts2.default,org.apache.archiva.redback.custom

10
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
View File

@ -170,8 +170,8 @@
<system/>
<jndi prefix="java:comp/env" config-optional="true"/>
<xml fileName="${user.home}/.m2/archiva.xml" config-optional="true"
config-name="org.apache.maven.archiva.user"
config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.user"
config-at="org.apache.archiva"/>
<xml fileName="${user.home}/.m2/shared.xml" config-optional="true"
config-name="org.apache.maven.shared.app.user" config-at="org.apache.maven.shared.app"
config-forceCreate="true"/>
@ -180,15 +180,15 @@
<properties fileName="${user.home}/.m2/archiva.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-optional="true"
config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base"
config-at="org.apache.archiva"/>
<xml fileName="${appserver.base}/conf/shared.xml" config-optional="true"
config-name="org.apache.maven.shared.app.base" config-at="org.apache.maven.shared.app"/>
<xml fileName="${appserver.base}/conf/common.xml" config-optional="true"/>
<properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
<xml fileName="${appserver.home}/conf/archiva.xml" config-optional="true"
config-at="org.apache.maven.archiva"/>
config-at="org.apache.archiva"/>
<xml fileName="${appserver.home}/conf/shared.xml" config-optional="true"
config-at="org.apache.maven.shared.app"/>
<xml fileName="${appserver.home}/conf/common.xml" config-optional="true"/>

5
archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml
View File

@ -18,6 +18,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
@ -38,8 +39,8 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva-test-download-artifacts.xml" config-optional="true"
config-name="org.apache.maven.archiva.base"
config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base"
config-at="org.apache.archiva"/>
<properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>

6
archiva-modules/archiva-web/archiva-webdav/src/test/resources/WEB-INF/web.xml
View File

@ -38,10 +38,4 @@
classpath*:spring-context.xml
</param-value>
</context-param>
<!--
classpath*:/META-INF/plexus/components.xml
target/test-classes/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
-->
</web-app>

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml
View File

@ -41,7 +41,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
View File

@ -60,7 +60,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>

2
archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
View File

@ -60,7 +60,7 @@
<system/>
<xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true"
config-optional="true"
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
config-name="org.apache.archiva.base" config-at="org.apache.archiva"/>
</configuration>
]]>
</value>