June 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r141 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 06 Jun '14

06 Jun '14

Author: echatellier Date: 2014-06-06 10:10:52 +0200 (Fri, 06 Jun 2014) New Revision: 141 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/141 Log: refs #4662: Extension automatique du noeud parent lors de l'ajout. Edition automatique du nouveau noeud ajout?\195?\169. Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-06 07:56:32 UTC (rev 140) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-06 08:10:52 UTC (rev 141) @@ -206,11 +206,11 @@ <div class="col-md-4"> <h3>Dossiers <a class="btn btn-xs btn-success pull-right" ng-click="newRoot()">Nouveau</a></h3> <script type="text/ng-template" id="nodes_renderer.html"> - <div ui-tree-handle ng-click="editMailFolder(mailFolder)" ng-class="{'bg-success' : mailFolder == selectedMailFolder}"> + <div ui-tree-handle ng-class="{'bg-success' : mailFolder == selectedMailFolder}"> <a class="btn btn-success btn-xs" data-nodrag ng-click="toggle(this)" ng-disabled="!mailFolder.children || mailFolder.children.length == 0"> <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> - {{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span> + <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span></a> <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;"><span class="glyphicon glyphicon-plus"></span></a> <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes !'|| 'Supprimer ce dossier'}}"> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-06 07:56:32 UTC (rev 140) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-06 08:10:52 UTC (rev 141) @@ -27,8 +27,8 @@ /** * Global configuration controller. */ -ConfigurationModule.controller('ConfigurationController', ['$scope', '$http', 'ConfigurationData', - function($scope, $http, ConfigurationData) { +ConfigurationModule.controller('ConfigurationController', ['$scope', 'ConfigurationData', + function($scope, ConfigurationData) { //{Map} les actions possibles pour les etats d'attentes $scope.mailActions = ConfigurationData.mailActions; //{Map} les champs obligatoires possibles @@ -93,8 +93,8 @@ /** * Misc tab controller. */ -ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$http', '$window', 'ConfigurationData', - function($scope, $http, $window, ConfigurationData) { +ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Object} L'object configuration $scope.configuration = ConfigurationData.configuration; @@ -117,8 +117,8 @@ /** * Etat attente tab controller. */ -ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scope', '$http', '$window', 'ConfigurationData', - function($scope, $http, $window, ConfigurationData) { +ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Object} etat d'attente selectionné $scope.selectedEtatAttente; @@ -177,8 +177,8 @@ /** * Demand type tab controller. */ -ConfigurationModule.controller('ConfigurationDemandTypeController', ['$scope', '$http', '$window', 'ConfigurationData', - function($scope, $http, $window, ConfigurationData) { +ConfigurationModule.controller('ConfigurationDemandTypeController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Object} demand type selectionné $scope.selectedDemandType; @@ -261,12 +261,19 @@ var nodeData = scope.$modelValue; var name = $window.prompt("Nom du nouveau noeud ? "); if (name) { - nodeData.children.push({ - topiaId: "new_" + guid(), - name: name, - children: [] - }); - $scope._updateFlatMailFolders(); // update flat map + var newNode = { + topiaId: "new_" + guid(), + name: name, + children: [] + }; + // extend node (in faxtomail collapsed = extended) + scope.collapse(); + // append new node + nodeData.children.push(newNode); + // edition automatique + $scope.editMailFolder(newNode); + // update flat map + $scope._updateFlatMailFolders(); } };

1 0

r140 - in trunk: . faxtomail-ui-web faxtomail-ui-web/src/main/resources faxtomail-ui-web/src/main/webapp/WEB-INF faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/WEB-INF/decorators
by echatellier＠users.forge.codelutin.com 06 Jun '14

06 Jun '14

