- Wikitty-commits - mailman.cloud.codelutin.com

r196 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-ui-zk
by tchemit＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: tchemit Date: 2010-07-21 12:12:27 +0200 (Wed, 21 Jul 2010) New Revision: 196 Url: http://nuiton.org/repositories/revision/wikitty/196 Log: add svn:ingore on project files Modified: trunk/ trunk/wikitty-api/ trunk/wikitty-generators/ trunk/wikitty-hessian-client/ trunk/wikitty-hessian-server/ trunk/wikitty-jdbc-impl/ trunk/wikitty-multistorage-impl/ trunk/wikitty-solr-impl/ trunk/wikitty-ui-zk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - .settings .project target + .settings .project target *.iml *.ipr *.iws Property changes on: trunk/wikitty-api ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.iml *.ipr *.iws Property changes on: trunk/wikitty-generators ___________________________________________________________________ Modified: svn:ignore - bin .project target .settings .classpath + bin .project target .settings .classpath *.ipr *.iws *.iml Property changes on: trunk/wikitty-hessian-client ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.ipr *.iml *.iws Property changes on: trunk/wikitty-hessian-server ___________________________________________________________________ Modified: svn:ignore - .classpath .project .settings target + .classpath .project .settings target *.ipr *.iml *.iws Property changes on: trunk/wikitty-jdbc-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project PutObjectStoreDirHere solr + .settings target .classpath .project PutObjectStoreDirHere solr *.ipr *.iws *.iml Property changes on: trunk/wikitty-multistorage-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.ipr *.iml *.iws Property changes on: trunk/wikitty-solr-impl ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project PutObjectStoreDirHere solr + .settings target .classpath .project PutObjectStoreDirHere solr *.ipr *.iml *.iws Property changes on: trunk/wikitty-ui-zk ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project + target .settings .classpath .project *.ipr *.iml *.iws

1 0

