svn commit: r430893 - in /webservices/commons/trunk/modules/neethi: pom.xml project.xml src/main/ src/main/java/ src/main/java/org/ src/org/ src/test/ src/test/java/ src/test/java/org/ test/org/

[jochen]

Author: jochen
Date: Fri Aug 11 13:57:15 2006
New Revision: 430893

URL: http://svn.apache.org/viewvc?rev=430893&view=rev
Log:
Preparing generation of site and distributables with Maven 2.

Added:
    webservices/commons/trunk/modules/neethi/src/main/
    webservices/commons/trunk/modules/neethi/src/main/java/
    webservices/commons/trunk/modules/neethi/src/main/java/org/
      - copied from r430720, webservices/commons/trunk/modules/neethi/src/org/
    webservices/commons/trunk/modules/neethi/src/test/
    webservices/commons/trunk/modules/neethi/src/test/java/
    webservices/commons/trunk/modules/neethi/src/test/java/org/
      - copied from r430720, webservices/commons/trunk/modules/neethi/test/org/
Removed:
    webservices/commons/trunk/modules/neethi/src/org/
    webservices/commons/trunk/modules/neethi/test/org/
Modified:
    webservices/commons/trunk/modules/neethi/pom.xml
    webservices/commons/trunk/modules/neethi/project.xml

Modified: webservices/commons/trunk/modules/neethi/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/pom.xml?rev=430893&r1=430892&r2=430893&view=diff
==============================================================================
--- webservices/commons/trunk/modules/neethi/pom.xml (original)
+++ webservices/commons/trunk/modules/neethi/pom.xml Fri Aug 11 13:57:15 2006
@@ -64,49 +64,52 @@
     <url>http://www.apache.org/</url>
   </organization>
   <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>src</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-        <excludes>
-          <exclude>**/package.html</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <targetPath>META-INF</targetPath>
-        <directory>${basedir}</directory>
-        <includes>
-          <include>LICENSE*</include>
-          <include>NOTICE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>test-resources</directory>
-        <includes>
-          <include>**/*.xml</include>
-          <include>**/*.xsd</include>
-        </includes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.3</source>
+          <target>1.3</target>
+        </configuration>
+      </plugin>
+      <plugin>
+               <!-- This should possibly better be done by using a resource
+                    definition. However, if we declare a resource with
+                    ${basedir} as the base directory, then the
+                    maven-source-plugin will add the whole directory to
+                    its contents.
+               -->
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="${project.build.outputDirectory}/META-INF">
+                  <fileset dir="${basedir}">
+                    <include name="LICENSE.txt"/>
+                    <include name="NOTICE.txt"/>
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>once</forkMode>
           <childDelegation>false</childDelegation>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-          <excludes>
-              <exclude>**/*SpacesTest.java</exclude>
-              <exclude>**/*AbstractOMSerializationTest.java</exclude>
-          </excludes>
+             <excludes>
+                   <exclude>**/PolicyTestCase.java</exclude>
+                 </excludes>
+                 <includes>
+                       <include>**/*Test*.java</include>
+                 </includes>
         </configuration>
       </plugin>
       <plugin>

Modified: webservices/commons/trunk/modules/neethi/project.xml
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/project.xml?rev=430893&r1=430892&r2=430893&view=diff
==============================================================================
--- webservices/commons/trunk/modules/neethi/project.xml (original)
+++ webservices/commons/trunk/modules/neethi/project.xml Fri Aug 11 13:57:15 
2006
@@ -140,8 +140,8 @@
        
        <build>
                <nagEmailAddress>commons-dev@ws.apache.org</nagEmailAddress>
-               <sourceDirectory>src</sourceDirectory>
-               <unitTestSourceDirectory>test</unitTestSourceDirectory>
+               <sourceDirectory>src/main/java</sourceDirectory>
+               <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
                
                <unitTest>
                        <excludes>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]