Author: echatellier Date: 2014-06-06 09:56:32 +0200 (Fri, 06 Jun 2014) New Revision: 140 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/140 Log: Switch to wro Added: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml Modified: trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/pom.xml 2014-06-06 07:56:32 UTC (rev 140) @@ -212,12 +212,13 @@ <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </dependency> - + <dependency> - <groupId>org.webjars</groupId> - <artifactId>angularjs</artifactId> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> </dependency> + <dependency> <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> @@ -234,7 +235,12 @@ </dependency> <dependency> + <artifactId>nuiton-js-angularjs</artifactId> <groupId>org.nuiton.js</groupId> + </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular-ui-tree</artifactId> </dependency> @@ -245,11 +251,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>angular-ui-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>angular-ui-sortable</artifactId> </dependency> </dependencies> @@ -284,7 +285,7 @@ <goal>parserStruts2</goal> </goals> <configuration> - <acceptKeyFormat>^extranetEncAhi\..*$</acceptKeyFormat> + <acceptKeyFormat>^faxtomail\..*$</acceptKeyFormat> </configuration> </execution> <execution> Added: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties (rev 0) +++ trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-06-06 07:56:32 UTC (rev 140) @@ -0,0 +1,10 @@ + +# dev +disableCache=true +minimize=false +#preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender +#postProcessors=cssVariables + +# prod +#disableCache=false +#minimize=true Property changes on: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-06 07:56:32 UTC (rev 140) @@ -29,21 +29,9 @@ <head> <title>Configuration</title> - <link rel="stylesheet" type="text/css" href="<s:url value='/webjars/select2/3.4.8/select2.css' />" /> - <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js-angular-ui-tree/angular-ui-tree.css' />" /> - <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2_locale_fr.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script> - <script type="text/javascript" src="<s:url value='/nuiton-js-angular-ui-tree/angular-ui-tree.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angular-ui-sortable/0.12.2/sortable.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js' />"></script> + <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail-configuration.css' />" /> + <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail-configuration.js' />"></script> - <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> - <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script> - <script type="text/javascript" src="<s:url value='/js/configuration.js' />"></script> - <script type="text/javascript"> ConfigurationModule.value('ConfigurationData', { // enums Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-06-06 07:56:32 UTC (rev 140) @@ -28,7 +28,6 @@ <html> <head> <title>Import</title> - <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> </head> <body> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-06 07:56:32 UTC (rev 140) @@ -28,7 +28,6 @@ <html> <head> <title>Ldap</title> - <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> </head> <body> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-06 07:56:32 UTC (rev 140) @@ -29,18 +29,9 @@ <head> <title>Dossiers mis en avant par utilisateur</title> - <link rel="stylesheet" type="text/css" href="<s:url value='/webjars/select2/3.4.8/select2.css' />" /> - <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/select2/3.4.8/select2_locale_fr.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.min.js' />"></script> - <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js' />"></script> + <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail-user-folder.css' />" /> + <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail-user-folder.js' />"></script> - <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> - <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script> - <script type="text/javascript" src="<s:url value='/js/user-folder.js' />"></script> - <script type="text/javascript"> UserFolderModule.value('UserFolderData', { 'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>, Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-06-06 07:56:32 UTC (rev 140) @@ -33,6 +33,8 @@ <title>FaxToMail : <decorator:title default="FaxToMail"/></title> <sj:head locale="fr" jqueryui="true" loadAtOnce='true' jquerytheme="start" /> <sb:head /> + <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail.css' />" /> + <script type="text/javascript" src="<s:url value='/nuiton-js/faxtomail.js' />"></script> <decorator:head/> </head> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml 2014-06-06 07:56:32 UTC (rev 140) @@ -22,39 +22,17 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> +<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> - -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - metadata-complete="true"> - <display-name>FaxToMail ${project.version}</display-name> <session-config> <session-timeout>600</session-timeout> </session-config> -  - - <filter> <filter-name>struts-prepare</filter-name> <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class> </filter> @@ -89,10 +67,4 @@ <listener-class>com.franciaflex.faxtomail.web.FaxToMailApplicationListener</listener-class> </listener> -  - </web-app> Added: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml (rev 0) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-06-06 07:56:32 UTC (rev 140) @@ -0,0 +1,50 @@ +<groups xmlns="http://www.isdc.ro/wro"> + + <group name='webjar-select2' abstract="true"> + <css>classpath:META-INF/resources/webjars/select2/3.4.8/select2.css</css> + <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2.js</js> + <js>classpath:META-INF/resources/webjars/select2/3.4.8/select2_locale_fr.js</js> + </group> + + <group name='webjar-angular-ui-sortable' abstract="true"> + <group-ref>angular</group-ref> + <js>classpath:META-INF/resources/webjars/angular-ui-sortable/0.12.2/sortable.min.js</js> + </group> + + <group name='webjar-angular-ui-bootstrap' abstract="true"> +  + <group-ref>angular</group-ref> + <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.js</js> + <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.js</js> + </group> + + <group name='select2sortable' abstract="true"> + <group-ref>angular</group-ref> + <group-ref>webjar-select2</group-ref> + <js>/js/select2sortable.js</js> + </group> + + + + + + <group name='faxtomail'> + <group-ref>angular</group-ref> + <group-ref>webjar-angular-ui-bootstrap</group-ref> + <js>/js/faxtomail.js</js> + </group> + + <group name='faxtomail-configuration'> + <group-ref>select2sortable</group-ref> + <group-ref>webjar-angular-ui-sortable</group-ref> + <group-ref>angular-ui-tree</group-ref> + <js>/js/configuration.js</js> + <css>/css/faxtomail.css</css> + </group> + + <group name='faxtomail-user-folder'> + <group-ref>select2sortable</group-ref> + <js>/js/user-folder.js</js> + <css>/css/faxtomail.css</css> + </group> +</groups> \ No newline at end of file Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-05 16:43:31 UTC (rev 139) +++ trunk/pom.xml 2014-06-06 07:56:32 UTC (rev 140) @@ -514,19 +514,32 @@ <artifactId>activation</artifactId> <version>1.1.1</version> </dependency> - + <dependency> - <groupId>org.webjars</groupId> - <artifactId>angularjs</artifactId> - <version>1.2.16-2</version> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> + <version>1.0.2</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-core</artifactId> + <version>1.7.5</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.webjars</groupId> <artifactId>angular-ui-utils</artifactId> <version>0.1.1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>angularjs</artifactId> + <groupId>org.webjars</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -541,6 +554,12 @@ <artifactId>angular-ui-bootstrap</artifactId> <version>0.11.0-2</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>angularjs</artifactId> + <groupId>org.webjars</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -565,7 +584,14 @@ </dependency> <dependency> + <artifactId>nuiton-js-angularjs</artifactId> <groupId>org.nuiton.js</groupId> + <version>1.2.16-1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular-ui-tree</artifactId> <version>2.1.4-1</version> <scope>runtime</scope>

1 0

Build failed in Jenkins: faxtomail-nightly #42
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/42/changes> Changes: [echatellier] refs #4662: Import des utilisateurs et groupes depuis le serveur LDAP [echatellier] Refactoring des actions et actions contextuelles. [echatellier] Correction d'une erreur sur la gestion des pieces jointes lors de la reception des mails. ------------------------------------------ [...truncated 256 lines...] [INFO] [INFO] --- eugene-maven-plugin:2.9:generate (generate-entities) @ faxtomail-persistence --- [INFO] Process phase [zargo] [INFO] No file generated. [INFO] Process phase [xmi] [INFO] No file generated. [INFO] Process phase [model] WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:438) loadTagValue - Invalid tag value [com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.position.tagvalue.unique] : this tagvalue 'unique' is unknown. [INFO] Process phase [generator] [INFO] Apply generator JavaInterfaceTransformer [INFO] Apply generator TopiaMetaTransformer [INFO] No file generated. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ faxtomail-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ faxtomail-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ faxtomail-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ faxtomail-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ faxtomail-persistence --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ faxtomail-persistence --- [INFO] Loaded <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] Copying faxtomail-persistence-0.1-SNAPSHOT.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] Copying faxtomail-persistence-0.1-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] Copying faxtomail-persistence-0.1-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/target/colle…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ faxtomail-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ faxtomail-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ faxtomail-persistence --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-2:compile [INFO] org.nuiton:nuiton-updater:jar:3.0-alpha-2:compile [INFO] org.nuiton.jaxx:jaxx-application-api:jar:2.8.6:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] com.google.guava:guava:jar:17.0:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] org.swinglabs.swingx:swingx-common:jar:1.6.4:compile [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ faxtomail-persistence --- [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT.pom [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT-sources.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT.pom.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-pe…> to /var/local/forge/data/codelutin.com/maven/repository/com/franciaflex/faxtomail/faxtomail-persistence/0.1-SNAPSHOT/faxtomail-persistence-0.1-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: Service 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-service --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail-service --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-service --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ faxtomail-service --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-service --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-service --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header-on-pom) @ faxtomail-service --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] Scan 1 file header done in 2.322ms. [INFO] All files are up-to-date. [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-service --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-service --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-service --- [INFO] Copying faxtomail-service.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service --- [WARNING] bundle fr_FR contains 6/8 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ faxtomail-service --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] Scan 33 files header done in 55.74ms. [INFO] * uptodate header on 29 files. * add header on 4 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-service --- [INFO] Compiling 24 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ faxtomail-service --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ faxtomail-service --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ faxtomail-service --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-service --- [INFO] Compiling 6 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[151,35] cannot find symbol symbol: method closeContext() location: variable persistenceContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[157,35] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[229,30] cannot find symbol symbol: method closeContext() location: variable openedTransaction of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[239,31] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [INFO] 4 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] FaxToMail ......................................... SUCCESS [ 6.823 s] [INFO] FaxToMail :: Persistence .......................... SUCCESS [ 24.092 s] [INFO] FaxToMail :: Service .............................. FAILURE [ 3.426 s] [INFO] FaxToMail :: Web .................................. SKIPPED [INFO] FaxToMail :: UI ................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 36.413 s [INFO] Finished at: 2014-06-04T01:15:54+01:00 [INFO] Final Memory: 105M/694M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project faxtomail-service: Compilation failure: Compilation failure: [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[151,35] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable persistenceContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[157,35] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[229,30] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable openedTransaction of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/ws/trunk/faxtomail-se…>:[239,31] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project faxtomail-service: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:152) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :faxtomail-service Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com chatellier(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 2

