Fix integration tests

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163493 13f79535-47bb-0310-9956-ffa450edef68

maven-core-it/integration-tests.txt

@@ -11,4 +11,4 @@ it0011
 it0012
 it0013
 it0015
-#it0016
+it0016

maven-core-it/it0016/expected-results.txt

@@ -1,4 +1,4 @@
 target/classes/org/apache/maven/it0016/Person.class
-target/test-classes/org/apache/maven/it0016/PersonTest.class
 target/maven-core-it0016-1.0.war
-target/maven-core-it0016-1.0.war!/it0016.properties
+target/maven-core-it0016-1.0.war!/index.html
+target/maven-core-it0016-1.0.war!/WEB-INF/classes/org/apache/maven/it0016/Person.class

maven-core-it/it0016/src/main/java/org/apache/maven/it0016/Person.java

@@ -0,0 +1,16 @@
+package org.apache.maven.it0016;
+
+public class Person
+{
+    private String name;
+    
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+}

maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java

@@ -123,6 +123,13 @@ import org.codehaus.plexus.util.FileUtils;
  *  default="war"
  *  description=""
  * @parameter
+ *  name="classesDirectory"
+ *  type="String"
+ *  required="true"
+ *  validator=""
+ *  expression="#project.build.output"
+ *  description=""
+ * @parameter
  *  name="outputDirectory"
  *  type="String"
  *  required="true"
@@ -167,6 +174,8 @@ public class WarMojo
 
     private ArtifactRepository localRepository;
 
+    private File classesDirectory;
+
     private String outputDirectory;
 
     private File webappDirectory;
@@ -214,7 +223,12 @@ public class WarMojo
 
         File tldDirectory = new File( webappDirectory, WEB_INF + "/tld" );
 
-        File classesDirectory = new File( webappDirectory, WEB_INF + "/classes" );
+        File webappClassesDirectory = new File( webappDirectory, WEB_INF + "/classes" );
+
+        if ( classesDirectory.exists() )
+        {
+            FileUtils.copyDirectoryStructure( classesDirectory, webappClassesDirectory );
+        }
 
         Set artifacts = project.getArtifacts();
 
@@ -243,7 +257,7 @@ public class WarMojo
 
         copyResources( warSourceDirectory, webappDirectory, warSourceIncludes, warSourceExcludes, webXml );
 
-        //buildWebapp( project );
+        buildWebapp( project );
     }
 
     public void generateInPlaceWebapp()
@@ -306,6 +320,8 @@ public class WarMojo
 
         localRepository = (ArtifactRepository) request.getParameter( "localRepository" );
 
+        classesDirectory = new File( (String) request.getParameter( "classesDirectory" ) );
+
         outputDirectory = (String) request.getParameter( "outputDirectory" );
 
         webappDirectory = new File( (String) request.getParameter( "webappDirectory" ) );