- Vradi-commits - mailman.cloud.codelutin.com

r168 - in trunk: . vradi-entities vradi-services vradi-services-web vradi-swing vradi-web
by athimel＠users.chorem.org March 29, 2012

March 29, 2012

Author: athimel Date: 2012-03-29 18:18:17 +0200 (Thu, 29 Mar 2012) New Revision: 168 Url: http://chorem.org/repositories/revision/vradi/168 Log: Indent back XML file to 2 chars Modified: trunk/pom.xml trunk/vradi-entities/pom.xml trunk/vradi-services-web/pom.xml trunk/vradi-services/pom.xml trunk/vradi-swing/pom.xml trunk/vradi-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 16:17:06 UTC (rev 167) +++ trunk/pom.xml 2012-03-29 16:18:17 UTC (rev 168) @@ -2,600 +2,600 @@ <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>3.2</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>3.2</version> + </parent> - <groupId>org.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> - <modules> - <module>vradi-entities</module> - <module>vradi-services</module> - <module>vradi-services-web</module> - <module>vradi-web</module> - <module>vradi-swing</module> - </modules> + <modules> + <module>vradi-entities</module> + <module>vradi-services</module> + <module>vradi-services-web</module> + <module>vradi-web</module> + <module>vradi-swing</module> + </modules> - <name>Vradi</name> + <name>Vradi</name> - <description>Projet Vradi</description> - <inceptionYear>2009</inceptionYear> - <url>http://maven-site.chorem.org/vradi</url> + <description>Projet Vradi</description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.chorem.org/vradi</url> - <licenses> - <license> - <name>GNU Affero General Public License version 3</name> - <url>http://www.gnu.org/licenses/agpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> + <licenses> + <license> + <name>GNU Affero General Public License version 3</name> + <url>http://www.gnu.org/licenses/agpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> - <developers> + <developers> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>sletellier</id> - <name>Sylvain Letellier</name> - <email>letellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>sletellier</id> + <name>Sylvain Letellier</name> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>kmorin</id> - <name>Kevin Morin</name> - <email>morin(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>kmorin</id> + <name>Kevin Morin</name> + <email>morin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>jcouteau</id> - <name>Jean Couteau</name> - <email>couteau(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>echatellier</id> - <name>Eric Chatellier</name> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> - </developers> + <developer> + <id>echatellier</id> + <name>Eric Chatellier</name> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> + </developers> - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/vradi/trunk</connection> - <developerConnection> - scm:svn:http://svn.chorem.org/svn/vradi/trunk - </developerConnection> - <url>http://www.chorem.org/repositories/browse/vradi/trunk</url> - </scm> + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/vradi/trunk</connection> + <developerConnection> + scm:svn:http://svn.chorem.org/svn/vradi/trunk + </developerConnection> + <url>http://www.chorem.org/repositories/browse/vradi/trunk</url> + </scm> - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> - <packaging>pom</packaging> + <packaging>pom</packaging> - <properties> - <platform>chorem.org</platform> - <projectId>vradi</projectId> + <properties> + <platform>chorem.org</platform> + <projectId>vradi</projectId> -  - <jaxxVersion>2.4.2</jaxxVersion> - <eugenePluginVersion>2.4.2</eugenePluginVersion> - <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> - <nuitonValidatorVersion>2.4.6</nuitonValidatorVersion> - <nuitonWebVersion>1.10</nuitonWebVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <openCsvVersion>2.3</openCsvVersion> - <wikittyVersion>3.4</wikittyVersion> - <slf4jVersion>1.6.4</slf4jVersion> - <h2Version>1.3.157</h2Version> -  - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jrstVersion>1.5</jrstVersion> - <oooVersion>3.2.1</oooVersion> - <javaxActivationVersion>1.1.1</javaxActivationVersion> - <javaxMailVersion>1.4.5</javaxMailVersion> - <struts2Version>2.3.1.2</struts2Version> - <struts2jqueryVersion>3.3.0</struts2jqueryVersion> - <servletApiVersion>2.5</servletApiVersion> - <jspApiVersion>2.0</jspApiVersion> - <tikaVersion>1.1</tikaVersion> - <jdomVersion>1.1.3</jdomVersion> +  + <jaxxVersion>2.4.2</jaxxVersion> + <eugenePluginVersion>2.4.2</eugenePluginVersion> + <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> + <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> + <nuitonValidatorVersion>2.4.6</nuitonValidatorVersion> + <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <openCsvVersion>2.3</openCsvVersion> + <wikittyVersion>3.4</wikittyVersion> + <slf4jVersion>1.6.4</slf4jVersion> + <h2Version>1.3.157</h2Version> +  + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <jrstVersion>1.5</jrstVersion> + <oooVersion>3.2.1</oooVersion> + <javaxActivationVersion>1.1.1</javaxActivationVersion> + <javaxMailVersion>1.4.5</javaxMailVersion> + <struts2Version>2.3.1.2</struts2Version> + <struts2jqueryVersion>3.3.0</struts2jqueryVersion> + <servletApiVersion>2.5</servletApiVersion> + <jspApiVersion>2.0</jspApiVersion> + <tikaVersion>1.1</tikaVersion> + <jdomVersion>1.1.3</jdomVersion> -  - <license.organizationName>Codelutin</license.organizationName> +  + <license.organizationName>Codelutin</license.organizationName> -  - <license.licenseName>agpl_v3</license.licenseName> +  + <license.licenseName>agpl_v3</license.licenseName> -  -  -  +  +  +  -  -  +  +  - </properties> + </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>net.sourceforge.web-harvest</groupId> - <artifactId>web-harvest</artifactId> - <version>2.0-cl_20100531</version> - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>net.sourceforge.web-harvest</groupId> + <artifactId>web-harvest</artifactId> + <version>2.0-cl_20100531</version> + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - <version>${nuitonWidgetVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + <version>${nuitonWidgetVersion}</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - <version>${jaxxVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${jaxxVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>${nuitonValidatorVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonValidatorVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - <version>${jrstVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + <version>${jrstVersion}</version> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + <version>1.6.2-2</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - <version>3.0.4</version> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.4</version> + </dependency> - <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> - </dependency> + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.5.0</version> + </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + <scope>runtime</scope> + </dependency> -  - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgresqlVersion}</version> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresqlVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-struts</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>${tikaVersion}</version> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>${tikaVersion}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>${jdomVersion}</version> - </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>${jdomVersion}</version> + </dependency> -  - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>1.0</version> -  - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>1.0</version> +  + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>juh</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>jurt</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>ridl</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>unoil</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>juh</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>jurt</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>ridl</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>unoil</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.2</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <version>${jettyPluginVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>${jettyPluginVersion}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jettyPluginVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jettyPluginVersion}</version> + <scope>provided</scope> + </dependency> -  - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${javaxActivationVersion}</version> - </dependency> +  + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${javaxActivationVersion}</version> + </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${openCsvVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${openCsvVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>3.5.0</version> - </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>3.5.0</version> + </dependency> -  +  - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-grid-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-richtext-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-tree-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-mobile-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-mobile-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-dojo-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.1.GA</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>${jspApiVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servletApiVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>4.0.6</version> - </dependency> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>4.0.6</version> + </dependency> - </dependencies> - </dependencyManagement> + </dependencies> + </dependencyManagement> - <build> + <build> - <pluginManagement> - <plugins> + <pluginManagement> + <plugins> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxxVersion}</version> - </plugin> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> -  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugenePluginVersion}</version> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${wikittyVersion}</version> - </dependency> - </dependencies> - </plugin> +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugenePluginVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${wikittyVersion}</version> + </dependency> + </dependencies> + </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - <configuration> - <bundles>fr_FR</bundles> - </configuration> - </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + <configuration> + <bundles>fr_FR</bundles> + </configuration> + </plugin> -  - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> - </plugins> - </pluginManagement> + </plugins> + </pluginManagement> - </build> + </build> - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> - <repositories> - <repository> - <id>vradi-group</id> - <name>Vradi Repository</name> - <url>http://maven.nuiton.org/nexus/content/groups/vradi-group/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> + <repositories> + <repository> + <id>vradi-group</id> + <name>Vradi Repository</name> + <url>http://maven.nuiton.org/nexus/content/groups/vradi-group/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> - <pluginRepositories> - <pluginRepository> - <id>vradi-group</id> - <name>Vradi Repository</name> - <url>http://maven.nuiton.org/nexus/content/groups/vradi-group/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> + <pluginRepositories> + <pluginRepository> + <id>vradi-group</id> + <name>Vradi Repository</name> + <url>http://maven.nuiton.org/nexus/content/groups/vradi-group/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> </project> Modified: trunk/vradi-entities/pom.xml =================================================================== --- trunk/vradi-entities/pom.xml 2012-03-29 16:17:06 UTC (rev 167) +++ trunk/vradi-entities/pom.xml 2012-03-29 16:18:17 UTC (rev 168) @@ -1,75 +1,75 @@ <?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> - <parent> - <groupId>org.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-entities</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-entities</artifactId> - <name>Vradi :: Entities</name> - <description>Vradi entities module</description> + <name>Vradi :: Entities</name> + <description>Vradi entities module</description> - <dependencies> + <dependencies> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> + </dependencies> - <build> + <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api generator</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - <input>classpath:model:/:wikitty.objectmodel</input> - </inputs> - <fullPackagePath>org.chorem.vradi</fullPackagePath> - <defaultPackage>org.chorem.vradi</defaultPackage> - <extractedPackages>org.chorem.vradi.entities,org.nuiton.wikitty</extractedPackages> - <generatedPackages>org.chorem.vradi.entities</generatedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + <fullPackagePath>org.chorem.vradi</fullPackagePath> + <defaultPackage>org.chorem.vradi</defaultPackage> + <extractedPackages>org.chorem.vradi.entities,org.nuiton.wikitty</extractedPackages> + <generatedPackages>org.chorem.vradi.entities</generatedPackages> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - </build> + </build> </project> Modified: trunk/vradi-services/pom.xml =================================================================== --- trunk/vradi-services/pom.xml 2012-03-29 16:17:06 UTC (rev 167) +++ trunk/vradi-services/pom.xml 2012-03-29 16:18:17 UTC (rev 168) @@ -1,295 +1,295 @@ <?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> - <parent> - <groupId>org.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-services</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-services</artifactId> - <name>Vradi :: Services</name> - <description>Vradi services module</description> + <name>Vradi :: Services</name> + <description>Vradi services module</description> - <properties> + <properties> -  - <maven.jar.main.class> - org.chorem.vradi.VradiServiceMain - </maven.jar.main.class> +  + <maven.jar.main.class> + org.chorem.vradi.VradiServiceMain + </maven.jar.main.class> - </properties> + </properties> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> -  - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - </dependency> +  + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>juh</artifactId> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>jurt</artifactId> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>ridl</artifactId> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>unoil</artifactId> - </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>juh</artifactId> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>jurt</artifactId> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>ridl</artifactId> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>unoil</artifactId> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> - <dependency> - <groupId>net.sourceforge.web-harvest</groupId> - <artifactId>web-harvest</artifactId> - </dependency> + <dependency> + <groupId>net.sourceforge.web-harvest</groupId> + <artifactId>web-harvest</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</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-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - </dependency> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>*.properties</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>*.properties</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>*.properties</exclude> + </excludes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>*.properties</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>*.properties</exclude> + </excludes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>target/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + </plugins> - <pluginManagement> - <plugins> + <pluginManagement> + <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <useUniqueVersions>false</useUniqueVersions> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + <useUniqueVersions>false</useUniqueVersions> + </manifest> + </archive> + </configuration> + </plugin> - </plugins> - </pluginManagement> - </build> + </plugins> + </pluginManagement> + </build> - <profiles> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/vradi-services-web/pom.xml =================================================================== --- trunk/vradi-services-web/pom.xml 2012-03-29 16:17:06 UTC (rev 167) +++ trunk/vradi-services-web/pom.xml 2012-03-29 16:18:17 UTC (rev 168) @@ -1,138 +1,138 @@ <?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> - <parent> - <groupId>org.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-services-web</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-services-web</artifactId> - <packaging>war</packaging> + <packaging>war</packaging> - <name>Vradi :: Services Web</name> - <description>Vradi service web module</description> + <name>Vradi :: Services Web</name> + <description>Vradi service web module</description> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</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-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </testResource> + </testResources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> <includes> - <include>**/*</include> + <include>**/war/Jetty*</include> </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> Modified: trunk/vradi-swing/pom.xml =================================================================== --- trunk/vradi-swing/pom.xml 2012-03-29 16:17:06 UTC (rev 167) +++ trunk/vradi-swing/pom.xml 2012-03-29 16:18:17 UTC (rev 168) @@ -1,572 +1,572 @@ <?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> - <parent> - <groupId>org.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-swing</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-swing</artifactId> - <name>Vradi :: Swing</name> - <description>Vradi Swing</description> + <name>Vradi :: Swing</name> + <description>Vradi Swing</description> - <properties> + <properties> -  - <maven.jar.main.class> - org.chorem.vradi.VradiMain - </maven.jar.main.class> +  + <maven.jar.main.class> + org.chorem.vradi.VradiMain + </maven.jar.main.class> -  - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <jaxx.defaultErrorUIFQN> - jaxx.runtime.validator.swing.ui.ImageValidationUI - </jaxx.defaultErrorUIFQN> - <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> +  + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.defaultErrorUIFQN> + jaxx.runtime.validator.swing.ui.ImageValidationUI + </jaxx.defaultErrorUIFQN> + <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> - </properties> + </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> -  - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> +  + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>runtime</scope> + </dependency> -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</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>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx-core</artifactId> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> - <dependency> - <groupId>net.sourceforge.web-harvest</groupId> - <artifactId>web-harvest</artifactId> - </dependency> + <dependency> + <groupId>net.sourceforge.web-harvest</groupId> + <artifactId>web-harvest</artifactId> + </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + </dependency> - <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - </dependency> + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>ridl</artifactId> - </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>ridl</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> - <plugins> + <plugins> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>target/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - <pluginManagement> - <plugins> + <pluginManagement> + <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <useUniqueVersions>true</useUniqueVersions> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + <useUniqueVersions>true</useUniqueVersions> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <configuration> - <generateBundle>true</generateBundle> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <generateBundle>true</generateBundle> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <configuration> - <libPath>lib</libPath> - <makeArchive>false</makeArchive> - <verbose>false</verbose> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> - <jnlp> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - <j2seVersion>1.6+</j2seVersion> - </jnlp> + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + <j2seVersion>1.6+</j2seVersion> + </jnlp> -  - <jnlpExtensions> -  - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer</title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - </jnlpExtensions> +  + <jnlpExtensions> +  + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> - <sign> - <keystore>${keystorepath}</keystore> - <storepass>${keystorepass}</storepass> - <alias>${keyalias}</alias> - <keypass>${keypass}</keypass> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> - </configuration> - </plugin> + </configuration> + </plugin> - </plugins> - </pluginManagement> - </build> + </plugins> + </pluginManagement> + </build> - <profiles> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + <profiles> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> -  - <profile> - <id>webstart-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> +  + <profile> + <id>webstart-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - </profile> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + </profile> -  - <profile> - <id>local-webstart-profile</id> - <activation> - <property> - <name>doLocalWebstart</name> - <value>true</value> - </property> - </activation> - <properties> - <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> - </properties> - <build> - <defaultGoal>package</defaultGoal> - <plugins> +  + <profile> + <id>local-webstart-profile</id> + <activation> + <property> + <name>doLocalWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> + </properties> + <build> + <defaultGoal>package</defaultGoal> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp-local</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - </profile> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + </profile> -  - <profile> - <id>server-webstart-profile</id> - <activation> - <property> - <name>doServerWebstart</name> - <value>true</value> - </property> - </activation> - <properties> - <jnlp.codebase>http://vradi/</jnlp.codebase> - </properties> - <build> - <defaultGoal>package</defaultGoal> - <plugins> +  + <profile> + <id>server-webstart-profile</id> + <activation> + <property> + <name>doServerWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>http://vradi/</jnlp.codebase> + </properties> + <build> + <defaultGoal>package</defaultGoal> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp-local</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - <configuration> - <jnlp> - <inputTemplateResourcePath> - src/main/jnlp - </inputTemplateResourcePath> - <inputTemplate>vradi-server-jnlp.vm</inputTemplate> - </jnlp> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + <configuration> + <jnlp> + <inputTemplateResourcePath> + src/main/jnlp + </inputTemplateResourcePath> + <inputTemplate>vradi-server-jnlp.vm</inputTemplate> + </jnlp> + </configuration> + </execution> + </executions> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - </profile> - </profiles> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> </project> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2012-03-29 16:17:06 UTC (rev 167) +++ trunk/vradi-web/pom.xml 2012-03-29 16:18:17 UTC (rev 168) @@ -3,284 +3,284 @@ 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> - <artifactId>vradi</artifactId> - <groupId>org.chorem</groupId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <artifactId>vradi</artifactId> + <groupId>org.chorem</groupId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-web</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-web</artifactId> - <name>Vradi :: Web</name> - <description>Vradi Web</description> + <name>Vradi :: Web</name> + <description>Vradi Web</description> - <packaging>war</packaging> + <packaging>war</packaging> - <properties> + <properties> - <i18n.silent>true</i18n.silent> - <i18n.bundleOutputName>vradi-i18n</i18n.bundleOutputName> - <i18n.bundleOutputPackage/> + <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>vradi-i18n</i18n.bundleOutputName> + <i18n.bundleOutputPackage/> - </properties> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> -  - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> +  + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> -  +  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-struts</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-grid-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-richtext-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-tree-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-mobile-plugin</artifactId> - </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-mobile-plugin</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-dojo-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> -  +  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </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>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</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>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <id>scan-java-sources</id> - <goals> - <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> - <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> - <jsp>http://java.sun.com/JSP/Page</jsp> - <decorator> - http://www.opensymphony.com/sitemesh/decorator - </decorator> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> + <jsp>http://java.sun.com/JSP/Page</jsp> + <decorator> + http://www.opensymphony.com/sitemesh/decorator + </decorator> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>