r195 - in trunk: . wikitty-api wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-solr-impl wikitty-ui-zk
by tchemit＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: tchemit Date: 2010-07-21 12:09:34 +0200 (Wed, 21 Jul 2010) New Revision: 195 Url: http://nuiton.org/repositories/revision/wikitty/195 Log: clean poms Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,191 +1,202 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.2.2.1</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> - <modules> - <module>wikitty-generators</module> - <module>wikitty-api</module> - <module>wikitty-solr-impl</module> - <module>wikitty-jdbc-impl</module> - <module>wikitty-multistorage-impl</module> - <module>wikitty-ui-zk</module> - <module>wikitty-hessian-client</module> - <module>wikitty-hessian-server</module> - -  - </modules> + <modules> + <module>wikitty-generators</module> + <module>wikitty-api</module> + <module>wikitty-solr-impl</module> + <module>wikitty-jdbc-impl</module> - <dependencyManagement> - <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> + <module>wikitty-ui-zk</module> + <module>wikitty-hessian-client</module> + <module>wikitty-hessian-server</module> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> + </modules> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${eugene.version}</version> - </dependency> + <dependencyManagement> + <dependencies> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.139</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>3.1.5</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> - </dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> - </dependencyManagement> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> - </scm> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> -  -  -  + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> - <name>Wikitty</name> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugene.version}</version> + </dependency> - <description>Wikitty multi-module project</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.139</version> + <scope>test</scope> + </dependency> -  -  -  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> - <packaging>pom</packaging> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + <scope>test</scope> + </dependency> - <properties> - <projectId>wikitty</projectId> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>3.1.5</version> + <scope>compile</scope> + </dependency> -  - <eugene.version>2.1.1</eugene.version> - <spring.version>3.0.1.RELEASE</spring.version> - <jetty.version>6.1.22</jetty.version> + </dependencies> - </properties> + </dependencyManagement> -  -  -  +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + </scm> - <build> +  +  +  - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - - </build> + <name>Wikitty</name> - <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> + <description>Wikitty multi-module project</description> + <inceptionYear>2009</inceptionYear> + +  +  +  + + <packaging>pom</packaging> + + <properties> + <projectId>wikitty</projectId> + +  + <eugene.version>2.1.1</eugene.version> + <spring.version>3.0.1.RELEASE</spring.version> + <jetty.version>6.1.22</jetty.version> + + </properties> + +  +  +  + + <build> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + </build> + + <profiles> + <profile> + <id>extra-modules</id> + <modules> + <module>wikitty-hbase-impl</module> + <module>wikitty-jpa-impl</module> + <module>wikitty-jms-impl</module> + <module>wikitty-multistorage-impl</module> + </modules> + </profile> + </profiles> +  + </project> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-api/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,243 +1,245 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> -  -  -  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> - <dependencies> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependencies> +  + <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-test</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>org.springframework</groupId> + <artifactId>spring-context</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-beans</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> -  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>2.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>2.1</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>jboss.jbossts</groupId> - <artifactId>jbossjta</artifactId> - <version>4.9.0.GA</version> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> +  + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjta</artifactId> + <version>4.9.0.GA</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> -  - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.9.0.GA</version> - <scope>compile</scope> - </dependency> +  + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.9.0.GA</version> + <scope>compile</scope> + </dependency> - </dependencies> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: api</name> + <name>Wikitty :: api</name> - <description>Public wikitty API</description> - <inceptionYear>2009</inceptionYear> + <description>Public wikitty API</description> + <inceptionYear>2009</inceptionYear> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> + <properties> -  -  - <maven.test.failure.ignore>false</maven.test.failure.ignore> - </properties> +  +  + <maven.test.failure.ignore>false</maven.test.failure.ignore> + </properties> - <build> - <resources> - <resource> - <directory>${maven.src.dir}/main/resources/</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </resource> - <resource> - <directory>${maven.gen.dir}/java/</directory> - <includes> - <include>**/Label.java</include> - <include>**/LabelType.java</include> - <include>**/TreeNode.java</include> - <include>**/TreeNodeType.java</include> - </includes> - </resource> - </resources> + <build> + <resources> + <resource> + <directory>${maven.src.dir}/main/resources/</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>${maven.gen.dir}/java/</directory> + <includes> + <include>**/Label.java</include> + <include>**/LabelType.java</include> + <include>**/TreeNode.java</include> + <include>**/TreeNodeType.java</include> + </includes> + </resource> + </resources> - <pluginManagement> - <plugins> -  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${project.version}</version> - </dependency> -  - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <version>2.1.0-v200706251652</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </plugin> -  - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${project.version}</version> + </dependency> +  + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> + <version>2.1.0-v200706251652</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.uml2</groupId> + <artifactId>uml</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> +  + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo:src/main/uml/wikitty-api:*.zargo</input> - <input>xmi:src/main/uml/wikitty-api:*.uml</input> - </inputs> - <fullPackagePath>org.nuiton.wikitty</fullPackagePath> - <defaultPackage>org.nuiton.wikitty</defaultPackage> - <extractedPackages>org.nuiton.wikitty</extractedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo:src/main/uml/wikitty-api:*.zargo</input> + <input>xmi:src/main/uml/wikitty-api:*.uml</input> + </inputs> + <fullPackagePath>org.nuiton.wikitty</fullPackagePath> + <defaultPackage>org.nuiton.wikitty</defaultPackage> + <extractedPackages>org.nuiton.wikitty</extractedPackages> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <com.arjuna.ats.arjuna.common.propertiesFile>jbosstm-properties.xml</com.arjuna.ats.arjuna.common.propertiesFile> - </systemPropertyVariables> - <skip>${maven.test.skip}</skip> - <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> - <forkMode>${maven.test.forkMode}</forkMode> - <excludes> -  - <exclude>**/conform/*.java</exclude> - </excludes> - </configuration> - </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <com.arjuna.ats.arjuna.common.propertiesFile>jbosstm-properties.xml</com.arjuna.ats.arjuna.common.propertiesFile> + </systemPropertyVariables> + <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + <forkMode>${maven.test.forkMode}</forkMode> + <excludes> +  + <exclude>**/conform/*.java</exclude> + </excludes> + </configuration> + </plugin> - </plugins> + </plugins> - </build> + </build> -  -  -  +  +  +  </project> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-generators/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,68 +1,70 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> - -  -  -  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> -  -  -  + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <name>Wikitty :: generators</name> +  +  +  - <description>Wikitty generators</description> - <inceptionYear>2009</inceptionYear> + <name>Wikitty :: generators</name> -  -  -  + <description>Wikitty generators</description> + <inceptionYear>2009</inceptionYear> - <packaging>jar</packaging> +  +  +  - <build> + <packaging>jar</packaging> - <plugins> -  - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>1.0.3</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters> - org.nuiton.processor.filters.GeneratorTemplatesFilter - </filters> - </configuration> - </plugin> - </plugins> + <build> - </build> + <plugins> +  + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>1.0.3</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <includes>**/*.java</includes> + <filters> + org.nuiton.processor.filters.GeneratorTemplatesFilter + </filters> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-hessian-client/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -40,22 +40,4 @@ <description>Wikitty hessian client</description> <inceptionYear>2010</inceptionYear> -  -  -  - - <packaging>jar</packaging> - - <properties> - - </properties> - - <build> - - </build> - -  -  -  - </project> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,80 +1,64 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> -  -  -  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hessian-server</artifactId> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hessian-server</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-multistorage-impl</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>3.1.5</version> - <scope>compile</scope> - </dependency> - </dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>3.1.5</version> + <scope>compile</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: hessian server</name> + <name>Wikitty :: hessian server</name> - <description>Wikitty hessian server</description> - <inceptionYear>2010</inceptionYear> + <description>Wikitty hessian server</description> + <inceptionYear>2010</inceptionYear> -  -  -  - - <packaging>war</packaging> - - <properties> - - </properties> - - <build> - - </build> - -  -  -  - </project> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,105 +1,101 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <dependencies> -  - <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> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> +  + <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> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>${jetty.version}</version> - <scope>provided</scope> - </dependency> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - <version>1.5.0</version> - </dependency> - </dependencies> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> -  -  -  - <name>Wikitty :: wikitty-jdbc-impl</name> - <description>Wikitty jdbc storage</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + <version>1.5.0</version> + </dependency> + </dependencies> -  -  -  +  +  +  + <name>Wikitty :: wikitty-jdbc-impl</name> + <description>Wikitty jdbc storage</description> + <inceptionYear>2009</inceptionYear> - <packaging>jar</packaging> - </project> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-solr-impl/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,111 +1,98 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> -  - <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>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> -  - <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> +  + <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> -  -  -  +  +  +  - <name>Wikitty :: wikitty-solr-impl</name> + <name>Wikitty :: wikitty-solr-impl</name> - <description>Wikiity solr search engine</description> - <inceptionYear>2009</inceptionYear> + <description>Wikiity solr search engine</description> + <inceptionYear>2009</inceptionYear> -  -  -  - - <packaging>jar</packaging> - - <properties> -  - </properties> - -  -  -  - </project> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:09:20 UTC (rev 194) +++ trunk/wikitty-ui-zk/pom.xml 2010-07-21 10:09:34 UTC (rev 195) @@ -1,148 +1,146 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> -  -  -  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-ui-zk</artifactId> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-ui-zk</artifactId> - <dependencies> + <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>jasperreports</groupId> - <artifactId>jasperreports</artifactId> - <version>3.5.3</version> - </dependency> + <dependency> + <groupId>jasperreports</groupId> + <artifactId>jasperreports</artifactId> + <version>3.5.3</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zk</artifactId> - <version>5.0.2</version> - </dependency> + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zk</artifactId> + <version>5.0.2</version> + </dependency> - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkplus</artifactId> - <version>5.0.2</version> - </dependency> + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zkplus</artifactId> + <version>5.0.2</version> + </dependency> - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zul</artifactId> - <version>5.0.2</version> - </dependency> + <dependency> + <groupId>org.zkoss.zk</groupId> + <artifactId>zul</artifactId> + <version>5.0.2</version> + </dependency> - </dependencies> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: ui-zk</name> + <name>Wikitty :: ui-zk</name> - <description>Public wikitty UI-ZK</description> - <inceptionYear>2010</inceptionYear> + <description>Public wikitty UI-ZK</description> + <inceptionYear>2010</inceptionYear> -  -  -  +  +  +  - <packaging>war</packaging> + <packaging>war</packaging> - <properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> - </properties> +  +  +  - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - -  -  -  - </project>

