From a0170714e3e421c73990dcc80121a3abb12d561b Mon Sep 17 00:00:00 2001
From: James William Dumay <jdumay@apache.org>
Date: Wed, 2 Jul 2008 04:11:34 +0000
Subject: [PATCH] MRM-855 - java.lang.NoClassDefFoundError:
 org/apache/xml/serialize/OutputFormat

* removed excludes for xerces:*
* updated enforcer rules
* excluded xerces from shade in archiva-cli



git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@673269 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-cli/pom.xml                           |  1 +
 archiva-jetty/pom.xml                         |  6 ------
 .../archiva-web/archiva-webdav/pom.xml        |  4 ++++
 .../webdav/ArchivaDavResourceFactory.java     |  7 +++++++
 .../webdav/ArchivaDavSessionProvider.java     |  1 -
 pom.xml                                       | 20 -------------------
 6 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 03512a1a5..6344a198b 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -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>
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index a655722d2..68f2d91e8 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 228df0fee..c37e47c5f 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -123,6 +123,10 @@
           <groupId>nekohtml</groupId>
           <artifactId>nekohtml</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>xercesMinimal</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
index 1914be4aa..3cec4936f 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
@@ -68,6 +68,7 @@ import java.util.HashMap;
 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 @@ public class ArchivaDavResourceFactory
         {
             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;
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
index 085a6e770..ad96939d1 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavSessionProvider.java
@@ -32,7 +32,6 @@ import org.codehaus.plexus.redback.policy.AccountLockedException;
 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:james@atlassian.com">James William Dumay</a>
diff --git a/pom.xml b/pom.xml
index 4d0aa7093..b0eed3708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
-- 
2.39.5