Build failed in Jenkins: faxtomail-nightly » FaxToMail :: Service #42
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> Changes: [echatellier] refs #4662: Import des utilisateurs et groupes depuis le serveur LDAP ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: Service 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-service --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ faxtomail-service --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-service --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ faxtomail-service --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ faxtomail-service --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ faxtomail-service --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header-on-pom) @ faxtomail-service --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Scan 1 file header done in 2.322ms. [INFO] All files are up-to-date. [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-service --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-service --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-service --- [INFO] Copying faxtomail-service.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service --- [WARNING] bundle fr_FR contains 6/8 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ faxtomail-service --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Scan 33 files header done in 55.74ms. [INFO] * uptodate header on 29 files. * add header on 4 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-service --- [INFO] Compiling 24 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ faxtomail-service --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ faxtomail-service --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ faxtomail-service --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-service --- [INFO] Compiling 6 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>:[151,35] cannot find symbol symbol: method closeContext() location: variable persistenceContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>:[157,35] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>:[229,30] cannot find symbol symbol: method closeContext() location: variable openedTransaction of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-nightly/com.franciaflex.faxto…>:[239,31] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [INFO] 4 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 2

Build failed in Jenkins: faxtomail-ci #103
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/103/changes> Changes: [echatellier] Refactoring angularjs. Affichage des groupes ldap dans l'interface ------------------------------------------ [...truncated 29 lines...] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail --- [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ faxtomail --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/target/surefire-w…> [INFO] Executed tasks [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ faxtomail --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: Persistence 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… (2 KB at 9.9 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 9.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (806 B at 32.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… (806 B at 15.7 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… (2 KB at 57.7 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/nui… (2 KB at 55.4 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-persistence --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-persistence --- [INFO] [INFO] --- eugene-maven-plugin:2.9:generate (generate-entities) @ faxtomail-persistence --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 49.2 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… (2 KB at 45.4 KB/sec) [INFO] Process phase [zargo] [INFO] Generate one file in 67.368ms. [INFO] Process phase [xmi] INFO [pool-1-thread-1 for channel] (Resource.java:296) getURLs - search URLs pattern: .*/default-java.xmi in 51 urls in 1.105s [INFO] Generate one file in 2.393s. [INFO] Process phase [model] WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:438) loadTagValue - Invalid tag value [com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.position.tagvalue.unique] : this tagvalue 'unique' is unknown. [INFO] Process phase [generator] [INFO] Apply generator JavaInterfaceTransformer [INFO] Apply generator TopiaMetaTransformer [INFO] Generate 152 files in 372.996ms. [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-persistence --- [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-persistence >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-persistence --- [INFO] Copying faxtomail-persistence.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-persistence <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-persistence --- [WARNING] bundle fr_FR contains 29/45 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 21 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-persistence --- [INFO] Compiling 144 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…> [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ faxtomail-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ faxtomail-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…> [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-persistence --- [INFO] Nothing to compile - all classes are up to date [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ faxtomail-persistence --- [INFO] No tests to run. [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ faxtomail-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-persist…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ faxtomail-persistence --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: Service 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-service --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-service --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-service --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-service --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-service --- [INFO] Copying faxtomail-service.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service --- [WARNING] bundle fr_FR contains 6/8 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-service --- [INFO] Compiling 24 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…> [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ faxtomail-service --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-service --- [INFO] Compiling 6 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[151,35] cannot find symbol symbol: method closeContext() location: variable persistenceContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[157,35] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[229,30] cannot find symbol symbol: method closeContext() location: variable openedTransaction of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[239,31] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [INFO] 4 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] FaxToMail ......................................... SUCCESS [ 3.804 s] [INFO] FaxToMail :: Persistence .......................... SUCCESS [ 22.698 s] [INFO] FaxToMail :: Service .............................. FAILURE [ 2.864 s] [INFO] FaxToMail :: Web .................................. SKIPPED [INFO] FaxToMail :: UI ................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 31.183 s [INFO] Finished at: 2014-06-04T10:25:47+01:00 [INFO] Final Memory: 44M/587M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project faxtomail-service: Compilation failure: Compilation failure: [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[151,35] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable persistenceContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[157,35] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[229,30] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable openedTransaction of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/ws/trunk/faxtomail-service…>:[239,31] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project faxtomail-service: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:152) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :faxtomail-service Sending e-mails to: faxtomail-commits(a)list.forge.codelutin.com chatellier(a)codelutin.com channel stopped

1 9

Build failed in Jenkins: faxtomail-ci » FaxToMail :: Service #103
by admin+ci-codelutin.com＠codelutin.com 05 Jun '14

05 Jun '14

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> Changes: [echatellier] Refactoring angularjs. Affichage des groupes ldap dans l'interface ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: Service 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-service --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-service --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-service --- [INFO] [INFO] --- i18n-maven-plugin:3.1:parserValidation (scan-sources) @ faxtomail-service --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-service --- [INFO] Copying faxtomail-service.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-service --- [WARNING] bundle fr_FR contains 6/8 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-service --- [INFO] Compiling 24 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ faxtomail-service --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ faxtomail-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ faxtomail-service --- [INFO] Compiling 6 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>:[151,35] cannot find symbol symbol: method closeContext() location: variable persistenceContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>:[157,35] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>:[229,30] cannot find symbol symbol: method closeContext() location: variable openedTransaction of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>:[239,31] cannot find symbol symbol: method closeContext() location: variable applicationContext of type com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext [INFO] 4 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 9