1 0

r167 - in trunk: . vradi-services/src/main/java/org/chorem/vradi/services/managers vradi-services/src/main/java/org/chorem/vradi/services/tasks vradi-services/src/test/java/org/chorem/vradi/services vradi-services/src/test/resources
by athimel＠users.chorem.org March 29, 2012

March 29, 2012

Author: athimel Date: 2012-03-29 18:17:06 +0200 (Thu, 29 Mar 2012) New Revision: 167 Url: http://chorem.org/repositories/revision/vradi/167 Log: Add a TU about a potential internal usage Added: trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java Modified: trunk/pom.xml trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java trunk/vradi-services/src/test/resources/vradi-services.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/pom.xml 2012-03-29 16:17:06 UTC (rev 167) @@ -569,7 +569,6 @@ </reporting> <repositories> - <repository> <id>vradi-group</id> <name>Vradi Repository</name> @@ -585,7 +584,6 @@ </repositories> <pluginRepositories> - <pluginRepository> <id>vradi-group</id> <name>Vradi Repository</name> Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/BindingManager.java 2012-03-29 16:17:06 UTC (rev 167) @@ -537,12 +537,12 @@ log.debug("getFormsFromStream(" + stream.getName()); } - if (stream.getFormTypeName() == null) { + String formTypeName = stream.getFormTypeName(); + if (formTypeName == null) { throw new VradiException("xmlStream.formTypeName is null"); } - WikittyExtension formType = formTypeManager.getFormType( - stream.getFormTypeName()); + WikittyExtension formType = formTypeManager.getFormType(formTypeName); if (formType == null) { throw new VradiException("Extension of name xmlStream.formTypeName does not exists"); } @@ -575,7 +575,8 @@ } List<Form> forms = new ArrayList<Form>(); - List<String> xmlFieldBindingIds = new ArrayList<String>(stream.getXmlFieldBinding()); + Set<String> xmlFieldBinding = stream.getXmlFieldBinding(); + List<String> xmlFieldBindingIds = new ArrayList<String>(xmlFieldBinding); List<XmlFieldBinding> bindings = wikittyProxy.restore(XmlFieldBinding.class, xmlFieldBindingIds); String formDateId = VradiConstants.FORM_ID_DATE_FORMAT.format(new Date()); String toTreatId = formManager.getNonTraiteStatus().getWikittyId(); Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2012-03-29 16:17:06 UTC (rev 167) @@ -24,6 +24,7 @@ package org.chorem.vradi.services.managers; +import com.google.common.collect.Sets; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -688,7 +689,7 @@ * @param sessionId the session wikitty id */ public void generatePDFForSession(String sessionId) throws VradiException { - List<String> formsIdsToGenerate = new ArrayList<String>(); + Set<String> formsIdsToGenerate = Sets.newLinkedHashSet(); org.chorem.vradi.entities.Session session = wikittyProxy.restore(org.chorem.vradi.entities.Session.class, sessionId); @@ -705,12 +706,7 @@ Set<String> formsIds = SendingHelper.extractForms(wikittyProxy, sending.getGroupForms()); if (formsIds != null) { - for (String formId : formsIds) { - - if (!formsIdsToGenerate.contains(formId)) { - formsIdsToGenerate.add(formId); - } - } + formsIdsToGenerate.addAll(formsIds); } } } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/AutoSendTasks.java 2012-03-29 16:17:06 UTC (rev 167) @@ -61,7 +61,7 @@ } // Bind all forms - session= formManager.bindForms(session); + session = formManager.bindForms(session); String sessionId = session.getWikittyId(); Added: trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java (rev 0) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java 2012-03-29 16:17:06 UTC (rev 167) @@ -0,0 +1,115 @@ +package org.chorem.vradi.services; + +import com.google.common.collect.ImmutableSet; +import org.chorem.vradi.VradiTestAbstract; +import org.chorem.vradi.beans.FormPagedResult; +import org.chorem.vradi.beans.QueryParameters; +import org.chorem.vradi.entities.FieldTypeEnum; +import org.chorem.vradi.entities.Form; +import org.chorem.vradi.entities.XmlFieldBinding; +import org.chorem.vradi.entities.XmlFieldBindingImpl; +import org.chorem.vradi.entities.XmlStream; +import org.chorem.vradi.entities.XmlStreamImpl; +import org.chorem.vradi.services.managers.BindingManager; +import org.chorem.vradi.services.managers.FormManager; +import org.chorem.vradi.services.managers.FormTypeManager; +import org.chorem.vradi.services.managers.SearchManager; +import org.chorem.vradi.services.managers.ThesaurusManager; +import org.chorem.vradi.services.tasks.ImportXmlStreamTasks; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.WikittyExtension; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class InternalUsageTest extends VradiTestAbstract { + + public static final String APPEL_OFFRES_FORM_TYPE = "APPEL_OFFRES"; + + protected BindingManager bindingManager; + protected FormTypeManager formTypeManager; + protected ThesaurusManager thesaurusManager; + protected SearchManager searchManager; + protected FormManager formManager; + + @Before + public void initBindingManager() throws VradiException { + formTypeManager = new FormTypeManager(config, wikittyProxy); + thesaurusManager = new ThesaurusManager(wikittyProxy); + searchManager = new SearchManager(wikittyProxy, thesaurusManager); + formManager = new FormManager(config, wikittyProxy, thesaurusManager, searchManager); + bindingManager = new BindingManager(config, wikittyProxy, formTypeManager, formManager); + createAPPEL_OFFRESFormType(); + } + + protected WikittyExtension createAPPEL_OFFRESFormType() throws VradiException { + Map<String, FieldType> fields = new LinkedHashMap<String, FieldType>(); + fields.put("URL_AO", FieldTypeEnum.STRING.getFieldType()); + fields.put("Contact_technique", FieldTypeEnum.STRING.getFieldType()); + fields.put("Site_acheteur", FieldTypeEnum.STRING.getFieldType()); + fields.put("Contact_administratif", FieldTypeEnum.STRING.getFieldType()); + + return createFormType(APPEL_OFFRES_FORM_TYPE, fields); + } + + + protected XmlFieldBinding createXmlFieldBinding(String xmlField, String formField) throws VradiException { + XmlFieldBinding binding = new XmlFieldBindingImpl(); + binding.setXmlField(ImmutableSet.of(xmlField)); + binding.setFormField(formField); + + XmlFieldBinding result = wikittyProxy.store(binding); + return result; + } + + public XmlStream createAPPEL_OFFRESXmlStream(String name, String url) throws Exception { + XmlStream stream = new XmlStreamImpl(); + stream.setName(name); + stream.setUrl(url); + stream.setFormTypeName(APPEL_OFFRES_FORM_TYPE); + stream.addXmlFieldBinding(createXmlFieldBinding("title", "Infogene.objet").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("link", "Infogene.sourceURL").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("pubDate", "Form.datePub").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("creator", "Infogene.entity").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("description", "Infogene.description").getWikittyId()); + wikittyProxy.store(stream); + + return stream; + } + + @Test + @Ignore + public void registerMarchesOnlineXmlStream() throws Exception { + XmlStream marchesOnlineStream = createAPPEL_OFFRESXmlStream("Marchés Online", "http://www.marchesonline.com/mol/rss/appels-d-offres-services-informatiques…"); + + List<XmlStream> allXmlStreams = bindingManager.getAllXmlStreams(); + Assert.assertEquals(1, allXmlStreams.size()); + + XmlStream ediTenderStream = createAPPEL_OFFRESXmlStream("Edi Tender", "http://www.edi-tender.com/rss/marchespublics.xml"); + XmlStream eMarchesPublicsStream = createAPPEL_OFFRESXmlStream("e-Marchés Publics", "https://www.e-marchespublics.com/rss/rss.php?v=2&l=200&c=Service"); + + allXmlStreams = bindingManager.getAllXmlStreams(); + Assert.assertEquals(3, allXmlStreams.size()); + + for (XmlStream stream : allXmlStreams) { + ImportXmlStreamTasks task = new ImportXmlStreamTasks(config, wikittyProxy, bindingManager, stream.getWikittyId()); + task.run(); + } + + FormPagedResult result = searchManager.findForms(new QueryParameters("Java"), new FormPagedResult()); +// Assert.assertEquals(941, result.getTotalFoundFormNb()); + List<String> formsIdsToShow = result.getFormsIdsToShow(); + for (String id : formsIdsToShow) { + Form form = wikittyProxy.restore(Form.class, id); + System.out.println(form); + } + } +} Modified: trunk/vradi-services/src/test/resources/vradi-services.properties =================================================================== --- trunk/vradi-services/src/test/resources/vradi-services.properties 2012-03-28 10:23:55 UTC (rev 166) +++ trunk/vradi-services/src/test/resources/vradi-services.properties 2012-03-29 16:17:06 UTC (rev 167) @@ -70,3 +70,6 @@ jcs.default= jcs.default.cacheattributes.MaxObjects=10000 #jcs.priority.cacheattributes.MaxObjects=10000 + +vradi.mail.admin=thimel(a)codelutin.com +vradi.smtp.host=smtp