1 0

r194 - trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test
by tchemit＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: tchemit Date: 2010-07-21 12:09:20 +0200 (Wed, 21 Jul 2010) New Revision: 194 Url: http://nuiton.org/repositories/revision/wikitty/194 Log: Ignore one multi-threading test to be fixed Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-07-21 09:44:11 UTC (rev 193) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-07-21 10:09:20 UTC (rev 194) @@ -32,6 +32,7 @@ import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.springframework.test.annotation.ExpectedException; @@ -181,6 +182,8 @@ assertNull(result); } + //FIXME poussin 2010 07 21 : regarder pourquoi meêm si on attend les threads, ils sont mal synchronises + @Ignore @Test public void test2Threads2Writers2SolrServers() throws Exception { SolrServer solrServer1 = getSolrServer();

1 0

r193 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/importexport wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: echatellier Date: 2010-07-21 11:44:11 +0200 (Wed, 21 Jul 2010) New Revision: 193 Url: http://nuiton.org/repositories/revision/wikitty/193 Log: Fix import & javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-07-21 09:40:21 UTC (rev 192) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-07-21 09:44:11 UTC (rev 193) @@ -229,7 +229,7 @@ /** * return field type for the given fieldName. - * @param fieldName fully qualified fieldName extension.fieldname + * @param fqfieldName fully qualified fieldName extension.fieldname * @return field type */ public FieldType getFieldType(String fqfieldName) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-07-21 09:40:21 UTC (rev 192) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-07-21 09:44:11 UTC (rev 193) @@ -17,7 +17,6 @@ package org.nuiton.wikitty; -import java.util.ArrayList; import static org.nuiton.i18n.I18n._; import java.util.Collection; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-07-21 09:40:21 UTC (rev 192) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-07-21 09:44:11 UTC (rev 193) @@ -1,7 +1,6 @@ package org.nuiton.wikitty.importexport; import java.io.Writer; -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.Criteria; Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-07-21 09:40:21 UTC (rev 192) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-07-21 09:44:11 UTC (rev 193) @@ -1,5 +1,3 @@ -package org.nuiton.wikitty.jdbc; - /* *##% * Copyright (c) 2009 morin. All rights reserved. * @@ -16,6 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ + +package org.nuiton.wikitty.jdbc; + import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDTYPE; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_ID; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.COL_NAME;