r139 - in trunk: faxtomail-persistence/src/main/resources faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/resources/csv faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtom
by kmorin＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: kmorin Date: 2014-06-05 18:43:31 +0200 (Thu, 05 Jun 2014) New Revision: 139 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/139 Log: - am?\195?\169lioration de la vitesse de chargement des ?\195?\169l?\195?\169ments des dossiers + affichage du loading - sauvegarde de la taille des colonnes - taille par d?\195?\169faut des split panel - suppression du dossier i18n dans le r?\195?\169pertoire utlisateur Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java Modified: trunk/faxtomail-persistence/src/main/resources/faxToMail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/resources/faxToMail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-06-05 16:43:31 UTC (rev 139) @@ -35,11 +35,11 @@ #hibernate.connection.password=FX2013! hibernate.hbm2ddl.auto=update -#hibernate.show_sql=false +#hibernate.show_sql=true #hibernate.format_sql=true #hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy hibernate.c3p0.min_size=5 hibernate.c3p0.max_size=20 hibernate.c3p0.timeout=1800 -hibernate.c3p0.max_statements=50 +hibernate.c3p0.max_statements=50 \ No newline at end of file Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-05 16:43:31 UTC (rev 139) @@ -72,6 +72,17 @@ # Email com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.Email.attribute.rangeRow.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.attachment.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.history.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.client.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.demandType.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.demandStatus.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.priority.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.etatAttente.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.emailGroup.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.replies.tagvalue.lazy=false # History com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-05 16:43:31 UTC (rev 139) @@ -202,22 +202,29 @@ Set<String> fieldSet = Sets.newHashSet(modifiedFields); - History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { - @Override - public boolean evaluate(History object) { - return object.getType() == HistoryType.TRANSMISSION_TO_EDI; + if (StringUtils.isNotBlank(email.getMailFolder().getEdiFolder())) { + History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { + @Override + public boolean evaluate(History object) { + return object.getType() == HistoryType.TRANSMISSION_TO_EDI; + } + }); + + // we transmit to EDI if: + // - it has never been transmitted before + // - all the required fields are filled + if (transmissionToEdi == null + && email.getClient() != null + && email.getDemandType() != null + && StringUtils.isNotBlank(email.getProjectReference()) + && (!email.getDemandType().isRangeNeeded() || CollectionUtils.isNotEmpty(email.getRangeRow()))) { + + email.setDemandStatus(DemandStatus.TRANSMITTED_TO_EDI); + transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, + History.PROPERTY_MODIFICATION_DATE, new Date()); + email.addHistory(transmissionToEdi); + fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } - }); - if (transmissionToEdi == null - && email.getClient() != null - && email.getDemandType() != null - && StringUtils.isNotBlank(email.getProjectReference())) { - - email.setDemandStatus(DemandStatus.TRANSMITTED_TO_EDI); - transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, - History.PROPERTY_MODIFICATION_DATE, new Date()); - email.addHistory(transmissionToEdi); - fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } History history; Modified: trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv 2014-06-05 16:43:31 UTC (rev 139) @@ -1,2 +1,2 @@ -protocol;host;user;password -pop3;test.franciaflex.fr;testuser;password +protocol;host;port;user;password +pop3;test.franciaflex.fr;110;testuser;password Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java 2014-06-05 16:43:31 UTC (rev 139) @@ -43,8 +43,7 @@ public <A extends AbstractApplicationAction> A createLogicAction(AbstractApplicationUIHandler handler, Class<A> actionName) { FaxToMailUIContext context = (FaxToMailUIContext) handler.getContext(); - if (AbstractMainUIFaxToMailAction.class.isAssignableFrom(actionName) && - context.getMainUI() != null) { + if (AbstractMainUIFaxToMailAction.class.isAssignableFrom(actionName) && context.getMainUI() != null) { handler = context.getMainUI().getHandler(); } @@ -52,6 +51,7 @@ // create action A result = ConstructorUtils.invokeConstructor(actionName, (AbstractFaxToMailUIHandler) handler); return result; + } catch (Exception e) { throw new ApplicationTechnicalException(t("application.action.create.error", actionName), e); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-05 16:43:31 UTC (rev 139) @@ -359,58 +359,16 @@ })); //--------------------------------------------------------------------// - // init db configuration - //--------------------------------------------------------------------// - -// config.initConfig(getResourceLoader()); - -// // clean db cache (avoid a lots of headache :( -// File cacheDirectory = config.getServiceConfig().getPersistenceConfig().getCacheDirectory(); -// if (cacheDirectory.exists()) { -// // clean cache directory (fix soem headaches...) -// TuttiIOUtil.cleanDirectory( -// cacheDirectory, -// _("tutti.db.deleteCache.error", cacheDirectory)); -// } - - //--------------------------------------------------------------------// // init i18n //--------------------------------------------------------------------// - File i18nDirectory = config.getI18nDirectory(); - if (!config.isFullLaunchMode()) { - i18nDirectory = new File(config.getDataDirectory(), "i18n"); - - if (i18nDirectory.exists()) { - // clean i18n cache - ApplicationIOUtil.cleanDirectory( - i18nDirectory, - t("faxtomail.i18n.deleteCache.error", i18nDirectory)); - } - } - - ApplicationIOUtil.forceMkdir(i18nDirectory, - t("faxtomail.i18n.mkDir.error", i18nDirectory)); - - if (log.isDebugEnabled()) { - log.debug("I18N directory: " + i18nDirectory); - } - Locale i18nLocale = config.getI18nLocale(); if (log.isInfoEnabled()) { - log.info(String.format("Starts i18n with locale [%s] at [%s]", - i18nLocale, i18nDirectory)); + log.info(String.format("Starts i18n with locale [%s]", i18nLocale)); } - try { - I18n.init(new UserI18nInitializer( - i18nDirectory, new DefaultI18nInitializer("faxtomail-i18n")), - i18nLocale); - } catch (RuntimeException ex) { - // strange ide behaviour case (eclipse) - I18n.init(new ClassPathI18nInitializer(), i18nLocale); - } + I18n.init(new ClassPathI18nInitializer(), i18nLocale); // //--------------------------------------------------------------------// // // init help Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-06-05 16:43:31 UTC (rev 139) @@ -0,0 +1,68 @@ +package com.franciaflex.faxtomail.ui.swing.actions; + +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; + +import java.util.ArrayList; +import java.util.List; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class LoadFolderEmailsAction extends AbstractFaxToMailAction<DemandeListUIModel, DemandeListUI, DemandeListUIHandler> { + + private final static Log log = LogFactory.getLog(LoadFolderEmailsAction.class); + + public LoadFolderEmailsAction(DemandeListUIHandler handler) { + super(handler, false); + } + + @Override + public boolean prepareAction() throws Exception { + + DemandeListUIModel model = getModel(); + MailFolder folder = model.getSelectedFolder(); + JXTable dataTable = getUI().getDataTable(); + + setActionDescription(t("faxtomail.action.loadFolderEmails.tip", folder.getName())); + + // change name to save the state of the column width for every folder + // (as every folder can have a different header) + getContext().getSwingSession().updateState(); + String columns = handler.populateColumnModel(dataTable, false); + dataTable.setName("dataTable" + columns); + getContext().getSwingSession().add(dataTable, true); + + return true; + } + + @Override + public void doAction() throws Exception { + DemandeListUIHandler handler = getHandler(); + DemandeListUIModel model = getModel(); + MailFolder folder = model.getSelectedFolder(); + + List<Email> emails = getContext().getEmailService().getEmailForFolder(folder); + log.info(emails.size() + " emails in folder " + folder.getName()); + + List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); + for (Email email : emails) { + DemandeUIModel demand = new DemandeUIModel(); + demand.fromEntity(email, false); + demand.setValid(handler.isDemandeValid(demand)); + demands.add(demand); + } + + model.setEmails(demands); + } +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-06-05 16:43:31 UTC (rev 139) @@ -23,6 +23,10 @@ text: " | "; } +#mainSplitPane { + resizeWeight: 0.2; +} + #navigationTree { font-size: "11"; rootVisible: false; @@ -99,4 +103,5 @@ #archiveMenu { text: "faxtomail.demandeList.action.archive"; toolTipText: "faxtomail.demandeList.action.archive.tip"; + enabled: { model.isArchiveEnabled() }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx 2014-06-05 16:43:31 UTC (rev 139) @@ -66,7 +66,7 @@ onActionPerformed='handler.archive()'/> </JPopupMenu> - <JSplitPane constraints='BorderLayout.CENTER'> + <JSplitPane constraints='BorderLayout.CENTER' id="mainSplitPane"> <JScrollPane> <JTree id="navigationTree" onMouseClicked='handler.autoSelectNodeInTree(event, treePopup)'/> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-05 16:43:31 UTC (rev 139) @@ -36,6 +36,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.actions.ArchiveFromListAction; import com.franciaflex.faxtomail.ui.swing.actions.ComputeQuantitiesByRangeAction; +import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeFromListAction; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; @@ -114,21 +115,10 @@ model.addPropertyChangeListener(DemandeListUIModel.PROPERTY_SELECTED_FOLDER, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - DemandeListUIModel model = (DemandeListUIModel) evt.getSource(); - MailFolder folder = (MailFolder) evt.getNewValue(); - - populateColumnModel(getUI().getDataTable(), false); - - List<Email> emails = getContext().getEmailService().getEmailForFolder(folder); - log.info(emails.size() + " emails in folder " + folder.getName()); - List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); - for (Email email : emails) { - DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntity(email); - demand.setValid(isDemandeValid(demand)); - demands.add(demand); - } - model.setEmails(demands); + LoadFolderEmailsAction loadFolderEmailsAction = + getContext().getActionFactory().createLogicAction(DemandeListUIHandler.this, + LoadFolderEmailsAction.class); + getContext().getActionEngine().runAction(loadFolderEmailsAction); } }); @@ -165,7 +155,6 @@ @Override public void modelChanged(TableModel model) { // do nothing - log.info("modelChanged"); } }; @@ -253,6 +242,7 @@ public void valueChanged(TreeSelectionEvent e) { FolderTreeNode folderNode = (FolderTreeNode) e.getPath().getLastPathComponent(); MailFolder folder = folderNode.getMailFolder(); + getModel().setSelectedFolder(folder); getContext().setCurrentMailFolder(folder); @@ -362,8 +352,10 @@ int selectedRowCount = getUI().getDataTable().getSelectedRowCount(); DemandeListUIModel model = getModel(); - model.setAddAttachmentEnabled(selectedRowCount == 1); - model.setReplyEnabled(selectedRowCount == 1); + //TODO kmorin 20140605 prendre en compte la conf en fonction des états d'attente + model.setReplyEnabled(selectedRowCount == 1 && model.getCurrentEmails().get(0).isEditable()); + model.setArchiveEnabled(selectedRowCount > 1 || + selectedRowCount > 0 && model.getCurrentEmails().get(0).isEditable()); } public void autoSelectNodeInTree(MouseEvent e, JPopupMenu popup) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-05 16:43:31 UTC (rev 139) @@ -45,7 +45,7 @@ public static final String PROPERTY_PF_NB = "pfNb"; public static final String PROPERTY_SAV_NB = "savNb"; public static final String PROPERTY_REPLY_ENABLED = "replyEnabled"; - public static final String PROPERTY_ADD_ATTACHMENT_ENABLED = "addAttachmentEnabled"; + public static final String PROPERTY_ARCHIVE_ENABLED = "archiveEnabled"; protected List<MailFolder> folders; @@ -59,7 +59,7 @@ protected boolean replyEnabled; - protected boolean addAttachmentEnabled; + protected boolean archiveEnabled; protected int quotationNb; @@ -156,14 +156,14 @@ firePropertyChange(PROPERTY_REPLY_ENABLED, oldValue, replyEnabled); } - public boolean isAddAttachmentEnabled() { - return addAttachmentEnabled; + public boolean isArchiveEnabled() { + return archiveEnabled; } - public void setAddAttachmentEnabled(boolean addAttachmentEnabled) { - Object oldValue = isAddAttachmentEnabled(); - this.addAttachmentEnabled = addAttachmentEnabled; - firePropertyChange(PROPERTY_ADD_ATTACHMENT_ENABLED, oldValue, addAttachmentEnabled); + public void setArchiveEnabled(boolean qrchiveEnabled) { + Object oldValue = isArchiveEnabled(); + this.archiveEnabled = archiveEnabled; + firePropertyChange(PROPERTY_ARCHIVE_ENABLED, oldValue, archiveEnabled); } public int getQuotationNb() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-06-05 16:43:31 UTC (rev 139) @@ -275,6 +275,7 @@ #leftVerticalSplitPanel { dividerSize : { model.isRangePanelVisible() ? 10 : 0 }; + resizeWeight: 0.8; } #rangePanel { @@ -329,4 +330,8 @@ #toolbarContainer { rightDecoration: { topToolBar }; +} + +#rightVerticalSplitPanel { + resizeWeight: 0.8; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-05 16:43:31 UTC (rev 139) @@ -365,6 +365,21 @@ } ); + final JSplitPane leftVerticalSplitPanel = getUI().getLeftVerticalSplitPanel(); + model.addPropertyChangeListener(DemandeUIModel.PROPERTY_RANGE_PANEL_VISIBLE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + leftVerticalSplitPanel.setName("leftVerticalSplitPanel" + evt.getNewValue()); + getContext().getSwingSession().add(leftVerticalSplitPanel, true); + if (Boolean.FALSE.equals(evt.getNewValue())) { + leftVerticalSplitPanel.setDividerLocation(leftVerticalSplitPanel.getHeight()); + } + } + }); + + leftVerticalSplitPanel.setName("leftVerticalSplitPanel" + model.isRangePanelVisible()); + getContext().getSwingSession().add(leftVerticalSplitPanel, true); + listModelIsModify(getModel()); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-05 16:43:31 UTC (rev 139) @@ -186,15 +186,34 @@ } + @Override + public void fromEntity(Email entity) { + fromEntity(entity, true); + } + /** * Surcharge pour dupliquer correctement les pieces jointes. - * + * * FIXME echatellier 20140520 c'est pas terrible, mais c'est comme ca :p */ - @Override - public void fromEntity(Email entity) { + public void fromEntity(Email entity, boolean full) { //super.fromEntity(entity); - fromBeanBinder.copyExcluding(entity, this, Email.PROPERTY_ATTACHMENT); + String[] propertiesToIgnore; +// if (full) { + propertiesToIgnore = new String[] { + Email.PROPERTY_ATTACHMENT + }; + +// } else { +// propertiesToIgnore = new String[] { +// Email.PROPERTY_ATTACHMENT, +// Email.PROPERTY_EMAIL_GROUP, +// Email.PROPERTY_REPLIES, +// Email.PROPERTY_MAIL_FOLDER, +// Email.PROPERTY_HISTORY +// }; +// } + fromBeanBinder.copyExcluding(entity, this, propertiesToIgnore); // specific attachment copy Collection<Attachment> attachmentCopy = new ArrayList<Attachment>(); if (entity.getAttachment() != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-05 16:43:31 UTC (rev 139) @@ -109,6 +109,8 @@ JTabbedPane tabPanel = getTabPanel(); if (added) { DemandeUI demandeUI = new DemandeUI(getUI(), demand); + demandeUI.setName("demandPanel" + index); + getContext().getSwingSession().add(demandeUI, true); demand.addPropertyChangeListener(demandEnabledAndValidListener); tabPanel.add(demandeUI); setCustomTab(index, demand); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-06-05 16:43:31 UTC (rev 139) @@ -152,7 +152,7 @@ protected abstract Collection<String> getColumns(); - protected void populateColumnModel(JXTable table, boolean sortable) { + public String populateColumnModel(JXTable table, boolean sortable) { Collection<String> columns = getColumns(); TableColumnModelExt columnModel = new DefaultTableColumnModelExt(); @@ -256,6 +256,8 @@ getEditableTableProperties()); table.setModel(tableModel); table.setColumnModel(columnModel); + + return StringUtils.join(columns, "-"); } protected MouseListener getDataTableMouseListener() { Modified: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml 2014-06-05 16:43:31 UTC (rev 139) @@ -30,11 +30,11 @@ <validators> - <field name="object"> - <field-validator type="requiredstring" short-circuit="true"> - <message>faxtomail.validator.error.email.object.required</message> - </field-validator> - </field> +  +  +  +  +  <field name="clientCode"> <field-validator type="requiredstring" short-circuit="true"> Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-05 15:57:29 UTC (rev 138) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-05 16:43:31 UTC (rev 139) @@ -18,6 +18,7 @@ faxtomail.action.goto.previousScreen.tip=Retourner à l'écran précédent faxtomail.action.goto.search.tip=Aller à l'écran de recherche faxtomail.action.group.tip=Grouper l'élément +faxtomail.action.loadFolderEmails.tip=Chargement des demandes du dossier %s faxtomail.action.reloadFaxToMail=Recharger FaxToMail faxtomail.action.reply.tip=Envoyer la réponse faxtomail.action.save.tip=Enregistrer

