r1517 - xwiki/trunk

[Vincent Massol]

Author: vmassol
Date: 2006-11-08 10:12:11 +0100 (Wed, 08 Nov 2006)
New Revision: 1517

Removed:
   xwiki/trunk/project.properties
   xwiki/trunk/project.xml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Remove old and unused Maven1 build

Deleted: xwiki/trunk/project.properties
===================================================================
--- xwiki/trunk/project.properties	2006-11-07 20:22:39 UTC (rev 1516)
+++ xwiki/trunk/project.properties	2006-11-08 09:12:11 UTC (rev 1517)
@@ -1,26 +0,0 @@
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
-
-#maven.home = ${user.home}/maven
-lib.repo = ${user.home}/maven.repo
-
-maven.final.name = jrcs
-maven.jarResources.basedir = src/conf
-
-maven.parserJJTreeGrammar = ${src.dir}/java/org/apache/maven/java/parser/JavaParser.jjt
-maven.outputDirectory = ${src.dir}/java/org/apache/maven/java/parser
-maven.parserGrammar = ${src.dir}/java/org/apache/maven/java/parser/JavaParser.jj
-maven.nodePackage = org.apache.maven.java.parser
-maven.workspace = src/descriptors/workspace/jvz.xml
-
-maven.parserGrammar.xwiki = ${src.dir}/com/xpn/xwiki/ArchiveParser.jj
-maven.outputDirectory.xwiki = ${build.dir}/com/xpn/xwiki
-maven.announcement = beta2
-
-maven.checkstyle.excludes = 
-maven.checkstyle.header.file = ../LICENSE
-
-#callbacks
-maven.core.callback.post-compile.buildFile=maven_build.xml
-maven.core.callback.post-compile.buildTarget=copy-test-files

Deleted: xwiki/trunk/project.xml
===================================================================
--- xwiki/trunk/project.xml	2006-11-07 20:22:39 UTC (rev 1516)
+++ xwiki/trunk/project.xml	2006-11-08 09:12:11 UTC (rev 1517)
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  
-  <pomVersion>3</pomVersion>
-  <id>xwiki</id>
-  <name>XWiki</name>
-  <currentVersion>0.1.1-dev</currentVersion>
-  <organization>
-	  <name>XPertNet, Ludovic Dubost</name>
-	  <url>http://www.xpertnet.com</url>
-  </organization>
-  <inceptionYear>2003</inceptionYear>
-  <package>com.xpn.xwiki</package>
-
-
-  <!-- Gump integration -->
-  <gumpRepositoryId>jakarta</gumpRepositoryId>
-
-  <description>
-    XWiki Content and Application Framework
-  </description>
-
-  <shortDescription>XWiki</shortDescription>
-
-  <url>http://www.xpertnet.biz/twiki/bin/view/XWiki/</url>
-  <issueTrackingUrl>http://bugzilla.xpertnet.biz/</issueTrackingUrl>
-  <siteAddress>www.xpertnet.biz</siteAddress>
-  <siteDirectory>/twiki/bin/view/XWiki/</siteDirectory>
-  <distributionDirectory>/twiki/bin/view/XWiki/XWikiDownload</distributionDirectory>
-
-  <repository>
-    <connection>scm:cvs:pserver:anonymouns at cvs.xpernet.biz:/intranet/cvsroot:projects/xwiki</connection>
-    <url>http://cvsweb.xpertnet.biz/cvsweb/cvsweb.cgi/projects/xwiki</url>
-  </repository>
-
-  <mailingLists>
-    <mailingList>
-      <name>XWiki User List</name>
-      <subscribe>xwiki-user-subscribe at mailman.xpertnet.biz</subscribe>
-      <unsubscribe>xwiki-user-unsubscribe at mailman.xpertnet.biz</unsubscribe>
-      <archive>http://mailman.xpertnet.biz/admin?listName=xwiki-user@mailman.xpertnet.biz</archive>
-    </mailingList>
-  </mailingLists>
-
-  <developers>
-    <developer>
-      <name>Ludovic Dubost</name>
-      <id>ludovic</id>
-      <email>ludovic at xpertnet.biz</email>
-      <organization>XPertNet.biz</organization>
-    </developer>
-  </developers>
-
-
-  <!-- Need to mark these as compile-time/run-time -->
-
-  <dependencies>    
-    <dependency>
-      <id>oro</id>
-      <version>2.0.6</version>
-      <url>http://jakarta.apache.org/oro/</url>
-    </dependency>  
-  </dependencies>
-
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <integrationUnitTestSourceDirectory/>
-    <aspectSourceDirectory/>
-
-    <!-- Unit test classes -->
-    <unitTestPatterns>
-      <unitTestPattern>include = **/*Test*.java</unitTestPattern>
-      <unitTestPattern>exclude = **/DiffTest.java</unitTestPattern>
-    </unitTestPatterns>
-
-    <!-- Integration unit test classes -->
-    <integrationUnitTestPatterns>
-    </integrationUnitTestPatterns>
-
-    <!-- J A R  R E S O U R C E S -->
-    <!-- Resources that are packaged up inside the JAR file -->
-
-    <!-- These are ant pattern sets -->
-    <jarResources>
-    </jarResources>
-
-    <jars>
-    </jars>
-  </build>
-</project>
-