Author: jdumay
Date: Tue Jul 1 21:11:34 2008
New Revision: 673269
URL: http://svn.apache.org/viewvc?rev=673269&view=rev
Log:
MRM-855 - java.lang.NoClassDefFoundError: org/apache/xml/serialize/OutputFormat
* removed excludes for xerces:*
* updated enforcer rules
* excluded xerces from shade in archiva-cli
Modified:
archiva/trunk/archiva-cli/pom.xml
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-cli/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/pom.xml?rev=673269&r1=673268&r2=673269&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/pom.xml (original)
+++ archiva/trunk/archiva-cli/pom.xml Tue Jul 1 21:11:34 2008
@@ -84,6 +84,7 @@
</transformers>
<artifactSet>
<excludes>
+ <exclude>xerces:xercesImpl</exclude>
<exclude>xml-apis:xml-apis</exclude>
<exclude>xalan:xalan</exclude>
<exclude>commons-beanutils:commons-beanutils</exclude>
Modified: archiva/trunk/archiva-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=673269&r1=673268&r2=673269&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Tue Jul 1 21:11:34 2008
@@ -136,12 +136,6 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=673269&r1=673268&r2=673269&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Tue Jul 1
21:11:34 2008
@@ -123,6 +123,10 @@
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>nekohtml</groupId>
+ <artifactId>xercesMinimal</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=673269&r1=673268&r2=673269&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Tue Jul 1 21:11:34 2008
@@ -68,6 +68,7 @@
import java.util.List;
import java.util.Map;
import java.io.*;
+import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.webdav.lock.LockManager;
import org.apache.jackrabbit.webdav.lock.SimpleLockManager;
@@ -167,6 +168,12 @@
{
repositories.add( ( (RepositoryLocator) locator
).getRepositoryId() );
}
+
+ //MRM-419 - Windows Webdav support. Should not 404 if there is no
content.
+ if (StringUtils.isEmpty(archivaLocator.getRepositoryId()))
+ {
+ throw new DavException(HttpServletResponse.SC_NO_CONTENT);
+ }
DavResource resource = null;
DavException e = null;
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java?rev=673269&r1=673268&r2=673269&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
Tue Jul 1 21:11:34 2008
@@ -32,7 +32,6 @@
import
org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">James William Dumay</a>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=673269&r1=673268&r2=673269&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jul 1 21:11:34 2008
@@ -80,8 +80,6 @@
<exclude>velocity:velocity-dep</exclude>
<exclude>classworlds:classworlds</exclude>
<exclude>javax.transaction:jta</exclude>
- <exclude>xerces:xercesImpl</exclude>
- <exclude>xerces:xmlParserAPIs</exclude>
<exclude>javax.sql:jdbc-stdext</exclude>
<exclude>ant:ant-optional</exclude>
<!--
exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude -->
@@ -224,16 +222,6 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
<version>1.4</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -459,14 +447,6 @@
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