1 0

r138 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: echatellier Date: 2014-06-05 17:57:29 +0200 (Thu, 05 Jun 2014) New Revision: 138 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/138 Log: Fix tree saving when adding and deleting nodes Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-05 14:47:30 UTC (rev 137) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-06-05 15:57:29 UTC (rev 138) @@ -60,6 +60,7 @@ com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true # MailFolder +com.franciaflex.faxtomail.persistence.entities.MailFolder.class.tagvalue.naturalIdMutable=true com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.notNull=false com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.name.tagvalue.naturalId=true Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-05 14:47:30 UTC (rev 137) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-05 15:57:29 UTC (rev 138) @@ -35,6 +35,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; @@ -48,6 +49,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; /** * @author kmorin <kmorin(a)codelutin.com> @@ -92,28 +94,37 @@ return new ArrayList<MailFolder>(dao.forTopiaIdIn(ids).findAll()); } - public void saveMailFolders(Collection<MailFolder> mailFolders) { - saveMailFolders(null, mailFolders); + public void saveMailFolders(Collection<MailFolder> newMailFolders) { + // get current folders + MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); + List<MailFolder> mailFolders = dao.findAll(); + Map<String, MailFolder> mailFolderMap = new HashMap<>(Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction())); + + // recursive update + saveMailFolders(dao, mailFolderMap, null, newMailFolders); + + // if map is not empty after recursive iteration, remaining folder must be deleted + dao.deleteAll(mailFolderMap.values()); + getPersistenceContext().commit(); } - protected Collection<MailFolder> saveMailFolders(MailFolder parent, Collection<MailFolder> mailFolders) { + protected Collection<MailFolder> saveMailFolders(MailFolderTopiaDao dao, Map<String, MailFolder> mailFolderMap, + MailFolder parent, Collection<MailFolder> mailFolders) { + + Collection<MailFolder> result = Lists.newArrayList(); if (mailFolders == null) { - return null; + return result; } - Collection<MailFolder> result = Lists.newArrayList(); - MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); - //TopiaIdFactory factory = getPersistenceContext().getTopiaIdFactory(); Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); for (MailFolder mailFolder : mailFolders) { - Collection<MailFolder> children = saveMailFolders(mailFolder, mailFolder.getChildren()); MailFolder currentMailFolder; if (StringUtils.isBlank(mailFolder.getTopiaId()) || mailFolder.getTopiaId().startsWith("new_")) { currentMailFolder = new MailFolderImpl(); } else { - currentMailFolder = dao.findByTopiaId(mailFolder.getTopiaId()); + currentMailFolder = mailFolderMap.remove(mailFolder.getTopiaId()); } binderMailFolder.copyExcluding(mailFolder, currentMailFolder, @@ -123,18 +134,19 @@ MailFolder.PROPERTY_CHILDREN, MailFolder.PROPERTY_PARENT); - currentMailFolder.setChildren(children); currentMailFolder.setParent(parent); - if (mailFolder.isPersisted()) { - currentMailFolder = dao.update(currentMailFolder); - } else { + if (!currentMailFolder.isPersisted()) { currentMailFolder = dao.create(currentMailFolder); } + + Collection<MailFolder> children = saveMailFolders(dao, mailFolderMap, currentMailFolder, mailFolder.getChildren()); + currentMailFolder.setChildren(children); + dao.update(currentMailFolder); + result.add(currentMailFolder); } - - getPersistenceContext().commit(); + return result; }