1 0

r166 - in trunk: . vradi-entities vradi-services vradi-services-web vradi-swing vradi-web
by athimel＠users.chorem.org March 28, 2012

March 28, 2012

Author: athimel Date: 2012-03-28 12:23:55 +0200 (Wed, 28 Mar 2012) New Revision: 166 Url: http://chorem.org/repositories/revision/vradi/166 Log: Indent poms Modified: trunk/pom.xml trunk/vradi-entities/pom.xml trunk/vradi-services-web/pom.xml trunk/vradi-services/pom.xml trunk/vradi-swing/pom.xml trunk/vradi-web/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-28 10:22:51 UTC (rev 165) +++ trunk/pom.xml 2012-03-28 10:23:55 UTC (rev 166) @@ -1,571 +1,573 @@ <?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>3.2</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>3.2</version> + </parent> - <groupId>org.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> - <modules> - <module>vradi-entities</module> - <module>vradi-services</module> - <module>vradi-services-web</module> - <module>vradi-web</module> - <module>vradi-swing</module> - </modules> + <modules> + <module>vradi-entities</module> + <module>vradi-services</module> + <module>vradi-services-web</module> + <module>vradi-web</module> + <module>vradi-swing</module> + </modules> - <name>Vradi</name> + <name>Vradi</name> - <description>Projet Vradi</description> - <inceptionYear>2009</inceptionYear> - <url>http://maven-site.chorem.org/vradi</url> + <description>Projet Vradi</description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.chorem.org/vradi</url> - <licenses> - <license> - <name>GNU Affero General Public License version 3</name> - <url>http://www.gnu.org/licenses/agpl.html</url> - <distribution>repo</distribution> - </license> - </licenses> + <licenses> + <license> + <name>GNU Affero General Public License version 3</name> + <url>http://www.gnu.org/licenses/agpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> - <developers> + <developers> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>sletellier</id> - <name>Sylvain Letellier</name> - <email>letellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>sletellier</id> + <name>Sylvain Letellier</name> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>kmorin</id> - <name>Kevin Morin</name> - <email>morin(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>kmorin</id> + <name>Kevin Morin</name> + <email>morin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>jcouteau</id> - <name>Jean Couteau</name> - <email>couteau(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> - <developer> - <id>echatellier</id> - <name>Eric Chatellier</name> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <roles> - <role>Développeur</role> - </roles> - <timezone>+2</timezone> - </developer> - </developers> + <developer> + <id>echatellier</id> + <name>Eric Chatellier</name> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> + </developers> - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/vradi/trunk</connection> - <developerConnection> - scm:svn:http://svn.chorem.org/svn/vradi/trunk - </developerConnection> - <url>http://www.chorem.org/repositories/browse/vradi/trunk</url> - </scm> + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/vradi/trunk</connection> + <developerConnection> + scm:svn:http://svn.chorem.org/svn/vradi/trunk + </developerConnection> + <url>http://www.chorem.org/repositories/browse/vradi/trunk</url> + </scm> - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> - <packaging>pom</packaging> + <packaging>pom</packaging> - <properties> - <platform>chorem.org</platform> - <projectId>vradi</projectId> + <properties> + <platform>chorem.org</platform> + <projectId>vradi</projectId> -  - <jaxxVersion>2.4.2</jaxxVersion> - <eugenePluginVersion>2.4.2</eugenePluginVersion> - <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> - <nuitonValidatorVersion>2.4.6</nuitonValidatorVersion> - <nuitonWebVersion>1.10</nuitonWebVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <openCsvVersion>2.3</openCsvVersion> - <wikittyVersion>3.4</wikittyVersion> - <slf4jVersion>1.6.4</slf4jVersion> - <h2Version>1.3.157</h2Version>  - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jrstVersion>1.5</jrstVersion> - <oooVersion>3.2.1</oooVersion> - <javaxActivationVersion>1.1.1</javaxActivationVersion> - <javaxMailVersion>1.4.5</javaxMailVersion> - <struts2Version>2.3.1.2</struts2Version> - <struts2jqueryVersion>3.3.0</struts2jqueryVersion> - <servletApiVersion>2.5</servletApiVersion> - <jspApiVersion>2.0</jspApiVersion> - <tikaVersion>1.1</tikaVersion> - <jdomVersion>1.1.3</jdomVersion> +  + <jaxxVersion>2.4.2</jaxxVersion> + <eugenePluginVersion>2.4.2</eugenePluginVersion> + <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> + <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> + <nuitonValidatorVersion>2.4.6</nuitonValidatorVersion> + <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <openCsvVersion>2.3</openCsvVersion> + <wikittyVersion>3.4</wikittyVersion> + <slf4jVersion>1.6.4</slf4jVersion> + <h2Version>1.3.157</h2Version> +  + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <jrstVersion>1.5</jrstVersion> + <oooVersion>3.2.1</oooVersion> + <javaxActivationVersion>1.1.1</javaxActivationVersion> + <javaxMailVersion>1.4.5</javaxMailVersion> + <struts2Version>2.3.1.2</struts2Version> + <struts2jqueryVersion>3.3.0</struts2jqueryVersion> + <servletApiVersion>2.5</servletApiVersion> + <jspApiVersion>2.0</jspApiVersion> + <tikaVersion>1.1</tikaVersion> + <jdomVersion>1.1.3</jdomVersion> -  - <license.organizationName>Codelutin</license.organizationName> +  + <license.organizationName>Codelutin</license.organizationName> -  - <license.licenseName>agpl_v3</license.licenseName> +  + <license.licenseName>agpl_v3</license.licenseName> -  -  -  +  +  +  -  -  +  +  - </properties> + </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>net.sourceforge.web-harvest</groupId> - <artifactId>web-harvest</artifactId> - <version>2.0-cl_20100531</version> - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>net.sourceforge.web-harvest</groupId> + <artifactId>web-harvest</artifactId> + <version>2.0-cl_20100531</version> + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> +  + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - <version>${nuitonWidgetVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + <version>${nuitonWidgetVersion}</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - <version>${jaxxVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${jaxxVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>${nuitonValidatorVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonValidatorVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - <version>${jrstVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + <version>${jrstVersion}</version> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + <version>1.6.2-2</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - <version>3.0.4</version> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.4</version> + </dependency> - <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> - </dependency> + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.5.0</version> + </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + <scope>runtime</scope> + </dependency> -  - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgresqlVersion}</version> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresqlVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-struts</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>${tikaVersion}</version> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>${tikaVersion}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>${jdomVersion}</version> - </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>${jdomVersion}</version> + </dependency> -  - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>1.0</version> -  - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>1.0</version> +  + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>juh</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>jurt</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>ridl</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>unoil</artifactId> - <version>${oooVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>juh</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>jurt</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>ridl</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>unoil</artifactId> + <version>${oooVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.2</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <version>${jettyPluginVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>${jettyPluginVersion}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jettyPluginVersion}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jettyPluginVersion}</version> + <scope>provided</scope> + </dependency> -  - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${javaxActivationVersion}</version> - </dependency> +  + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${javaxActivationVersion}</version> + </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${openCsvVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${openCsvVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>3.5.0</version> - </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>3.5.0</version> + </dependency> -  +  - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-grid-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-richtext-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-tree-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-mobile-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-mobile-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-dojo-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.1.GA</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>${jspApiVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servletApiVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - <version>4.0.6</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + <scope>runtime</scope> + </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>4.0.6</version> + </dependency> - <build> + </dependencies> + </dependencyManagement> - <pluginManagement> - <plugins> + <build> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxxVersion}</version> - </plugin> + <pluginManagement> + <plugins> -  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugenePluginVersion}</version> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${wikittyVersion}</version> - </dependency> - </dependencies> - </plugin> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - <configuration> - <bundles>fr_FR</bundles> - </configuration> - </plugin> +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugenePluginVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${wikittyVersion}</version> + </dependency> + </dependencies> + </plugin> -  - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + <configuration> + <bundles>fr_FR</bundles> + </configuration> + </plugin> - </plugins> - </pluginManagement> +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> - </build> + </plugins> + </pluginManagement> - <reporting> - <excludeDefaults>true</excludeDefaults> - </reporting> + </build> + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> + <repositories> <repository> Modified: trunk/vradi-entities/pom.xml =================================================================== --- trunk/vradi-entities/pom.xml 2012-03-28 10:22:51 UTC (rev 165) +++ trunk/vradi-entities/pom.xml 2012-03-28 10:23:55 UTC (rev 166) @@ -1,74 +1,75 @@ <?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> +<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.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-entities</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-entities</artifactId> - <name>Vradi :: Entities</name> - <description>Vradi entities module</description> + <name>Vradi :: Entities</name> + <description>Vradi entities module</description> - <dependencies> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <build> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> + </dependencies> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api generator</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - <input>classpath:model:/:wikitty.objectmodel</input> - </inputs> - <fullPackagePath>org.chorem.vradi</fullPackagePath> - <defaultPackage>org.chorem.vradi</defaultPackage> - <extractedPackages>org.chorem.vradi.entities,org.nuiton.wikitty</extractedPackages> - <generatedPackages>org.chorem.vradi.entities</generatedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> + <build> - </plugins> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + <fullPackagePath>org.chorem.vradi</fullPackagePath> + <defaultPackage>org.chorem.vradi</defaultPackage> + <extractedPackages>org.chorem.vradi.entities,org.nuiton.wikitty</extractedPackages> + <generatedPackages>org.chorem.vradi.entities</generatedPackages> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> - </build> + </plugins> + </build> + </project> Modified: trunk/vradi-services/pom.xml =================================================================== --- trunk/vradi-services/pom.xml 2012-03-28 10:22:51 UTC (rev 165) +++ trunk/vradi-services/pom.xml 2012-03-28 10:23:55 UTC (rev 166) @@ -1,294 +1,295 @@ <?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> +<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.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-services</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-services</artifactId> - <name>Vradi :: Services</name> - <description>Vradi services module</description> + <name>Vradi :: Services</name> + <description>Vradi services module</description> - <properties> + <properties> -  - <maven.jar.main.class> - org.chorem.vradi.VradiServiceMain - </maven.jar.main.class> +  + <maven.jar.main.class> + org.chorem.vradi.VradiServiceMain + </maven.jar.main.class> - </properties> + </properties> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> -  - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - </dependency> +  + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </dependency> -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>juh</artifactId> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>jurt</artifactId> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>ridl</artifactId> - </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>unoil</artifactId> - </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>juh</artifactId> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>jurt</artifactId> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>ridl</artifactId> + </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>unoil</artifactId> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> - <dependency> - <groupId>net.sourceforge.web-harvest</groupId> - <artifactId>web-harvest</artifactId> - </dependency> + <dependency> + <groupId>net.sourceforge.web-harvest</groupId> + <artifactId>web-harvest</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</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-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </dependency> - <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> - </dependency> + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>*.properties</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>*.properties</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>*.properties</exclude> + </excludes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>*.properties</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>*.properties</exclude> + </excludes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>target/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + </plugins> - <pluginManagement> - <plugins> + <pluginManagement> + <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <useUniqueVersions>false</useUniqueVersions> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + <useUniqueVersions>false</useUniqueVersions> + </manifest> + </archive> + </configuration> + </plugin> - </plugins> - </pluginManagement> - </build> + </plugins> + </pluginManagement> + </build> - <profiles> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/vradi-services-web/pom.xml =================================================================== --- trunk/vradi-services-web/pom.xml 2012-03-28 10:22:51 UTC (rev 165) +++ trunk/vradi-services-web/pom.xml 2012-03-28 10:23:55 UTC (rev 166) @@ -1,137 +1,138 @@ <?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> +<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.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-services-web</artifactId> - - <packaging>war</packaging> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-services-web</artifactId> - <name>Vradi :: Services Web</name> - <description>Vradi service web module</description> + <packaging>war</packaging> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> + <name>Vradi :: Services Web</name> + <description>Vradi service web module</description> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> <includes> - <include>**/war/Jetty*</include> + <include>**/*</include> </includes> - </overlay> - <overlay> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </testResource> + </testResources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> Modified: trunk/vradi-swing/pom.xml =================================================================== --- trunk/vradi-swing/pom.xml 2012-03-28 10:22:51 UTC (rev 165) +++ trunk/vradi-swing/pom.xml 2012-03-28 10:23:55 UTC (rev 166) @@ -1,571 +1,572 @@ <?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> +<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.chorem</groupId> - <artifactId>vradi</artifactId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>vradi</artifactId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-swing</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-swing</artifactId> - <name>Vradi :: Swing</name> - <description>Vradi Swing</description> + <name>Vradi :: Swing</name> + <description>Vradi Swing</description> - <properties> + <properties> -  - <maven.jar.main.class> - org.chorem.vradi.VradiMain - </maven.jar.main.class> +  + <maven.jar.main.class> + org.chorem.vradi.VradiMain + </maven.jar.main.class> -  - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - <jaxx.defaultErrorUIFQN> - jaxx.runtime.validator.swing.ui.ImageValidationUI - </jaxx.defaultErrorUIFQN> - <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> +  + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.defaultErrorUIFQN> + jaxx.runtime.validator.swing.ui.ImageValidationUI + </jaxx.defaultErrorUIFQN> + <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> - </properties> + </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> -  - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> +  + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-validator</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>runtime</scope> + </dependency> -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</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>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx-core</artifactId> - </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> - <dependency> - <groupId>net.sourceforge.web-harvest</groupId> - <artifactId>web-harvest</artifactId> - </dependency> + <dependency> + <groupId>net.sourceforge.web-harvest</groupId> + <artifactId>web-harvest</artifactId> + </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + </dependency> - <dependency> - <groupId>com.fifesoft</groupId> - <artifactId>rsyntaxtextarea</artifactId> - </dependency> + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + </dependency> - <dependency> - <groupId>org.openoffice</groupId> - <artifactId>ridl</artifactId> - </dependency> + <dependency> + <groupId>org.openoffice</groupId> + <artifactId>ridl</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> - <plugins> + <plugins> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>target/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> - </plugins> + </plugins> - <pluginManagement> - <plugins> + <pluginManagement> + <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <useUniqueVersions>true</useUniqueVersions> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + <useUniqueVersions>true</useUniqueVersions> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <configuration> - <generateBundle>true</generateBundle> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <generateBundle>true</generateBundle> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <configuration> - <libPath>lib</libPath> - <makeArchive>false</makeArchive> - <verbose>false</verbose> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> - <jnlp> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - <j2seVersion>1.6+</j2seVersion> - </jnlp> + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + <j2seVersion>1.6+</j2seVersion> + </jnlp> -  - <jnlpExtensions> -  - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer</title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - </jnlpExtensions> +  + <jnlpExtensions> +  + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> - <sign> - <keystore>${keystorepath}</keystore> - <storepass>${keystorepass}</storepass> - <alias>${keyalias}</alias> - <keypass>${keypass}</keypass> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> - </configuration> - </plugin> + </configuration> + </plugin> - </plugins> - </pluginManagement> - </build> + </plugins> + </pluginManagement> + </build> - <profiles> - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + <profiles> + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> -  - <profile> - <id>webstart-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> +  + <profile> + <id>webstart-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - </profile> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + </profile> -  - <profile> - <id>local-webstart-profile</id> - <activation> - <property> - <name>doLocalWebstart</name> - <value>true</value> - </property> - </activation> - <properties> - <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> - </properties> - <build> - <defaultGoal>package</defaultGoal> - <plugins> +  + <profile> + <id>local-webstart-profile</id> + <activation> + <property> + <name>doLocalWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> + </properties> + <build> + <defaultGoal>package</defaultGoal> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp-local</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - </profile> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + </profile> -  - <profile> - <id>server-webstart-profile</id> - <activation> - <property> - <name>doServerWebstart</name> - <value>true</value> - </property> - </activation> - <properties> - <jnlp.codebase>http://vradi/</jnlp.codebase> - </properties> - <build> - <defaultGoal>package</defaultGoal> - <plugins> +  + <profile> + <id>server-webstart-profile</id> + <activation> + <property> + <name>doServerWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>http://vradi/</jnlp.codebase> + </properties> + <build> + <defaultGoal>package</defaultGoal> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp-local</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - <configuration> - <jnlp> - <inputTemplateResourcePath> - src/main/jnlp - </inputTemplateResourcePath> - <inputTemplate>vradi-server-jnlp.vm</inputTemplate> - </jnlp> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + <configuration> + <jnlp> + <inputTemplateResourcePath> + src/main/jnlp + </inputTemplateResourcePath> + <inputTemplate>vradi-server-jnlp.vm</inputTemplate> + </jnlp> + </configuration> + </execution> + </executions> + </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - </profile> - </profiles> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> </project> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2012-03-28 10:22:51 UTC (rev 165) +++ trunk/vradi-web/pom.xml 2012-03-28 10:23:55 UTC (rev 166) @@ -3,284 +3,284 @@ 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> - <artifactId>vradi</artifactId> - <groupId>org.chorem</groupId> - <version>0.7-SNAPSHOT</version> - </parent> + <parent> + <artifactId>vradi</artifactId> + <groupId>org.chorem</groupId> + <version>0.7-SNAPSHOT</version> + </parent> - <groupId>org.chorem.vradi</groupId> - <artifactId>vradi-web</artifactId> + <groupId>org.chorem.vradi</groupId> + <artifactId>vradi-web</artifactId> - <name>Vradi :: Web</name> - <description>Vradi Web</description> + <name>Vradi :: Web</name> + <description>Vradi Web</description> - <packaging>war</packaging> + <packaging>war</packaging> - <properties> + <properties> - <i18n.silent>true</i18n.silent> - <i18n.bundleOutputName>vradi-i18n</i18n.bundleOutputName> - <i18n.bundleOutputPackage/> + <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>vradi-i18n</i18n.bundleOutputName> + <i18n.bundleOutputPackage/> - </properties> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-entities</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vradi-services</artifactId> - <version>${project.version}</version> -  - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vradi-services</artifactId> + <version>${project.version}</version> +  + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> -  +  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-struts</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-grid-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-richtext-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-tree-plugin</artifactId> - </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-mobile-plugin</artifactId> - </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-mobile-plugin</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-dojo-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> -  +  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </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>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</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>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> - </dependencies> + </dependencies> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <id>scan-java-sources</id> - <goals> - <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> - <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> - <jsp>http://java.sun.com/JSP/Page</jsp> - <decorator> - http://www.opensymphony.com/sitemesh/decorator - </decorator> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> + <jsp>http://java.sun.com/JSP/Page</jsp> + <decorator> + http://www.opensymphony.com/sitemesh/decorator + </decorator> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>

