r1435 - xwiki/trunk xwiki/trunk/core xwiki-plugins/trunk xwiki-plugins/trunk/alexa

Sat Oct 21 18:30:30 CEST 2006

Author: vmassol
Date: 2006-10-21 18:30:30 +0200 (Sat, 21 Oct 2006)
New Revision: 1435

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

* Added start of a m2 pom.xml for xwiki-plugins. Note that this is not working yet as it needs the xwiki core to build first.

Modified: xwiki/trunk/core/pom.xml
===================================================================

--- xwiki/trunk/core/pom.xml	2006-10-21 12:33:35 UTC (rev 1434)
+++ xwiki/trunk/core/pom.xml	2006-10-21 16:30:30 UTC (rev 1435)
@@ -25,8 +25,6 @@
 
 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?
-googleaddwords.jar: what version and license?
-              
 -->
 
 <project>
@@ -186,21 +184,5 @@
       <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/pom.xml
===================================================================
--- xwiki/trunk/pom.xml	2006-10-21 12:33:35 UTC (rev 1434)
+++ xwiki/trunk/pom.xml	2006-10-21 16:30:30 UTC (rev 1435)
@@ -53,5 +53,17 @@
   <modules>
     <module>core</module>
   </modules>
+  <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

Added: xwiki-plugins/trunk/alexa/pom.xml
===================================================================
--- xwiki-plugins/trunk/alexa/pom.xml	2006-10-21 12:33:35 UTC (rev 1434)
+++ xwiki-plugins/trunk/alexa/pom.xml	2006-10-21 16:30:30 UTC (rev 1435)
@@ -0,0 +1,66 @@
+<!--
+ *
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<!-- NOTE: THIS IS A WORK IN PROGRESS. IT'S STILL MISSING SOME JARS FOR THE COMPILATION TO WORK -->
+<!-- ISSUES:
+
+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?
+googleaddwords.jar: what version and license?
+              
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.xpn.xwiki.plugin</groupId>
+    <artifactId>xwiki-plugins</artifactId>
+    <version>0.9-SNAPSHOT</version>
+  </parent>
+  <artifactId>xwiki-plugin-alexa</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  <name>XWiki Alexa Plugin</name>
+  <packaging>jar</packaging>
+  <description>XWiki Alexa Plugin</description>
+  <dependencies>
+
+    <!-- Dependencies that we need to fix so that we don't need to have them in our custom remote repository -->
+
+    <dependency>
+      <groupId>com.amazon</groupId>
+      <artifactId>alexa</artifactId>
+      <version>UNKNOWN</version>
+      <classifier>xwiki</classifier>
+    </dependency>
+
+    <!-- Standard dependencies found in the main Maven remote repository -->
+
+    <dependency>
+      <groupId>com.xpn.xwiki</groupId>
+      <artifactId>xwiki-core</artifactId>
+      <version>0.9-SNAPSHOT</version>
+    </dependency>
+
+  </dependencies>
+
+</project>
+        
\ No newline at end of file


Property changes on: xwiki-plugins/trunk/alexa/pom.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: xwiki-plugins/trunk/pom.xml
===================================================================
--- xwiki-plugins/trunk/pom.xml	2006-10-21 12:33:35 UTC (rev 1434)
+++ xwiki-plugins/trunk/pom.xml	2006-10-21 16:30:30 UTC (rev 1435)
@@ -0,0 +1,39 @@
+<!--
+ *
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.xpn.xwiki</groupId>
+    <artifactId>xwiki</artifactId>
+    <version>0.9-SNAPSHOT</version>
+  </parent>
+  <groupId>com.xpn.xwiki.plugin</groupId>
+  <artifactId>xwiki-plugins</artifactId>
+  <packaging>pom</packaging>
+  <name>XWiki Plugins</name>
+  <description>The XWiki Plugins</description>
+  <modules>
+    <module>alexa</module>
+  </modules>
+</project>
+        
\ No newline at end of file


Property changes on: xwiki-plugins/trunk/pom.xml
___________________________________________________________________
Name: svn:eol-style
   + native



