r1508 - in xwiki/trunk: core web/exo web/standard

[Vincent Massol]

Author: vmassol
Date: 2006-11-03 15:53:31 +0100 (Fri, 03 Nov 2006)
New Revision: 1508

Modified:
   xwiki/trunk/core/pom.xml
   xwiki/trunk/web/exo/
   xwiki/trunk/web/exo/pom.xml
   xwiki/trunk/web/standard/
   xwiki/trunk/web/standard/pom.xml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Commented out the runtime scope for the Servlet API. We need to investigate why as the Servlet API should be a runtime dependency
* Standard and Exo WARs are now generated by the m2 build. We now need to do a dependency hunt to see which ones are missing and different from the Ant's build. WAR overlaying for the exo WAR is working perfectly fine.


Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-11-03 14:39:21 UTC (rev 1507)
+++ xwiki/trunk/core/pom.xml	2006-11-03 14:53:31 UTC (rev 1508)
@@ -349,7 +349,9 @@
       <!-- Note: The 2.4 version is not technically correct as 2.4 corresponds to a specification # and is not an
            implementation version. The central repo would need to be fixed... -->
       <version>2.4</version>
-      <scope>runtime</scope>
+      <!-- TODO: Compilation is failing when the runtime scope is set. We need to investigate why as the servlet
+           API should be a runtime dependency -->
+      <!--scope>runtime</scope-->
     </dependency>
   </dependencies>
 </project>


Property changes on: xwiki/trunk/web/exo
___________________________________________________________________
Name: svn:ignore
   + target


Modified: xwiki/trunk/web/exo/pom.xml
===================================================================
--- xwiki/trunk/web/exo/pom.xml	2006-11-03 14:39:21 UTC (rev 1507)
+++ xwiki/trunk/web/exo/pom.xml	2006-11-03 14:53:31 UTC (rev 1508)
@@ -32,6 +32,12 @@
   <packaging>war</packaging>
   <description>The Exoplatform XWiki WAR</description>
   <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki</groupId>
+      <artifactId>xwiki-web-standard</artifactId>
+      <version>${version}</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
 </project>
         
\ No newline at end of file


Property changes on: xwiki/trunk/web/standard
___________________________________________________________________
Name: svn:ignore
   + target


Modified: xwiki/trunk/web/standard/pom.xml
===================================================================
--- xwiki/trunk/web/standard/pom.xml	2006-11-03 14:39:21 UTC (rev 1507)
+++ xwiki/trunk/web/standard/pom.xml	2006-11-03 14:53:31 UTC (rev 1508)
@@ -32,6 +32,11 @@
   <packaging>war</packaging>
   <description>The standard XWiki WAR</description>
   <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki</groupId>
+      <artifactId>xwiki-core</artifactId>
+      <version>${version}</version>
+    </dependency>
   </dependencies>
 </project>
         
\ No newline at end of file