1 0

r165 - trunk
by athimel＠users.chorem.org March 28, 2012

March 28, 2012

Author: athimel Date: 2012-03-28 12:22:51 +0200 (Wed, 28 Mar 2012) New Revision: 165 Url: http://chorem.org/repositories/revision/vradi/165 Log: Upgrade dependencies revisions Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-28 09:41:08 UTC (rev 164) +++ trunk/pom.xml 2012-03-28 10:22:51 UTC (rev 165) @@ -115,22 +115,28 @@ <projectId>vradi</projectId>  - <jaxxVersion>2.4</jaxxVersion> + <jaxxVersion>2.4.2</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> - <nuitonWebVersion>1.3</nuitonWebVersion> - <nuitonI18nVersion>2.4</nuitonI18nVersion> + <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> + <nuitonValidatorVersion>2.4.6</nuitonValidatorVersion> + <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <openCsvVersion>2.3</openCsvVersion> <wikittyVersion>3.4</wikittyVersion> - <slf4jVersion>1.6.1</slf4jVersion> - <h2Version>1.2.134</h2Version> + <slf4jVersion>1.6.4</slf4jVersion> + <h2Version>1.3.157</h2Version>  + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <jrstVersion>1.5</jrstVersion> <oooVersion>3.2.1</oooVersion> - <javamailVersion>1.4.3</javamailVersion> - <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.1.0</struts2jqueryVersion> + <javaxActivationVersion>1.1.1</javaxActivationVersion> + <javaxMailVersion>1.4.5</javaxMailVersion> + <struts2Version>2.3.1.2</struts2Version> + <struts2jqueryVersion>3.3.0</struts2jqueryVersion> <servletApiVersion>2.5</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> + <tikaVersion>1.1</tikaVersion> + <jdomVersion>1.1.3</jdomVersion>  <license.organizationName>Codelutin</license.organizationName> @@ -227,7 +233,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>2.0</version> + <version>${nuitonValidatorVersion}</version> </dependency> <dependency> @@ -259,7 +265,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.157</version> + <version>${h2Version}</version> <scope>runtime</scope> </dependency> @@ -267,7 +273,7 @@ <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> + <version>${postgresqlVersion}</version> <scope>runtime</scope> </dependency> @@ -298,7 +304,7 @@ <dependency> <groupId>org.apache.tika</groupId> <artifactId>tika-core</artifactId> - <version>0.9</version> + <version>${tikaVersion}</version> </dependency> <dependency> @@ -318,7 +324,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>1.1</version> + <version>${jdomVersion}</version> </dependency>  @@ -363,7 +369,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>${javamailVersion}</version> + <version>${javaxMailVersion}</version> </dependency> <dependency> @@ -391,13 +397,13 @@ <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> - <version>1.1</version> + <version>${javaxActivationVersion}</version> </dependency> <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>2.1</version> + <version>${openCsvVersion}</version> <scope>compile</scope> </dependency>

