Author: dcosse Date: 2014-06-02 11:26:13 +0200 (Mon, 02 Jun 2014) New Revision: 3825 Url: http://forge.chorem.org/projects/lima/repository/revisions/3825 Log: corrige build + message de warning Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-callao/src/main/xmi/accounting-model.properties trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2014-05-28 15:51:32 UTC (rev 3824) +++ trunk/lima-business/pom.xml 2014-06-02 09:26:13 UTC (rev 3825) @@ -46,14 +46,6 @@ <artifactId>pdfbox-examples</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -114,6 +106,18 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.2_spec</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> </dependencies> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2014-05-28 15:51:32 UTC (rev 3824) +++ trunk/lima-callao/pom.xml 2014-06-02 09:26:13 UTC (rev 3825) @@ -48,6 +48,10 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> </dependencies> <build> Modified: trunk/lima-callao/src/main/xmi/accounting-model.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting-model.properties 2014-05-28 15:51:32 UTC (rev 3824) +++ trunk/lima-callao/src/main/xmi/accounting-model.properties 2014-06-02 09:26:13 UTC (rev 3825) @@ -27,7 +27,7 @@ model.tagvalue.version=0.6 model.tagvalue.constantPrefix=PROPERTY_ model.tagValue.notGenerateToString=true -model.tagvalue.String=text +model.tagValue.hibernateAttributeType.String=text model.tagValue.doNotGenerateBooleanGetMethods=false # natural id Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-05-28 15:51:32 UTC (rev 3824) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-06-02 09:26:13 UTC (rev 3825) @@ -225,7 +225,7 @@ // display result dialog if (verboseMode) { String result = get(); - if (StringUtils.isBlank(result)) { + if (importMode && StringUtils.isBlank(result)) { JOptionPane.showMessageDialog(viewComponent, t("lima.ui.importexport.importerror"), t("lima.ui.importexport.importtitle"), JOptionPane.ERROR_MESSAGE); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-28 15:51:32 UTC (rev 3824) +++ trunk/pom.xml 2014-06-02 09:26:13 UTC (rev 3825) @@ -162,7 +162,7 @@ <projectId>lima</projectId> <!-- customized libs version --> - <jettyVersion>${jettyPluginVersion}</jettyVersion> + <jettyPluginVersion>9.1.5.v20140505</jettyPluginVersion> <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> @@ -187,6 +187,7 @@ <slf4jVersion>1.7.7</slf4jVersion> <swingxVersion>1.6.5-1</swingxVersion> <pdfboxVersion>1.8.5</pdfboxVersion> + <jbossTransactionVersion>1.0.0.Final</jbossTransactionVersion> <!-- license to use --> <license.licenseName>gpl_v3</license.licenseName> @@ -440,18 +441,6 @@ </exclusions> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jettyVersion}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jettyVersion}</version> - </dependency> - <!-- pdfbox to create pdf document --> <dependency> <groupId>org.apache.pdfbox</groupId> @@ -471,6 +460,25 @@ <version>${nuitonWidgetsVersion}</version> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.2_spec</artifactId> + <version>${jbossTransactionVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jettyPluginVersion}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jettyPluginVersion}</version> + </dependency> + </dependencies> </dependencyManagement>