1 0

r192 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: echatellier Date: 2010-07-21 11:40:21 +0200 (Wed, 21 Jul 2010) New Revision: 192 Url: http://nuiton.org/repositories/revision/wikitty/192 Log: Fix javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-07-21 09:38:58 UTC (rev 191) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-07-21 09:40:21 UTC (rev 192) @@ -77,7 +77,7 @@ } /** - * Call {@link #cast(String, WikittyService, Class, boolean)} with + * Call {@link #cast(WikittyProxy, Class, boolean)} with * autoconvert = true * * @param proxy used to retrieve securityToken and WikittyService

1 0

r191 - trunk
by bpoussin＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: bpoussin Date: 2010-07-21 11:38:58 +0200 (Wed, 21 Jul 2010) New Revision: 191 Url: http://nuiton.org/repositories/revision/wikitty/191 Log: ajout de chose a faire Modified: trunk/TODO.txt Modified: trunk/TODO.txt =================================================================== --- trunk/TODO.txt 2010-07-21 09:38:33 UTC (rev 190) +++ trunk/TODO.txt 2010-07-21 09:38:58 UTC (rev 191) @@ -8,12 +8,9 @@ - support d'un select en plus du criteria pour etre capable de recuperer seulement un champs d'un objet et non pas l'objet en lui meme -b- test unitaire sur les upper/lower bound -b- retrouve les bons nom des champs pour les noms des facettes -- test unitaire sur les differentes methodes d'import/export +- test unitaire sur les upper/lower bound +- retrouver les bons nom des champs pour les noms des facettes -- regarder l'API de transaction hbase - - refaire le storage en mémoire - stockage de la liste entière dans un champ à améliorer - refaire des tests @@ -21,7 +18,7 @@ - muplicité à 1 génération de l'attribut à not null - trie sur champ dans une association -- dans AbstractWikittyService.store, il faut sans doute mettre la la mise a +- dans AbstractWikittyService.store, il faut sans doute mettre la mise a jour de la version et mettre a false le isDirty et non pas dans les impl des storages (En fait il faudrait le faire que lorsque le service est attaque en local car en distant c'est au proxy de faire). Et ceci si la @@ -50,131 +47,9 @@ - implementation de la persistance des listes à revoir (en fonction des tests de perf) - organisation des paquetages, à faire après stabilisation -Done -==== - -Release 0.9 ------------ -d- test unitaire implantation hbase -d- config solr -d- support recherche by example -d- ajout creation index solr sur store -d- implantation label (gesion des listes) -d- ajout creation index solr sur label -d- support recherche by example avec facet -d- implantation PageResult pour supporter toute l'info des resultats (facet) -d- probleme de changement de version des extensions: Si on change une extension - (et donc sa version) alors qu'elle avait ete defini dans un Bean, comment - continuer a utiliser ce Bean qui va utiliser une mauvaise version de - l'extension (impossible d'appeler un store) -d- probleme les List et lucene a moins de mettre tous les champs comme pouvant - etre multi-value ? -d- probleme de stockage des listes dans hbase, les attributs sont conserve entre - deux sauvegardes du meme objets, donc il faut pouvoir supprimer les anciens - champs (pour les listes, un remove diminue la liste, mais en fait il reste - toujours les elements car le nom du champs contient le nombre d'element) - Il faut donc soit connaitre le nombre d'element soit, supprimer les anciens - avant d'ajouter les nouveaux -d- gestion des versions des extensions (supporte-t-on plusieurs version d'une - meme extension au meme moment pour different objet ?) -d- l'index solr est supprimé dans le setUp() -d- vider la base hbase -d- implantation categorisation -d- implantation import/export XML des wikitties (a tester) -d- support du delete de wikitty (marque comme supprime ?) -d- implantation d'un service metier (developpement du proxy) (ex: product) -d- pouvoir mettre des tag/value sur les fieldType -d- possibilite de nomer un Criteria -d- support des required dans les extensions -d- import/export a finir (implantation des methodes) -d- Handle lowerBound and upperBound constraint on Fields. -d- migration que faire lors d'un changement d'une extension - (ajout/suppression/modif de champs) -d- typage dans solr -d- finir implantation criteria -d- synchronisation de version des extension - ex: un champ change de nom. - ex: on recharge un wikitty dont une extension a évolué (ajout/suppression de champ) -d- support des enumerations comme type de champs wikitty (gere comme une chaine) - -Release 1 Sprint 1 ------------------- -d- [bug] gestion des ensembles, cast des ensembles en liste -d- [bug] non récupération du résultat de l'export -d- [bug] transformation des champs dans le format Solr pour la récupération des facettes -d- [bug] passage du format de date en UTC -d- creation d'une factory pour la création des extensions -d- migration des api hbase en 0.20.0 -d- mise en place du Log4J -d- suppression des exceptions sur le recherche dans le cas où il y a pas de résultat -d- implantation facet sur categorisation (facet hierarchique) -d- transformation en xml du criteria -d- récupérer les dépendances entre extension dans un wikitty -d- centralisation de la configuration htable - -d- gestion des critiria sur les extensions -d- simplification de l'interface sur les find criteria et export, plus qu'un - find criteria et un export sur le service, déplacement des find example et export example - sur le proxy - -Release 1 Sprint 2 ------------------- -d- trie sur le criteria -d- création d'un nom d'élément static pour les recherches sur les ids et les extensions -d- recherche full texte -d- recherche d'un champ sur plusieurs extensions -d- ajout de requires sur une extension dans l'import en export XML - -d- améloration de la recherche avec des arbres arithmétiques -d- création d'un module Solr -d- reindexation des nouveaux contenus quand ils sont aujouté dans un noeud -d- ajout d'un find all dans le DAO -d- reprise des tests unitaires - -Release 1 Sprint 3 ------------------- -d- modification du DAO pour renvoyer par défaut les beans selon l'extension de la class paramètrés -d- restoreNode avec checkExtension -d- facetisation sur les extensions -d- restore d'une extension à partir de son nom - -d- restauration en set ordonnées -d- ajout d'un service pour synchroniser solr avec hbase - -Release 1 Sprint 4 ------------------- - -d- migration des wikitties lors d'une modification de l'extension -d- normalisation des versions sur les extensions -d- clone pour modification d'une extension -d- sous recherche avec un sous arbre en not -d- acceptation de n'importe quels caractères dans les tagvalues - -Release 1 RC ------------- -d- refonte des tests -d- déplacer les tests solr de hbase -d- gestion des string en text dans solr -d- recherche sur un champ string sans tenir compte de la case -d- création d'un module de storage en jpa - -Release 2 Sprint 1 (Version 1.2) --------------------------------- -d- fixer les SQL injections dans la partie JDBC -d- mise en place des transactions JTA dans l'API -d- mise en place des transactions JTA dans JPA -d- mise en place des transactions JTA dans JDBC -d- modification des interfaces de storage pour supprimer les commandes -d- suppression du module test-hbase-plateform, directement intégrer dans les -tests du module hbase -d- mise en place des transactions JTA dans Solr -d- ajout d'un filtre sur les restores children et node - -Version 1.3 ------------ -d- ajout des tagvalues sur les extensions -d- recupération des requires dans le module JDBC -d- utilisation de JPA 2 dans le module JPA -d- création d'un storage permettant d'enregister dans plusieurs autres storages -d- création d'un storage JMS pour faire de la réplication de données -d- utiliser directement les objets de l'API pour les mapper en XML dans la partie JPA +- modification de la generation. + * suppression du generateur BussinessEntityBeanGenerator (et de toute + reference a ce genre d'objet dans le code Wikitty) + * verifier qu'ils ne servent a rien et supprimer: EnumGenerator, + EugengoConstants, EugengoUtils, InterfaceGenerator. + * renommer Wikengo* en Wikitty* et BusinessEntity* en Wikitty*