1 0

r164 - trunk
by athimel＠users.chorem.org March 28, 2012

March 28, 2012

Author: athimel Date: 2012-03-28 11:41:08 +0200 (Wed, 28 Mar 2012) New Revision: 164 Url: http://chorem.org/repositories/revision/vradi/164 Log: Updates to mavenpom 3.2 ; Fix repositories (project now builds from scratch) Modified: trunk/ trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws *.iml target solr *.log *.log.* nbactions.xml .settings PutObjectStoreDirHere .project + *.ipr *.iws *.iml target solr *.log *.log.* nbactions.xml .settings PutObjectStoreDirHere .project .idea Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-03 00:02:24 UTC (rev 163) +++ trunk/pom.xml 2012-03-28 09:41:08 UTC (rev 164) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.7</version> + <version>3.2</version> </parent> <groupId>org.chorem</groupId> @@ -560,40 +560,36 @@ <excludeDefaults>true</excludeDefaults> </reporting> - <repositories> + <repositories> -  - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> + <repository> + <id>vradi-group</id> + <name>Vradi Repository</name> + <url>http://maven.nuiton.org/nexus/content/groups/vradi-group/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> - </repositories> + <pluginRepositories> - <pluginRepositories> + <pluginRepository> + <id>vradi-group</id> + <name>Vradi Repository</name> + <url>http://maven.nuiton.org/nexus/content/groups/vradi-group/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> -  - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - - </pluginRepositories> - </project>

