maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject cvs commit: maven-components/maven-core-it/it0016/src/main/java/org/apache/maven/it0016 Person.java
Date Tue, 08 Mar 2005 06:39:50 GMT
evenisse    2005/03/07 22:39:50

  Modified:    maven-core-it integration-tests.txt
               maven-core-it/it0016 expected-results.txt
               maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war
                        WarMojo.java
  Added:       maven-core-it/it0016/src/main/java/org/apache/maven/it0016
                        Person.java
  Log:
  Fix integration tests
  
  Revision  Changes    Path
  1.20      +1 -1      maven-components/maven-core-it/integration-tests.txt
  
  Index: integration-tests.txt
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core-it/integration-tests.txt,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- integration-tests.txt	8 Mar 2005 01:43:37 -0000	1.19
  +++ integration-tests.txt	8 Mar 2005 06:39:50 -0000	1.20
  @@ -11,4 +11,4 @@
   it0012
   it0013
   it0015
  -#it0016
  +it0016
  
  
  
  1.2       +2 -2      maven-components/maven-core-it/it0016/expected-results.txt
  
  Index: expected-results.txt
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core-it/it0016/expected-results.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- expected-results.txt	3 Mar 2005 09:08:47 -0000	1.1
  +++ expected-results.txt	8 Mar 2005 06:39:50 -0000	1.2
  @@ -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
  
  
  
  1.5       +19 -3     maven-components/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
  
  Index: WarMojo.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WarMojo.java	7 Mar 2005 21:46:14 -0000	1.4
  +++ WarMojo.java	8 Mar 2005 06:39:50 -0000	1.5
  @@ -123,6 +123,13 @@
    *  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 @@
   
       private ArtifactRepository localRepository;
   
  +    private File classesDirectory;
  +
       private String outputDirectory;
   
       private File webappDirectory;
  @@ -214,7 +223,12 @@
   
           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 @@
   
           copyResources( warSourceDirectory, webappDirectory, warSourceIncludes, warSourceExcludes,
webXml );
   
  -        //buildWebapp( project );
  +        buildWebapp( project );
       }
   
       public void generateInPlaceWebapp()
  @@ -306,6 +320,8 @@
   
           localRepository = (ArtifactRepository) request.getParameter( "localRepository"
);
   
  +        classesDirectory = new File( (String) request.getParameter( "classesDirectory"
) );
  +
           outputDirectory = (String) request.getParameter( "outputDirectory" );
   
           webappDirectory = new File( (String) request.getParameter( "webappDirectory" )
);
  
  
  
  1.1                  maven-components/maven-core-it/it0016/src/main/java/org/apache/maven/it0016/Person.java
  
  Index: Person.java
  ===================================================================
  package org.apache.maven.it0016;
  
  public class Person
  {
      private String name;
      
      public void setName( String name )
      {
          this.name = name;
      }
      
      public String getName()
      {
          return name;
      }
  }
  
  
  

Mime
View raw message