repairing build from movement of some modules to sandbox

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1051 7e9141cc-0065-0410-87d8-b60c137991c4

2 files changed, 0 insertions, 109 deletions

diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index ead8dfdccc..1d34668af3 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -102,11 +102,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp-verifier</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebappVerifierConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebappVerifierConfiguration.java
deleted file mode 100644
index df4b9f8820..0000000000
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebappVerifierConfiguration.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// ========================================================================
-// Copyright (c) 2009-2009 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
-// ========================================================================
-package org.eclipse.jetty.webapp;
-
-import java.io.File;
-import java.net.URI;
-import java.util.Collection;
-
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.webapp.verifier.RuleSet;
-import org.eclipse.jetty.webapp.verifier.Severity;
-import org.eclipse.jetty.webapp.verifier.Violation;
-import org.eclipse.jetty.webapp.verifier.WebappVerifier;
-
-/**
- * WebappVerifierConfiguration
- */
-public class WebappVerifierConfiguration implements Configuration
-{
-    /* ------------------------------------------------------------ */
-    /**
-     * @see org.eclipse.jetty.webapp.Configuration#configure(org.eclipse.jetty.webapp.WebAppContext)
-     */
-    public void configure(WebAppContext context) throws Exception
-    {
-
-    }
-
-    /* ------------------------------------------------------------ */
-    /**
-     * @see org.eclipse.jetty.webapp.Configuration#deconfigure(org.eclipse.jetty.webapp.WebAppContext)
-     */
-    public void deconfigure(WebAppContext context) throws Exception
-    {
-
-    }
-
-    /* ------------------------------------------------------------ */
-    /**
-     * @see org.eclipse.jetty.webapp.Configuration#postConfigure(org.eclipse.jetty.webapp.WebAppContext)
-     */
-    public void postConfigure(WebAppContext context) throws Exception
-    {
-
-    }
-
-    /* ------------------------------------------------------------ */
-    /**
-     * @see org.eclipse.jetty.webapp.Configuration#preConfigure(org.eclipse.jetty.webapp.WebAppContext)
-     */
-    public void preConfigure(WebAppContext context) throws Exception
-    {
-        if(Log.isDebugEnabled())
-        {
-            Log.debug("Configuring webapp verifier");
-        }
-        
-        URI configurationUri = new File( System.getProperty( "jetty.home" )).toURI().resolve( "etc/default-webapp-verifier.xml" );
-                
-        RuleSet suite = RuleSet.load( configurationUri.toURL() );
-        
-        String warLocation = context.getWar();
-        
-        if ( !warLocation.startsWith("file:" ) )
-        {
-            warLocation = "file:" + warLocation;
-        }
-        
-        WebappVerifier verifier = suite.createWebappVerifier( new URI( warLocation ) );
-        
-        verifier.visitAll();
-        
-        Collection<Violation> violations = verifier.getViolations();
-        
-        boolean haltWebapp = false;
-        
-        Log.info( " Webapp Verifier Report: " + violations.size()  + " violations" );
-        
-        for (Violation violation : violations)
-        {
-            if ( violation.getSeverity() == Severity.ERROR )
-            {
-                haltWebapp = true;
-            }
-            
-            Log.info( violation.toString() );           
-        }
-        
-        if ( haltWebapp )
-        {
-            throw new InstantiationException( "Configuration exception: webapp failed webapp verification" );
-        }
-    }
-}