r1398 - in xwiki/trunk: . core lib

[Vincent Massol]

Author: vmassol
Date: 2006-10-16 22:28:09 +0200 (Mon, 16 Oct 2006)
New Revision: 1398

Added:
   xwiki/trunk/lib/org.suigeneris.jrcs.diff-0.3.0-xwiki.jar
   xwiki/trunk/lib/org.suigeneris.jrcs.rcs-0.3.0-xwiki.jar
Removed:
   xwiki/trunk/lib/org.suigeneris.jrcs.diff-0.3.0.jar
   xwiki/trunk/lib/org.suigeneris.jrcs.rcs-0.3.0.jar
Modified:
   xwiki/trunk/build.xml
   xwiki/trunk/core/pom.xml
   xwiki/trunk/xwiki.ipr
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Added suigeneric.org JRCS jars and added xwiki classifier as we have patches applied to them

Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-10-16 19:21:41 UTC (rev 1397)
+++ xwiki/trunk/build.xml	2006-10-16 20:28:09 UTC (rev 1398)
@@ -124,8 +124,8 @@
     	ecs-1.4.2.jar,
     	oro-2.0.8.jar,
     	log4j-1.2.13.jar,
-        org.suigeneris.jrcs.rcs-0.3.0.jar,
-        org.suigeneris.jrcs.diff-0.3.0.jar,
+        org.suigeneris.jrcs.rcs-0.3.0-xwiki.jar,
+        org.suigeneris.jrcs.diff-0.3.0-xwiki.jar,
         struts-1.2.9.jar,
         velocity-1.4.jar,velocity-tools-1.1.jar,
         securityfilter-2.0.jar,

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-10-16 19:21:41 UTC (rev 1397)
+++ xwiki/trunk/core/pom.xml	2006-10-16 20:28:09 UTC (rev 1398)
@@ -23,7 +23,6 @@
 <!-- NOTE: THIS IS A WORK IN PROGRESS. IT'S STILL MISSING SOME JARS FOR THE COMPILATION TO WORK -->
 <!-- ISSUES:
 
-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?
 jackrabbit: problem with the jackrabbit POM including lots of dependencies which should probabyl be optional and
@@ -70,6 +69,22 @@
       <version>2.0</version>
     </dependency>
 
+    <!-- The JRCS JARS are are in our repo till we get them published on the Maven2 central repository and till
+         we haven't succeeded in haviong suigeneric.org apply our patches.
+         JRCS home page: http://www.suigeneris.org/kb/display/jrcs/JRCS+Home -->
+    <dependency>
+      <groupId>org.suigeneris</groupId>
+      <artifactId>jrcs.diff</artifactId>
+      <version>0.3.0</version>
+      <classifier>xwiki</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.suigeneris</groupId>
+      <artifactId>jrcs.rcs</artifactId>
+      <version>0.3.0</version>
+      <classifier>xwiki</classifier>
+    </dependency>
+
     <!-- Standard dependencies found in the main Maven remote repository -->
 
     <dependency>

Copied: xwiki/trunk/lib/org.suigeneris.jrcs.diff-0.3.0-xwiki.jar (from rev 1395, xwiki/trunk/lib/org.suigeneris.jrcs.diff-0.3.0.jar)

Deleted: xwiki/trunk/lib/org.suigeneris.jrcs.diff-0.3.0.jar
===================================================================
(Binary files differ)

Copied: xwiki/trunk/lib/org.suigeneris.jrcs.rcs-0.3.0-xwiki.jar (from rev 1395, xwiki/trunk/lib/org.suigeneris.jrcs.rcs-0.3.0.jar)

Deleted: xwiki/trunk/lib/org.suigeneris.jrcs.rcs-0.3.0.jar
===================================================================
(Binary files differ)

Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr	2006-10-16 19:21:41 UTC (rev 1397)
+++ xwiki/trunk/xwiki.ipr	2006-10-16 20:28:09 UTC (rev 1398)
@@ -406,7 +406,7 @@
     </library>
     <library name="Radeox">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/lib/radeox.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/radeox-UNKNOWN-xwiki.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/asm-util-1.5.3.jar!/" />
       </CLASSES>
       <JAVADOC />
@@ -565,8 +565,8 @@
     </library>
     <library name="Jrcs">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/lib/org.suigeneris.jrcs.rcs-0.3.0.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/org.suigeneris.jrcs.diff-0.3.0.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.suigeneris.jrcs.rcs-0.3.0-xwiki.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/org.suigeneris.jrcs.diff-0.3.0-xwiki.jar!/" />
       </CLASSES>
       <JAVADOC />
       <SOURCES>