r1445 - in xwiki/trunk: . core lib

[Vincent Massol]

Author: vmassol
Date: 2006-10-22 13:43:13 +0200 (Sun, 22 Oct 2006)
New Revision: 1445

Removed:
   xwiki/trunk/lib/jta.jar
Modified:
   xwiki/trunk/.classpath
   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

* Fixed jta jar

Modified: xwiki/trunk/.classpath
===================================================================
--- xwiki/trunk/.classpath	2006-10-22 09:43:37 UTC (rev 1444)
+++ xwiki/trunk/.classpath	2006-10-22 11:43:13 UTC (rev 1445)
@@ -77,7 +77,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/jimi.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jmock-1.1.0RC1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jmock-cglib-1.1.0RC1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jta-1.0.1B.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jtidy.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/junit-4.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ldap.jar"/>

Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-10-22 09:43:37 UTC (rev 1444)
+++ xwiki/trunk/build.xml	2006-10-22 11:43:13 UTC (rev 1445)
@@ -102,7 +102,7 @@
     	jgroups-2.4CR1.jar,
     	swarmcache.jar,
     	xalan-2.7.0.jar,xerces-2.7.1.jar,xsltc-2.7.0.jar,serializer-2.7.0.jar,xml-apis-2.0.2.jar,
-    	jta.jar,
+    	jta-1.0.1B.jar,
     	antlr-2.7.5.jar,
     	asm-1.5.3.jar,asm-util-1.5.3.jar,
         clover-1.3.9.jar,

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-10-22 09:43:37 UTC (rev 1444)
+++ xwiki/trunk/core/pom.xml	2006-10-22 11:43:13 UTC (rev 1445)
@@ -110,6 +110,14 @@
       <version>1.0-a1-amelentev-dev</version>
     </dependency>
 
+    <!-- VMA: I'm not sure if we have the right to distribute this jar. It's not on the M2 repository because
+         of licensing issues. -->
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+      <version>1.0.1B</version>
+    </dependency>
+
     <!-- Standard dependencies found in the main Maven remote repository -->
 
     <dependency>
@@ -199,6 +207,11 @@
       <artifactId>ant</artifactId>
       <version>1.6.5</version>
     </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxrpc-api</artifactId>
+      <version>1.1</version>
+    </dependency>
   </dependencies>
 </project>
         
\ No newline at end of file

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

Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr	2006-10-22 09:43:37 UTC (rev 1444)
+++ xwiki/trunk/xwiki.ipr	2006-10-22 11:43:13 UTC (rev 1445)
@@ -386,7 +386,7 @@
         <root url="jar://$PROJECT_DIR$/lib/odmg-3.0.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/asm-1.5.3.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/mysql-connector-java-3.1.7-bin.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/jta.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/jta-1.0.1B.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/hsqldb-1.8.0.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/hibernate-3.0.3.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/cglib-2.1.jar!/" />