1 0

r190 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: bpoussin Date: 2010-07-21 11:38:33 +0200 (Wed, 21 Jul 2010) New Revision: 190 Url: http://nuiton.org/repositories/revision/wikitty/190 Log: delete commented code Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-21 09:36:32 UTC (rev 189) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-21 09:38:33 UTC (rev 190) @@ -924,57 +924,4 @@ } } - - /** - * Method copied from eugengo-0.7 generators - * - * @param bean - * @return - */ - /*public static TreeNodeImpl toImpl(TreeNode bean) { - if (bean == null) return null; - TreeNodeImpl impl = new TreeNodeImpl(bean); - return impl; - }*/ - - /** - * Method copied from eugengo-0.7 generators - * - * @param bean - * @return - * - * @deprecated since bean removal - * - @Deprecated - protected static void fillBeanAttributes(TreeNode fromBean, TreeNodeBean toBean) { - String beanId = fromBean.getWikittyId(); - toBean.id = beanId; - - String beanVersion = fromBean.getWikittyVersion(); - toBean.setWikittyVersion(beanVersion); - - toBean.setName(fromBean.getName()); - toBean.setParent(fromBean.getParent()); - // WARNING: Copy collection to other collection to not manipulate storage collection directly - Collection<String> treeNodeChildren = fromBean.getChildren(); - if(treeNodeChildren != null) { - toBean.TreeNode$children = new HashSet<String>(treeNodeChildren); - } - }*/ - - /** - * Method copied from eugengo-0.7 generators - * - * @param impl - * @return - * - * @deprecated since bean removal - * - @Deprecated - public static TreeNode toBean(TreeNodeImpl impl) { - if (impl == null) return null; - TreeNodeBean bean = new TreeNodeBean(); - WikittyServiceImpl.fillBeanAttributes(impl, bean); - return bean; - }*/ }