1 0

r137 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web/action/admin webapp/WEB-INF/content/admin webapp/js
by echatellier＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: echatellier Date: 2014-06-05 16:47:30 +0200 (Thu, 05 Jun 2014) New Revision: 137 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/137 Log: refs #4662: Modification du formuaire des comptes mails Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-05 13:48:35 UTC (rev 136) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-05 14:47:30 UTC (rev 137) @@ -25,6 +25,7 @@ */ import java.lang.reflect.Type; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -35,6 +36,7 @@ import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; +import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FolderAction; @@ -198,4 +200,12 @@ public Map<MailField, String> getMailFields() { return getEnumAsMap(MailField.values()); } + + public Map<EmailProtocol, Integer> getEmailProtocolPorts() { + Map<EmailProtocol, Integer> result = new LinkedHashMap<>(); + for (EmailProtocol protocol : EmailProtocol.values()) { + result.put(protocol, protocol.getDefaultPort()); + } + return result; + } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-05 13:48:35 UTC (rev 136) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-05 14:47:30 UTC (rev 137) @@ -50,6 +50,7 @@ 'mailActions': <s:property value="toJson(mailActions)" escapeHtml="false"/>, 'folderActions': <s:property value="toJson(folderActions)" escapeHtml="false"/>, 'mailFields': <s:property value="toJson(mailFields)" escapeHtml="false"/>, + 'emailProtocolPorts': <s:property value="toJson(emailProtocolPorts)" escapeHtml="false"/>, // datas 'configuration': <s:property value="toJson(configuration)" escapeHtml="false"/>, 'etatAttentes': <s:property value="toJson(etatAttentes)" escapeHtml="false"/>, @@ -421,13 +422,11 @@ </table> <div class="form-inline" ng-form="addAddressForm" role="form"> - <div class="form-group has-feedback" + <div class="form-group" ng-class="{'has-error': addAddressForm.address.$dirty && addAddressForm.address.$invalid, 'has-success': addAddressForm.address.$dirty && addAddressForm.address.$valid}"> <label for="newAddressField" class="control-label">Nouvelle adresse : </label> <input id="newAddressField" class="form-control" name="address" type="email" ng-model="newReplyAddress" placeholder="nom.prenom(a)franciaflex.fr" /> - <span class="glyphicon glyphicon-ok form-control-feedback" ng-if="addAddressForm.address.$dirty && addAddressForm.address.$valid"></span> - <span class="glyphicon glyphicon-remove form-control-feedback" ng-if="addAddressForm.address.$dirty && addAddressForm.address.$invalid"></span> </div> <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> <span class="glyphicon glyphicon-ok"></span> @@ -461,13 +460,11 @@ </table> <div class="form-inline" ng-form="addDomainForm" role="form"> - <div class="form-group has-feedback" + <div class="form-group" ng-class="{'has-error': addDomainForm.domain.$dirty && addDomainForm.domain.$invalid, 'has-success': addDomainForm.domain.$dirty && addDomainForm.domain.$valid}"> <label for="newDomainField" class="control-label">Nouveau domaine : </label> <input id="newDomainField" class="form-control" type="text" name="domain" ng-model="newReplyDomain" placeholder="franciaflex.fr" /> - <span class="glyphicon glyphicon-ok form-control-feedback" ng-if="addDomainForm.domain.$dirty && addDomainForm.domain.$valid"></span> - <span class="glyphicon glyphicon-remove form-control-feedback" ng-if="addDomainForm.domain.$dirty && addDomainForm.domain.$invalid"></span> </div> <a class="btn btn-success btn-xs" ng-click="addReplyDomain()" ng-disabled="!newReplyDomain"> <span class="glyphicon glyphicon-ok"></span> @@ -692,6 +689,7 @@ <tr> <th>Protocole</th> <th>Serveur</th> + <th>Port</th> <th>Utilisateur</th> <th>Mot de passe</th> <th/> @@ -701,6 +699,7 @@ <tr ng-repeat="emailAccount in emailAccounts"> <td>{{emailAccount.protocol}}</td> <td>{{emailAccount.host}}</td> + <td>{{emailAccount.port}}</td> <td>{{emailAccount.login}}</td> <td>{{emailAccount.password}}</td> <td> @@ -711,25 +710,33 @@ </tbody> </table> - <div class="form" role="form"> - <div class="form-group"> - <label>Protocole: - <input type="text" class="form-control" ng-model="newAccount.protocol"></label> + <div class="form row" role="form" ng-form="addEmailAccountForm"> + <div class="form-group col-xs-1"> + <label for="emailAccountProtocol" class="control-label">Protocole:</label> +  + <select id="emailAccountProtocol" ng-model="newAccount.protocol" ng-options="protocol as protocol for (protocol, port) in emailProtocolPorts"></select> </div> - <div class="form-group"> - <label>Serveur: - <input type="text" class="form-control" ng-model="newAccount.host"></label> + <div class="form-group col-xs-4"> + <label for="emailAccountHost" class="control-label">Serveur:</label> + <input id="emailAccountHost" name="newAccountHost" type="text" class="form-control" ng-model="newAccount.host" ng-minlength="1" /> </div> - <div class="form-group"> - <label>Utilisateur: - <input type="text" class="form-control" ng-model="newAccount.login"></label> + <div class="form-group col-xs-1" + ng-class="{'has-error': addEmailAccountForm.newAccountPort.$dirty && addEmailAccountForm.newAccountPort.$invalid, + 'has-success': addEmailAccountForm.newAccountPort.$dirty && addEmailAccountForm.newAccountPort.$valid}"> + <label for="emailAccountPort" class="control-label">Port:</label> + <input id="emailAccountPort" name="newAccountPort" type="text" class="form-control" ng-model="newAccount.port" ng-pattern="/^\d+$/" ng-minlength="1" /> </div> - <div class="form-group"> - <label>Mot de passe: - <input type="text" class="form-control" ng-model="newAccount.password"></label> + <div class="form-group col-xs-2"> + <label for="emailAccountUser" class="control-label">Utilisateur:</label> + <input id="emailAccountUser" type="text" class="form-control" ng-model="newAccount.login"/> </div> - <div class="form-group"> - <button type="button" class="btn btn-success" ng-disabled="!newAccount.protocol || !newAccount.host" ng-click="addEmailAccount()"> + <div class="form-group col-xs-2"> + <label for="emailAccountPassword" class="control-label">Mot de passe:</label> + <input id="emailAccountPassword" type="text" class="form-control" ng-model="newAccount.password"> + </div> + <div class="form-group col-xs-1"> + <br /> + <button type="button" class="btn btn-success" ng-disabled="!newAccount.host || !newAccount.port || addEmailAccountForm.$invalid" ng-click="addEmailAccount()"> <i class="glyphicon glyphicon-plus"></i> Ajouter </button> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-05 13:48:35 UTC (rev 136) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-05 14:47:30 UTC (rev 137) @@ -482,10 +482,12 @@ /** * Email accounts controller. */ -ConfigurationModule.controller('ConfigurationEmailAccountsController', ['$scope', '$http', 'ConfigurationData', - function($scope, $http, ConfigurationData) { +ConfigurationModule.controller('ConfigurationEmailAccountsController', ['$scope', '$window', 'ConfigurationData', + function($scope, $window, ConfigurationData) { //{Array} Email accounts $scope.emailAccounts = ConfigurationData.emailAccounts; + //{Array} Port par défaut des protocols + $scope.emailProtocolPorts = ConfigurationData.emailProtocolPorts; //{Object} New accout empty object $scope.newAccount = {}; @@ -493,10 +495,21 @@ $scope.addEmailAccount = function() { $scope.emailAccounts.push($scope.newAccount); $scope.newAccount = {}; + $scope.addEmailAccountForm.$setPristine(); }; // suppression d'un compte $scope.removeEmailAccount = function(index) { - $scope.emailAccounts.splice(index, 1); + if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce compte email ?")) { + $scope.emailAccounts.splice(index, 1); + } }; + + // selection d'un protocol + $scope.$watch("newAccount.protocol", function(newValue, oldValue) { + // auto remplissage du port par defaut + if (newValue && ((oldValue && $scope.newAccount.port == $scope.emailProtocolPorts[oldValue]) || !$scope.newAccount.port)) { + $scope.newAccount.port = $scope.emailProtocolPorts[newValue]; + } + }); }]);