1 0

r163 - trunk
by tchemit＠users.chorem.org Feb. 3, 2012

Feb. 3, 2012

Author: tchemit Date: 2012-02-03 01:02:24 +0100 (Fri, 03 Feb 2012) New Revision: 163 Url: http://chorem.org/repositories/revision/vradi/163 Log: updates to wikitty 3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-19 14:22:32 UTC (rev 162) +++ trunk/pom.xml 2012-02-03 00:02:24 UTC (rev 163) @@ -121,7 +121,7 @@ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.4-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.4</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.5</jrstVersion>

1 0

r162 - in trunk/vradi-web: . src/test/java/org/chorem/vradi
by echatellier＠users.chorem.org Jan. 19, 2012

Jan. 19, 2012

Author: echatellier Date: 2012-01-19 15:22:32 +0100 (Thu, 19 Jan 2012) New Revision: 162 Url: http://chorem.org/repositories/revision/vradi/162 Log: Fix compilation error Modified: trunk/vradi-web/pom.xml trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2012-01-18 11:34:45 UTC (rev 161) +++ trunk/vradi-web/pom.xml 2012-01-19 14:22:32 UTC (rev 162) @@ -33,6 +33,11 @@ <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> +  <dependency> <groupId>${project.groupId}</groupId> Modified: trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java =================================================================== --- trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java 2012-01-18 11:34:45 UTC (rev 161) +++ trunk/vradi-web/src/test/java/org/chorem/vradi/VradiWebHelperTest.java 2012-01-19 14:22:32 UTC (rev 162) @@ -1,10 +1,8 @@ package org.chorem.vradi; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; -import java.io.IOException; - /** * @author sletellier */

