You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/25 21:46:40 UTC

svn commit: r436918 - in /geronimo/server/trunk/modules/j2ee-schema: pom.xml src/java/ src/main/ src/main/java/ src/main/resources/ src/resources2/ src/test-data/ src/test/java/ src/test/java/org/ src/test/org/ src/test/resources/ src/xsl/

Author: jdillon
Date: Fri Aug 25 12:46:36 2006
New Revision: 436918

URL: http://svn.apache.org/viewvc?rev=436918&view=rev
Log:
(GERONIMO-2331) Convert to standard m2 layout

Added:
    geronimo/server/trunk/modules/j2ee-schema/src/main/
    geronimo/server/trunk/modules/j2ee-schema/src/main/java/
      - copied from r436898, geronimo/server/trunk/modules/j2ee-schema/src/java/
    geronimo/server/trunk/modules/j2ee-schema/src/main/resources/
      - copied from r436915, geronimo/server/trunk/modules/j2ee-schema/src/resources2/
    geronimo/server/trunk/modules/j2ee-schema/src/test/java/
    geronimo/server/trunk/modules/j2ee-schema/src/test/java/org/
      - copied from r436898, geronimo/server/trunk/modules/j2ee-schema/src/test/org/
    geronimo/server/trunk/modules/j2ee-schema/src/test/resources/
      - copied from r436898, geronimo/server/trunk/modules/j2ee-schema/src/test-data/
Removed:
    geronimo/server/trunk/modules/j2ee-schema/src/java/
    geronimo/server/trunk/modules/j2ee-schema/src/resources2/
    geronimo/server/trunk/modules/j2ee-schema/src/test-data/
    geronimo/server/trunk/modules/j2ee-schema/src/test/org/
    geronimo/server/trunk/modules/j2ee-schema/src/xsl/
Modified:
    geronimo/server/trunk/modules/j2ee-schema/pom.xml

Modified: geronimo/server/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/j2ee-schema/pom.xml?rev=436918&r1=436917&r2=436918&view=diff
==============================================================================
--- geronimo/server/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/j2ee-schema/pom.xml Fri Aug 25 12:46:36 2006
@@ -47,7 +47,12 @@
     
     <dependencies>
         
-        <!-- Thirdparty Dependencies -->
+        <!-- might not be necessary -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>xmlbeans</groupId>
@@ -64,13 +69,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
         
-        <!-- might not be necessary -->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
         <!--
         NOTE: The full source for this artifact is private due to Sun licensing issues.
               To view the generated XmlBeans source please see the -src artifact in the repository:
@@ -88,31 +86,6 @@
          </dependency>
 
     </dependencies>
-    
-    <build>
-        <!--
-        FIXME: Convert module to m2 standard layout
-        -->
-        
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
-
-        <resources>
-            <resource>
-                <directory>src/resources2</directory>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test-data</directory>
-            </testResource>
-
-            <testResource>
-                <directory>src/test-resources</directory>
-            </testResource>
-        </testResources>
-    </build>
 
 </project>