From echatellier@users.forge.codelutin.com Wed Mar 19 11:13:30 2014
From: echatellier@users.forge.codelutin.com
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3895 - in branches/4.0.1: .
	src/main/java/fr/ifremer/isisfish src/main/resources
Date: Wed, 19 Mar 2014 11:13:29 +0100
Message-ID: <20140319101329.D48CD1813F2@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1257126656561178735=="

--===============1257126656561178735==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: echatellier
Date: 2014-03-19 11:13:29 +0100 (Wed, 19 Mar 2014)
New Revision: 3895

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3895

Log:
fixes #4752: Suppression du code d'import des bases V2

Removed:
   branches/4.0.1/src/main/resources/v2xsl/
Modified:
   branches/4.0.1/pom.xml
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java

Modified: branches/4.0.1/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/4.0.1/pom.xml	2014-03-19 10:10:07 UTC (rev 3894)
+++ branches/4.0.1/pom.xml	2014-03-19 10:13:29 UTC (rev 3895)
@@ -265,24 +265,6 @@
             <scope>compile</scope>
         </dependency>
=20
-        <!-- Utilis=C3=A9 lors de l'import xml v2 (entre autre) -->
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>xml-apis</artifactId>
-                    <groupId>xml-apis</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xmlParserAPIs</artifactId>
-                    <groupId>xerces</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Change this dependence if you change database -->
         <dependency>
             <groupId>com.h2database</groupId>

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java	2014-03-19=
 10:10:07 UTC (rev 3894)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java	2014-03-19=
 10:13:29 UTC (rev 3895)
@@ -655,9 +655,10 @@
                                 // remove isis build directory
                                 try {
                                     FileUtils.deleteDirectory(IsisFish.confi=
g.getCompileDirectory());
-                                } catch (IOException e) {
-                                    // TODO Auto-generated catch block
-                                    e.printStackTrace();
+                                } catch (IOException ex) {
+                                    if (log.isErrorEnabled()) {
+                                        log.error("Can't clear build directo=
ry", ex);
+                                    }
                                 }
=20
                                 ErrorHelper.showErrorDialog(null, _("isisfis=
h.error.linkageerror.message"), cause);


--===============1257126656561178735==--