1 0

r161 - in trunk: . vradi-entities/src/main/java/org/chorem/vradi/entities vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models vradi-swing/src/main/java/org/chorem/vradi/ui/search
by echatellier＠users.chorem.org Jan. 18, 2012

Jan. 18, 2012

Author: echatellier Date: 2012-01-18 12:34:45 +0100 (Wed, 18 Jan 2012) New Revision: 161 Url: http://chorem.org/repositories/revision/vradi/161 Log: Migrate to wikitty 3.4 Modified: trunk/pom.xml trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/pom.xml 2012-01-18 11:34:45 UTC (rev 161) @@ -121,7 +121,7 @@ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.3.1-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.4-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.5</jrstVersion> @@ -410,7 +410,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> </dependency>  Modified: trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java =================================================================== --- trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/vradi-entities/src/main/java/org/chorem/vradi/entities/FieldTypeEnum.java 2012-01-18 11:34:45 UTC (rev 161) @@ -23,20 +23,21 @@ */ package org.chorem.vradi.entities; +import static org.nuiton.i18n.I18n.n_; + import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.WikittyTypes; -import static org.nuiton.i18n.I18n.n_; - /** @author letellier */ public enum FieldTypeEnum { - STRING(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.string"), 0, 1), - TEXT(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.text"), 0, 1), - DATE(FieldType.TYPE.DATE, n_("vradi.fieldTypeEnum.date"), 1, 1), - DATE_TIME(FieldType.TYPE.DATE, n_("vradi.fieldTypeEnum.dateTime"), 1, 1), - EMAIL(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.email"), 0, 1), - URL(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.url"), 0, 1), - NUMERIC(FieldType.TYPE.NUMERIC, n_("vradi.fieldTypeEnum.numeric"), 1, 1), - CURRENCY(FieldType.TYPE.STRING, n_("vradi.fieldTypeEnum.currency"), 0, 1); + STRING(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.string"), 0, 1), + TEXT(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.text"), 0, 1), + DATE(WikittyTypes.DATE, n_("vradi.fieldTypeEnum.date"), 1, 1), + DATE_TIME(WikittyTypes.DATE, n_("vradi.fieldTypeEnum.dateTime"), 1, 1), + EMAIL(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.email"), 0, 1), + URL(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.url"), 0, 1), + NUMERIC(WikittyTypes.NUMERIC, n_("vradi.fieldTypeEnum.numeric"), 1, 1), + CURRENCY(WikittyTypes.STRING, n_("vradi.fieldTypeEnum.currency"), 0, 1); public static final String CURRENCY_TAG_VALUE = "currency"; @@ -46,7 +47,7 @@ protected FieldType type; - FieldTypeEnum(FieldType.TYPE type, String tagValue, int min, int max) { + FieldTypeEnum(WikittyTypes type, String tagValue, int min, int max) { this.tagValue = tagValue; this.type = new FieldType(type, min, max); this.type.addTagValue(TAG_VALUE, tagValue); @@ -79,13 +80,13 @@ FieldTypeEnum e; if (FieldTypeEnum.DATE_TIME.isType(type)) { e = FieldTypeEnum.DATE_TIME; - } else if (FieldTypeEnum.DATE.isType(type) || FieldType.TYPE.DATE.equals(type.getType())) { + } else if (FieldTypeEnum.DATE.isType(type) || WikittyTypes.DATE.equals(type.getType())) { e = FieldTypeEnum.DATE; } else if (FieldTypeEnum.EMAIL.isType(type)) { e = FieldTypeEnum.EMAIL; } else if (FieldTypeEnum.CURRENCY.isType(type)) { e = FieldTypeEnum.CURRENCY; - } else if (FieldTypeEnum.NUMERIC.isType(type) || FieldType.TYPE.NUMERIC.equals(type.getType())) { + } else if (FieldTypeEnum.NUMERIC.isType(type) || WikittyTypes.NUMERIC.equals(type.getType())) { e = FieldTypeEnum.NUMERIC; } else if (FieldTypeEnum.TEXT.isType(type)) { e = FieldTypeEnum.TEXT; Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/offer/models/OfferListTableModel.java 2012-01-18 11:34:45 UTC (rev 161) @@ -44,6 +44,7 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import javax.swing.JTable; import javax.swing.table.AbstractTableModel; @@ -296,13 +297,13 @@ FieldType fieldType = extension.getFieldType(fieldName); Class<?> columnClass; - if (fieldType.getType() == FieldType.TYPE.BOOLEAN) { + if (fieldType.getType() == WikittyTypes.BOOLEAN) { columnClass = Boolean.class; - } else if (fieldType.getType() == FieldType.TYPE.DATE) { + } else if (fieldType.getType() == WikittyTypes.DATE) { columnClass = Date.class; - } else if (fieldType.getType() == FieldType.TYPE.NUMERIC) { + } else if (fieldType.getType() == WikittyTypes.NUMERIC) { columnClass = Double.class; } else if (fieldName.equals(Infogene.FIELD_INFOGENE_STATUS)) { Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java =================================================================== --- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2012-01-17 16:15:19 UTC (rev 160) +++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/search/SearchHandler.java 2012-01-18 11:34:45 UTC (rev 161) @@ -55,6 +55,7 @@ import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; @@ -389,7 +390,7 @@ if (formType != null) { for (String name : formType.getFieldNames()) { FieldType type = formType.getFieldType(name); - if (type.getType() == FieldType.TYPE.DATE) { + if (type.getType() == WikittyTypes.DATE) { result.add(formType.getName() + "." + name); } }

