]> source.dussan.org Git - archiva.git/commit
Merging changes from trunk (revision 506385:507588) into branch.
authorJoakim Erdfelt <joakime@apache.org>
Wed, 14 Feb 2007 17:05:18 +0000 (17:05 +0000)
committerJoakim Erdfelt <joakime@apache.org>
Wed, 14 Feb 2007 17:05:18 +0000 (17:05 +0000)
commit18caba2a7bc042306bbeea8791dcbc71539854d0
tree89bc53010325f3bec5b32d6a53865856ed6c9725
parent375d124989f6a3f0d2eddd177be50c84b3f446d8
Merging changes from trunk (revision 506385:507588) into branch.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@507626 13f79535-47bb-0310-9956-ffa450edef68
18 files changed:
archiva-MRM-239/archiva-cli/pom.xml
archiva-MRM-239/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
archiva-MRM-239/archiva-core/pom.xml
archiva-MRM-239/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ProxyRequestHandlerTest.java
archiva-MRM-239/archiva-webapp/pom.xml
archiva-MRM-239/archiva-webapp/src/jetty-env.xml
archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java
archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java
archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java
archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java
archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
archiva-MRM-239/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties
archiva-MRM-239/archiva-webapp/src/main/resources/xwork.xml
archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
archiva-MRM-239/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
archiva-MRM-239/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.json-lib.sh [new file with mode: 0755]
archiva-MRM-239/pom.xml