r1399 - in xwiki/trunk: . core lib

[Vincent Massol]

Author: vmassol
Date: 2006-10-16 22:42:02 +0200 (Mon, 16 Oct 2006)
New Revision: 1399

Added:
   xwiki/trunk/lib/oscache-2.3.2-xwiki.jar
Removed:
   xwiki/trunk/lib/oscache-2.3.2M.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 oscache jar and added xwiki classifier as we have patches applied to it

Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-10-16 20:28:09 UTC (rev 1398)
+++ xwiki/trunk/build.xml	2006-10-16 20:42:02 UTC (rev 1399)
@@ -97,7 +97,7 @@
     	mysql-connector-java-3.1.7-bin.jar,
     	hsqldb-1.8.0.jar,
     	odmg-3.0.jar,
-    	oscache-2.3.2M.jar,
+    	oscache-2.3.2-xwiki.jar,
     	concurrent.jar,
     	jgroups-2.4CR1.jar,
     	swarmcache.jar,

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-10-16 20:28:09 UTC (rev 1398)
+++ xwiki/trunk/core/pom.xml	2006-10-16 20:42:02 UTC (rev 1399)
@@ -29,8 +29,6 @@
             in addition there's a failed dep: jsr170:jcr:jar:1.0 (should be javax.jcr). Reported in
             http://jira.codehaus.org/browse/MEV-453
 alexa.jar: what version are we using? Is the license compatible?
-oscache.jar : there's only version 2.3 on repo1.maven.org. In lib/ it says 2.3.2M. We need to upload version 2.3.2 to
-              the central repo
 googleaddwords.jar: what version and license?
               
 -->
@@ -85,6 +83,15 @@
       <classifier>xwiki</classifier>
     </dependency>
 
+    <!-- Version 2.3.2 of oscache needs to be uploaded to Maven2 central repo and XWiki's patch to be applied
+         before we can remove this jar from our repo -->
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>oscache</artifactId>
+      <version>2.3.2</version>
+      <classifier>xwiki</classifier>
+    </dependency>
+
     <!-- Standard dependencies found in the main Maven remote repository -->
 
     <dependency>

Added: xwiki/trunk/lib/oscache-2.3.2-xwiki.jar
===================================================================
(Binary files differ)


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

Deleted: xwiki/trunk/lib/oscache-2.3.2M.jar
===================================================================
(Binary files differ)

Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr	2006-10-16 20:28:09 UTC (rev 1398)
+++ xwiki/trunk/xwiki.ipr	2006-10-16 20:42:02 UTC (rev 1399)
@@ -556,7 +556,7 @@
     </library>
     <library name="cache">
       <CLASSES>
-        <root url="jar://$PROJECT_DIR$/lib/oscache-2.3.2M.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/oscache-2.3.2-xwiki.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/jgroups-2.2.9.3.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/concurrent-1.3.2.jar!/" />
       </CLASSES>