1 0

r160 - trunk
by echatellier＠users.chorem.org Jan. 17, 2012

Jan. 17, 2012

Author: echatellier Date: 2012-01-17 17:15:19 +0100 (Tue, 17 Jan 2012) New Revision: 160 Url: http://chorem.org/repositories/revision/vradi/160 Log: Back to 3.3.x Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 15:41:02 UTC (rev 159) +++ trunk/pom.xml 2012-01-17 16:15:19 UTC (rev 160) @@ -121,7 +121,7 @@ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.4-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.3.1-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.5</jrstVersion>

1 0

r159 - trunk
by echatellier＠users.chorem.org Jan. 17, 2012

Jan. 17, 2012

Author: echatellier Date: 2012-01-17 16:41:02 +0100 (Tue, 17 Jan 2012) New Revision: 159 Url: http://chorem.org/repositories/revision/vradi/159 Log: Use nuiton-utils 2.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 11:27:39 UTC (rev 158) +++ trunk/pom.xml 2012-01-17 15:41:02 UTC (rev 159) @@ -118,10 +118,10 @@ <jaxxVersion>2.4</jaxxVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> - <nuitonUtilsVersion>2.4.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonWebVersion>1.3</nuitonWebVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <wikittyVersion>3.3.1-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.4-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <h2Version>1.2.134</h2Version> <jrstVersion>1.5</jrstVersion>

1 0