1 0

r189 - trunk
by echatellier＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: echatellier Date: 2010-07-21 11:36:32 +0200 (Wed, 21 Jul 2010) New Revision: 189 Url: http://nuiton.org/repositories/revision/wikitty/189 Log: Remove hbase, jpa, jms module from build Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 09:35:26 UTC (rev 188) +++ trunk/pom.xml 2010-07-21 09:36:32 UTC (rev 189) @@ -21,14 +21,15 @@ <module>wikitty-generators</module> <module>wikitty-api</module> <module>wikitty-solr-impl</module> - <module>wikitty-hbase-impl</module> - <module>wikitty-jpa-impl</module> <module>wikitty-jdbc-impl</module> <module>wikitty-multistorage-impl</module> - <module>wikitty-jms-impl</module> <module>wikitty-ui-zk</module> <module>wikitty-hessian-client</module> <module>wikitty-hessian-server</module> + +  </modules> <dependencyManagement>

1 0

r188 - trunk
by echatellier＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: echatellier Date: 2010-07-21 11:35:26 +0200 (Wed, 21 Jul 2010) New Revision: 188 Url: http://nuiton.org/repositories/revision/wikitty/188 Log: Remove gwt deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 09:34:44 UTC (rev 187) +++ trunk/pom.xml 2010-07-21 09:35:26 UTC (rev 188) @@ -102,36 +102,7 @@ <version>3.1.5</version> <scope>compile</scope> </dependency> - -  - + </dependencies> </dependencyManagement> @@ -162,7 +133,6 @@ <projectId>wikitty</projectId>  -  <eugene.version>2.1.1</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <jetty.version>6.1.22</jetty.version>

1 0

r187 - trunk
by echatellier＠users.nuiton.org 21 Jul '10

21 Jul '10

Author: echatellier Date: 2010-07-21 11:34:44 +0200 (Wed, 21 Jul 2010) New Revision: 187 Url: http://nuiton.org/repositories/revision/wikitty/187 Log: Use eugene 2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-12 16:07:57 UTC (rev 186) +++ trunk/pom.xml 2010-07-21 09:34:44 UTC (rev 187) @@ -163,9 +163,8 @@   - <eugene.version>2.1.1-SNAPSHOT</eugene.version> + <eugene.version>2.1.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>

1 0