1 0

r136 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 05 Jun '14

05 Jun '14

Author: echatellier Date: 2014-06-05 15:48:35 +0200 (Thu, 05 Jun 2014) New Revision: 136 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/136 Log: refs #4662: Ajout des domaines de r?\195?\169ponse Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-05 12:42:57 UTC (rev 135) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-05 13:48:35 UTC (rev 136) @@ -248,7 +248,7 @@ <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse0"> - Liste des chargés de clientèle + Généralité </a> </h4> </div> @@ -414,13 +414,65 @@ </a> </td> </tr> + <tr ng-if="!selectedMailFolder.replyAddresses || selectedMailFolder.replyAddresses.length == 0"> + <td colspan="2" class="emptyTable">Aucune adresse définie</td> + </tr> </tbody> </table> - Nouveau : <input type="email" ng-model="newReplyAddress" placeholder="nom.prenom(a)franciaflex.fr" /> - <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> - <span class="glyphicon glyphicon-ok"></span> - </a> + <div class="form-inline" ng-form="addAddressForm" role="form"> + <div class="form-group has-feedback" + ng-class="{'has-error': addAddressForm.address.$dirty && addAddressForm.address.$invalid, + 'has-success': addAddressForm.address.$dirty && addAddressForm.address.$valid}"> + <label for="newAddressField" class="control-label">Nouvelle adresse : </label> + <input id="newAddressField" class="form-control" name="address" type="email" ng-model="newReplyAddress" placeholder="nom.prenom(a)franciaflex.fr" /> + <span class="glyphicon glyphicon-ok form-control-feedback" ng-if="addAddressForm.address.$dirty && addAddressForm.address.$valid"></span> + <span class="glyphicon glyphicon-remove form-control-feedback" ng-if="addAddressForm.address.$dirty && addAddressForm.address.$invalid"></span> + </div> + <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> + <span class="glyphicon glyphicon-ok"></span> + </a> + </div> + + <br /> + + <table class="table table-bordered"> + <thead> + <tr> + <th>Nom de domaine</th> + <th>Action</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="replyDomain in selectedMailFolder.replyDomains track by $index"> + <td> + <span class="glyphicon glyphicon-globe"></span> + {{replyDomain}}</td> + <td> + <a class="pull-right btn btn-danger btn-xs" ng-click="removeReplyDomain($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + </tr> + <tr ng-if="!selectedMailFolder.replyDomains || selectedMailFolder.replyDomains.length == 0"> + <td colspan="2" class="emptyTable">Aucune domaine défini</td> + </tr> + </tbody> + </table> + + <div class="form-inline" ng-form="addDomainForm" role="form"> + <div class="form-group has-feedback" + ng-class="{'has-error': addDomainForm.domain.$dirty && addDomainForm.domain.$invalid, + 'has-success': addDomainForm.domain.$dirty && addDomainForm.domain.$valid}"> + <label for="newDomainField" class="control-label">Nouveau domaine : </label> + <input id="newDomainField" class="form-control" type="text" name="domain" ng-model="newReplyDomain" placeholder="franciaflex.fr" /> + <span class="glyphicon glyphicon-ok form-control-feedback" ng-if="addDomainForm.domain.$dirty && addDomainForm.domain.$valid"></span> + <span class="glyphicon glyphicon-remove form-control-feedback" ng-if="addDomainForm.domain.$dirty && addDomainForm.domain.$invalid"></span> + </div> + <a class="btn btn-success btn-xs" ng-click="addReplyDomain()" ng-disabled="!newReplyDomain"> + <span class="glyphicon glyphicon-ok"></span> + </a> + </div> </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-05 12:42:57 UTC (rev 135) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-05 13:48:35 UTC (rev 136) @@ -35,6 +35,7 @@ <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script> <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script> <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.min.js' />"></script> + <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js' />"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-05 12:42:57 UTC (rev 135) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-05 13:48:35 UTC (rev 136) @@ -234,6 +234,8 @@ $scope.newCustomerResponsible; // {String} add new customer responsible form value $scope.newReplyAddress; + // {String} add new domain form value + $scope.newReplyDomain; // {Array} Colonnes selectionnées pour le dossier courant $scope.folderTableColumns; @@ -286,9 +288,12 @@ if (!$scope.selectedMailFolder.replyAddresses) { $scope.selectedMailFolder.replyAddresses = []; } - if (!$scope.selectedMailFolder.contextActions) { - $scope.selectedMailFolder.contextActions = []; + if (!$scope.selectedMailFolder.replyDomains) { + $scope.selectedMailFolder.replyDomains = []; } + if (!$scope.selectedMailFolder.folderActions) { + $scope.selectedMailFolder.folderActions = []; + } if (!$scope.selectedMailFolder.folderTableColumns) { $scope.selectedMailFolder.folderTableColumns = []; } @@ -343,13 +348,26 @@ $scope.addReplyAddress = function() { $scope.selectedMailFolder.replyAddresses.push($scope.newReplyAddress); delete $scope.newReplyAddress; + $scope.addAddressForm.$setPristine(); }; // remove customer responsible $scope.removeReplyAddress = function(index) { $scope.selectedMailFolder.replyAddresses.splice(index, 1); }; + + // add reply domain + $scope.addReplyDomain = function() { + $scope.selectedMailFolder.replyDomains.push($scope.newReplyDomain); + delete $scope.newReplyDomain; + $scope.addDomainForm.$setPristine(); + }; + // remove customer responsible + $scope.removeReplyDomain = function(index) { + $scope.selectedMailFolder.replyDomains.splice(index, 1); + }; + // add reply address $scope.addWriteRightUser = function() { $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUser);

1 0