[Wikitty-commits] r51 - in trunk: . wikitty-api wikitty-generators wikitty-hbase-impl wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-ui-gwt

Author: echatellier Date: 2010-05-12 12:12:03 +0200 (Wed, 12 May 2010) New Revision: 51 Url: http://nuiton.org/repositories/revision/wikitty/51 Log: Move all wikitty project to org.nuiton.wikitty (just pom done). Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-gwt/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -3,13 +3,19 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.1.4</version> + </parent> + <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> <modules> <module>wikitty-generators</module> @@ -23,96 +29,97 @@ <!--module>wikitty-ui-gwt</module--> </modules> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> - <!--groupId>org.sharengo.wikengo</groupId> - <artifactId>mavenpom</artifactId> - <version>1.0.2</version--> - </parent> - <dependencyManagement> - <dependencies> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugene.version}</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.135</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.0</version> + <scope>test</scope> + </dependency> + + <!-- GWT dependencies for GWT projects + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${gwtplatform}-libs</classifier> + <type>zip</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <classifier>${gwtplatform}</classifier> + <scope>provided</scope> + </dependency>--> + + </dependencies> - <!--<dependency> - <groupId>com.caucho</groupId> - <artifactId>resin-hessian</artifactId> - <version>${hessian.version}</version> - <scope>compile</scope> - </dependency> --> + </dependencyManagement> - <!-- GWT dependencies for GWT projects - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <classifier>${gwtplatform}-libs</classifier> - <type>zip</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <classifier>${gwtplatform}</classifier> - <scope>provided</scope> - </dependency>--> - - </dependencies> - - </dependencyManagement> - - <!--distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://nuiton.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url> - scpexe://nuiton.org/var/lib/redmine-${platform}/project-site/${projectId} - </url> - </site> - </distributionManagement--> - <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> @@ -124,9 +131,9 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty</name> + <name>Wikitty</name> - <description>wikitty multi-module project</description> + <description>Wikitty multi-module project</description> <inceptionYear>2009</inceptionYear> <!-- ************************************************************* --> @@ -136,20 +143,21 @@ <packaging>pom</packaging> <properties> - <!-- pour un muli module on doit fixer le projectId --> - <!--projectId>core-wikitty</projectId--> - <!--platform>nuiton.org</platform--> <projectId>wikitty</projectId> <!-- common versions used in sub-poms --> <!-- <gwt.version>1.7.0</gwt.version> --> - <junit.version>4.7</junit.version> + <eugene.version>1.0.1</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <hessian.version>3.1.6</hessian.version> <jetty.version>6.1.22</jetty.version> </properties> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <build> <pluginManagement> @@ -169,12 +177,7 @@ </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <!--repositories> - + <repositories> <repository> <id>sharengo-maven2-repository</id> <name>Sharengo's repository</name> @@ -188,7 +191,15 @@ <checksumPolicy>warn</checksumPolicy> </releases> </repository> - - </repositories--> - + <repository> + <id>jboss</id> + <url>http://repository.jboss.com/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> </project> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-api/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,20 +1,20 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty</artifactId> - <version>2.0</version> - </parent> - <dependencies> <!-- TEST --> <dependency> @@ -58,7 +58,6 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> </dependency> <dependency> @@ -85,23 +84,19 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-api</name> + <name>Wikitty :: api</name> - <description>public api of wikitty</description> + <description>Public wikitty API</description> <inceptionYear>2009</inceptionYear> <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> <packaging>jar</packaging> <properties> - <eugene.version>1.0.0</eugene.version> - <!-- where to generate sources --> - <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - <!-- where to generate test sources --> <!--<maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir>--> <maven.test.failure.ignore>false</maven.test.failure.ignore> @@ -136,8 +131,8 @@ <version>${eugene.version}</version> <dependencies> <dependency> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-generators</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> <version>${project.version}</version> </dependency> <!-- Meta model uml d'eclipse --> @@ -154,35 +149,39 @@ </dependency> </dependencies> </plugin> + <!-- Create a jar that includes all tests --> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <plugins> - <!-- Create a jar that includes all tests --> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> - <id>api generator</id> - <!-- - do not use the phase generate-XXX because it can be excecuted several times... - --> - <phase>process-sources</phase> - - <!--Configuration of model generator--> + <id>api-generation</id> + <phase>generate-sources</phase> + <!--<configuration> + <inputs>src/main/uml/wikitty-api:**\/*.uml</inputs> + <fullPackagePath>org.sharengo.wikitty</fullPackagePath> + <defaultPackage>org.sharengo.wikitty</defaultPackage> + <extractedPackages>org.sharengo.wikitty</extractedPackages> + <templates>org.sharengo.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals>--> <configuration> <addCompileDirectory>true</addCompileDirectory> <zargoResources> @@ -227,30 +226,4 @@ <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </project> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-generators/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,25 +1,25 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> - - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-generators</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty</artifactId> - <version>2.0</version> - </parent> - <dependencies> <dependency> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <artifactId>eugene</artifactId> + <scope>provided</scope> </dependency> </dependencies> @@ -27,7 +27,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-generators</name> + <name>Wikitty :: generators</name> <description>Wikitty generators</description> <inceptionYear>2009</inceptionYear> @@ -38,13 +38,6 @@ <packaging>jar</packaging> - <properties> - <eugene.version>1.0.0</eugene.version> - - <!-- where to generate sources --> - <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - </properties> - <build> <plugins> Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-hbase-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,20 +1,21 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-hbase-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hbase-impl</artifactId> + <dependencies> <!-- TEST --> <dependency> @@ -61,24 +62,11 @@ <scope>compile</scope> </dependency> - <!-- This one is a test dependency of core-wikitty-solr-impl - but not found during tests :( --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency> - - <!--dependency> - <groupId>com.caucho</groupId> - <artifactId>resin-hessian</artifactId> - </dependency--> - - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>${jetty.version}</version> + <scope>test</scope> </dependency> <dependency> @@ -100,12 +88,14 @@ <groupId>org.apache.hadoop.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>r785019-hbase-1329</version> + <!--version>3.3.0</version--> <scope>compile</scope> </dependency> <dependency> <groupId>org.hadoop</groupId> <artifactId>hadoop</artifactId> <version>0.20.0-plus4681-core</version> + <!--version>0.20.2</version --> <scope>compile</scope> </dependency> <dependency> @@ -124,6 +114,7 @@ <groupId>org.hadoop</groupId> <artifactId>hadoop-test</artifactId> <version>0.20.0</version> + <!--version>0.20.2</version--> <scope>test</scope> </dependency> <dependency> @@ -135,17 +126,17 @@ </dependencies> <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-hbase-impl</name> + <name>Wikitty :: wikitty-hbase-impl</name> <description>hbase impl of wikitty</description> <inceptionYear>2009</inceptionYear> <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> <packaging>jar</packaging> @@ -156,8 +147,8 @@ </properties> <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> <build> <plugins> @@ -176,21 +167,5 @@ </plugins> </build> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,15 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> <dependencies> <!-- TEST --> @@ -42,12 +43,6 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency> <!-- WIKITTY --> <dependency> @@ -61,11 +56,6 @@ <version>${project.version}</version> </dependency> - <!--dependency> - <groupId>com.caucho</groupId> - <artifactId>resin-hessian</artifactId> - </dependency--> - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> @@ -89,8 +79,6 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.experlog</groupId> @@ -98,41 +86,19 @@ <version>1.5.0</version> </dependency> </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-jdbc-impl</name> - - <description>public api of wikitty</description> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>Wikitty :: wikitty-jdbc-impl</name> + <description>Wikitty jdbc storage</description> <inceptionYear>2009</inceptionYear> <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> <packaging>jar</packaging> - <properties> - <!--maven.test.skip>false</maven.test.skip--> - </properties> - - <repositories> - - <repository> - <id>sharengo-maven-repository</id> - <name>Repo Sharengo</name> - <url>http://repository.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-jms-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,16 +1,16 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-jms-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jms-impl</artifactId> + <dependencies> <!-- WIKITTY --> <dependency> @@ -39,42 +39,21 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-jms-impl</name> + <name>Wikitty :: wikitty-jms-impl</name> <description>jms storage implementation</description> <inceptionYear>2010</inceptionYear> <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> <packaging>jar</packaging> - <properties> - <!--maven.test.skip>false</maven.test.skip--> - </properties> - - <repositories> - - <repository> - <id>sharengo-maven-repository</id> - <name>Repo Sharengo</name> - <url>http://repository.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-jpa-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,20 +1,21 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-jpa-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jpa-impl</artifactId> + <dependencies> <!-- TEST --> <dependency> @@ -29,13 +30,6 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency> <!-- LOG --> <dependency> @@ -150,24 +144,22 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.128</version> - <scope>test</scope> </dependency> </dependencies> <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-jpa-impl</name> + <name>Wikitty :: wikitty-jpa-impl</name> <description>jpa impl of wikitty</description> <inceptionYear>2009</inceptionYear> <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> <packaging>jar</packaging> @@ -176,34 +168,8 @@ </properties> <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </project> Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,15 +1,16 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-multistorage-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> + <dependencies> <!-- WIKITTY --> <dependency> @@ -31,14 +32,10 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.11</version> - <scope>test</scope> </dependency> <dependency> @@ -59,7 +56,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-multistorage-impl</name> + <name>Wikitty :: wikitty-multistorage-impl</name> <description>manage multi storage</description> <inceptionYear>2010</inceptionYear> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-solr-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,128 +1,111 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-solr-impl</artifactId> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty</artifactId> - <version>2.0</version> - </parent> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> - <dependencies> - <!-- COMPILE --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <!-- COMPILE --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <!-- SOLR --> - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <version>1.4.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency> + <!-- SOLR --> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.4.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> - <!-- TEST --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - </dependencies> + <!-- TEST --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> + <name>Wikitty :: wikitty-solr-impl</name> - <description>hbase impl of wikitty</description> - <inceptionYear>2009</inceptionYear> + <description>Wikiity solr search engine</description> + <inceptionYear>2009</inceptionYear> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <!--maven.test.skip>false</maven.test.skip> - <maven.test.failure.ignore>false</maven.test.failure.ignore--> - </properties> + <properties> + <!--maven.test.skip>false</maven.test.skip> <maven.test.failure.ignore>false</maven.test.failure.ignore --> + </properties> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-ui-gwt/pom.xml =================================================================== --- trunk/wikitty-ui-gwt/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-ui-gwt/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,24 +1,29 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-ui-gwt</artifactId> - <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> - <name>wikitty-ui-gwt</name> + <name>Wikitty :: wikitty-ui-gwt</name> <dependencies> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> - <groupId>org.sharengo</groupId> + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> <version>${current.version}</version> <scope>compile</scope>