r1396 - in xwiki/trunk: . core lib src/main/web/WEB-INF

[Vincent Massol]

Author: vmassol
Date: 2006-10-16 20:14:00 +0200 (Mon, 16 Oct 2006)
New Revision: 1396

Added:
   xwiki/trunk/lib/radeox-UNKNOWN-xwiki.jar
Removed:
   xwiki/trunk/lib/radeox.jar
Modified:
   xwiki/trunk/build.xml
   xwiki/trunk/core/pom.xml
   xwiki/trunk/lib/exo-platform.container-2.0.jar
   xwiki/trunk/src/main/web/WEB-INF/version.properties
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Created custom XWiki remote repo on http://laam.xpertnet.biz/~vmassol/repository/
* Added Radeox and Exoplatform.container dependencies to the m2 build
* Replaced exo-platform.container-2.0.jar with the version from http://maven.objectweb.org/maven2/exo-platform/exo-platform.container/2.0/exo-platform.container-2.0.jar
* Renamed radeox jar in lib/ to have a version and a xwiki classifier (to show that it's been modified by xwiki)

Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-10-16 06:33:23 UTC (rev 1395)
+++ xwiki/trunk/build.xml	2006-10-16 18:14:00 UTC (rev 1396)
@@ -129,7 +129,7 @@
         struts-1.2.9.jar,
         velocity-1.4.jar,velocity-tools-1.1.jar,
         securityfilter-2.0.jar,
-        radeox.jar,
+        radeox-UNKNOWN-xwiki.jar,
         portlet-api-1.0.jar,
         xmlrpc-1.2.jar,
         groovy-all-1.0-jsr-06.jar,

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-10-16 06:33:23 UTC (rev 1395)
+++ xwiki/trunk/core/pom.xml	2006-10-16 18:14:00 UTC (rev 1396)
@@ -23,7 +23,6 @@
 <!-- NOTE: THIS IS A WORK IN PROGRESS. IT'S STILL MISSING SOME JARS FOR THE COMPILATION TO WORK -->
 <!-- ISSUES:
 
-radeox.jar : custom repackaging. Custom changes need to be brought to XWiki instead. Sergiu working on this.
 suigeneris.jrcs: doesn't exist on central repo. Is this something generic?
 jfreechart: I've used v 1.0.0 instead of 1.0.0-rc1 as in lib/. Is that ok? Note that ther's also a 1.0.2. Should we
             upgrade to that?
@@ -49,7 +48,31 @@
   <packaging>jar</packaging>
   <description>The main XWiki JAR</description>
   <dependencies>
+
+    <!-- Dependencies that we need to fix so that we don't need to have them in our custom remote repository -->
+
+    <!-- This JAR has been modified by Sergiu Dumitriu to generate valid xhtml. TODO: create a patch and send it
+         to the radeox project. Other solution: extract the modifications outside of the radeox jar and into XWiki
+         source tree. See http://jira.xwiki.org/jira/browse/XWIKI-377 -->
     <dependency>
+      <groupId>radeox</groupId>
+      <artifactId>radeox</artifactId>
+      <version>UNKNOWN</version>
+      <classifier>xwiki</classifier>
+    </dependency>
+
+    <!-- Exo POMs seems to have a problem. See http://jira.exoplatform.org/browse/PLT-24. When this is resolved,
+         get the Exo JARS from the ObjectWeb remote repo (or from Maven3's official remote repo when ObjectWeb
+         is synced to there. -->
+    <dependency>
+      <groupId>exo-platform</groupId>
+      <artifactId>exo-platform.container</artifactId>
+      <version>2.0</version>
+    </dependency>
+
+    <!-- Standard dependencies found in the main Maven remote repository -->
+
+    <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>1.4</version>
@@ -142,5 +165,21 @@
       <version>1.6.5</version>
     </dependency>
   </dependencies>
+
+  <repositories>
+
+    <!-- This is XWiki's custom remote repository containing artifacts that are not present on Maven's main
+         remote repository. To be removed once we're only using official JARs -->
+    <repository>
+      <id>xwiki</id>
+      <name>XWiki Maven2 Remote Repository</name>
+      <url>http://laam.xpertnet.biz/~vmassol/repository</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+
+  </repositories>
+
 </project>
         
\ No newline at end of file

Modified: xwiki/trunk/lib/exo-platform.container-2.0.jar
===================================================================
(Binary files differ)

Added: xwiki/trunk/lib/radeox-UNKNOWN-xwiki.jar
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/lib/radeox-UNKNOWN-xwiki.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: xwiki/trunk/lib/radeox.jar
===================================================================
(Binary files differ)

Modified: xwiki/trunk/src/main/web/WEB-INF/version.properties
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/version.properties	2006-10-16 06:33:23 UTC (rev 1395)
+++ xwiki/trunk/src/main/web/WEB-INF/version.properties	2006-10-16 18:14:00 UTC (rev 1396)
@@ -1,2 +1,2 @@
-#Sun Aug 20 09:09:03 CEST 2006
-build.number=0021
+#Mon Oct 16 18:05:24 GMT 2006
+build.number=0022