April 2014 - Pollen-commits - mailman.cloud.codelutin.com

r3887 - in trunk/pollen-ui-angular/src/main/webapp: . WEB-INF
by tchemit＠users.chorem.org April 29, 2014

April 29, 2014

Author: tchemit Date: 2014-04-29 11:37:51 +0200 (Tue, 29 Apr 2014) New Revision: 3887 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3887 Log: make ui-angular war Added: trunk/pollen-ui-angular/src/main/webapp/WEB-INF/ trunk/pollen-ui-angular/src/main/webapp/WEB-INF/web.xml Added: trunk/pollen-ui-angular/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/pollen-ui-angular/src/main/webapp/WEB-INF/web.xml 2014-04-29 09:37:51 UTC (rev 3887) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="3.0" id="pollen-ui-angular" + 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"> + + <display-name>Pollen UI (Angular)</display-name> +</web-app> \ No newline at end of file Property changes on: trunk/pollen-ui-angular/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r3886 - trunk/pollen-rest-api
by tchemit＠users.chorem.org April 29, 2014

April 29, 2014

Author: tchemit Date: 2014-04-29 11:33:48 +0200 (Tue, 29 Apr 2014) New Revision: 3886 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3886 Log: simplify rest-api starting + add some conf Modified: trunk/pollen-rest-api/README.txt Modified: trunk/pollen-rest-api/README.txt =================================================================== --- trunk/pollen-rest-api/README.txt 2014-04-29 09:33:33 UTC (rev 3885) +++ trunk/pollen-rest-api/README.txt 2014-04-29 09:33:48 UTC (rev 3886) @@ -6,7 +6,7 @@ mvn jetty:run -Une base vierge sera alors créée dans target/dd +Une base vierge sera alors créée dans target/db Les services seront appelables sur http://localhost:8080/pollen-rest-api/v1

1 0

r3885 - in trunk: pollen-rest-api pollen-rest-api/src/main/resources pollen-services pollen-services/src/main/java/org/chorem/pollen/services/config pollen-services/src/main/resources pollen-services/src/main/resources/i18n pollen-ui-angular
by tchemit＠users.chorem.org April 29, 2014

April 29, 2014

Author: tchemit Date: 2014-04-29 11:33:33 +0200 (Tue, 29 Apr 2014) New Revision: 3885 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3885 Log: simplify rest-api starting + add some conf Added: trunk/pollen-rest-api/src/main/resources/log4j.properties trunk/pollen-rest-api/src/main/resources/pollen-rest-api.properties trunk/pollen-services/src/main/resources/i18n/ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties Modified: trunk/pollen-rest-api/README.txt trunk/pollen-rest-api/pom.xml trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java trunk/pollen-ui-angular/pom.xml Modified: trunk/pollen-rest-api/README.txt =================================================================== --- trunk/pollen-rest-api/README.txt 2014-04-29 08:47:41 UTC (rev 3884) +++ trunk/pollen-rest-api/README.txt 2014-04-29 09:33:33 UTC (rev 3885) @@ -1,8 +1,15 @@ -Pour tester les services, lancer mvn tomcat7:run -Ptest +Pour lancer les services, lancer -Une base vierge sera alors créée dans target/pollen +mvn tomcat7:run -Les services seront appelables sur http://localhost:8080/pollen/v1 +ou -Exemple : http://localhost:8080/pollen/v1/polls retourne la liste des -sondages. \ No newline at end of file +mvn jetty:run + +Une base vierge sera alors créée dans target/dd + +Les services seront appelables sur http://localhost:8080/pollen-rest-api/v1 + +Exemple : + +http://localhost:8080/pollen-rest-api/v1/users retourne la liste des utilisateurs. \ No newline at end of file Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2014-04-29 08:47:41 UTC (rev 3884) +++ trunk/pollen-rest-api/pom.xml 2014-04-29 09:33:33 UTC (rev 3885) @@ -133,9 +133,11 @@ <i18n.silent>true</i18n.silent> <i18n.bundleOutputName>${pollenI18nBundle}</i18n.bundleOutputName> - <defaultWebContextPath>pollen</defaultWebContextPath> + <defaultWebContextPath>pollen-rest-api</defaultWebContextPath> <defaultLogDir>${basedir}/target</defaultLogDir> <defaultDbDir>${basedir}/target</defaultDbDir> + + <deployFiles>target/${project.build.finalName}.war</deployFiles> </properties> <build> <resources> @@ -143,6 +145,7 @@ <directory>src/main/resources</directory> <includes> <include>**/mapping</include> + <include>**/*.properties</include> </includes> <filtering>true</filtering> </resource> @@ -166,7 +169,7 @@ <value>${defaultLogDir}</value> </systemProperty> <systemProperty> - <name>testDirectory</name> + <name>pollen.data.directory</name> <value>${defaultDbDir}</value> </systemProperty> </systemProperties> @@ -179,7 +182,7 @@ <configuration> <path>/${defaultWebContextPath}</path> <systemProperties> - <testDirectory>${defaultDbDir}</testDirectory> + <pollen.data.directory>${defaultDbDir}</pollen.data.directory> <pollen.log.dir>${defaultLogDir}</pollen.log.dir> </systemProperties> <uriEncoding>UTF-8</uriEncoding> @@ -204,21 +207,15 @@ </build> <profiles> - <profile> - <id>test</id> - <build> - <resources> - <resource> - <directory>src/test/resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </build> + <profile> +  + <id>deploy-rest-api</id> + <properties> + <deployFiles>target/${project.build.finalName}.war</deployFiles> + </properties> </profile> + </profiles> </project> Copied: trunk/pollen-rest-api/src/main/resources/log4j.properties (from rev 3879, trunk/pollen-rest-api/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-rest-api/src/main/resources/log4j.properties (rev 0) +++ trunk/pollen-rest-api/src/main/resources/log4j.properties 2014-04-29 09:33:33 UTC (rev 3885) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: Rest Api +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2013 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +log4j.rootCategory=WARN, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{hh:mm:ss} %5p (%F:%L) %m%n + +log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.debux=INFO Added: trunk/pollen-rest-api/src/main/resources/pollen-rest-api.properties =================================================================== --- trunk/pollen-rest-api/src/main/resources/pollen-rest-api.properties (rev 0) +++ trunk/pollen-rest-api/src/main/resources/pollen-rest-api.properties 2014-04-29 09:33:33 UTC (rev 3885) @@ -0,0 +1,6 @@ +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.url=jdbc:h2:file:${pollen.data.directory}/db/pollen-rest-api +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.hbm2ddl.auto=update Property changes on: trunk/pollen-rest-api/src/main/resources/pollen-rest-api.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2014-04-29 08:47:41 UTC (rev 3884) +++ trunk/pollen-services/pom.xml 2014-04-29 09:33:33 UTC (rev 3885) @@ -130,4 +130,21 @@ </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-04-29 08:47:41 UTC (rev 3884) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-04-29 09:33:33 UTC (rev 3885) @@ -66,24 +66,29 @@ throw new PollenTechnicalException(e); } if (log.isInfoEnabled()) { - StringBuilder builder = new StringBuilder("Filename: "+filename); + StringBuilder builder = new StringBuilder("Pollen configuration:"); + builder.append("\nFilename: ").append(filename); List<PollenServiceConfigOption> options = Lists.newArrayList(PollenServiceConfigOption.values()); for (PollenServiceConfigOption option : options) { builder.append(String.format("\n%1$-40s = %2$s", option.getKey(), applicationConfig.getOption(option))); } - log.info("Pollen configuration:" + builder.toString()); + log.info( builder.toString()); } } public Map<String, String> getTopiaProperties() { - Map<String, String> jpaParameters = Maps.newHashMap(); - Properties hibernateProperties = applicationConfig.getOptionStartsWith("hibernate"); - jpaParameters.putAll((Map) hibernateProperties); - Properties topiaProperties = applicationConfig.getOptionStartsWith("topia"); - jpaParameters.putAll((Map) topiaProperties); - return jpaParameters; + Map<String, String> topiaParameters = Maps.newHashMap(); + Properties properties = applicationConfig.getOptionStartsWith("hibernate"); + properties.putAll(applicationConfig.getOptionStartsWith("topia")); + + for (Object o : properties.keySet()) { + String key = String.valueOf(o); + String value = applicationConfig.getOption(String.class, key); + topiaParameters.put(key, value); + } + return topiaParameters; } public boolean isLogConfigurationProvided() { @@ -92,6 +97,10 @@ return logConfigurationProvided; } + public File getDataDirectory() { + return applicationConfig.getOptionAsFile(PollenServiceConfigOption.DATA_DIRECTORY.key); + } + public File getLogConfigurationFile() { return applicationConfig.getOptionAsFile(PollenServiceConfigOption.LOG_CONFIGURATION_FILE.key); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-04-29 08:47:41 UTC (rev 3884) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-04-29 09:33:33 UTC (rev 3885) @@ -28,6 +28,8 @@ import org.chorem.pollen.persistence.entity.VoteVisibility; import org.nuiton.config.ConfigOptionDef; +import java.io.File; + import static org.nuiton.i18n.I18n.n; @@ -40,6 +42,16 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { /** + * Where to stroe any data for pollen application. + * + * @since 2.0 + */ + DATA_DIRECTORY( + "pollen.data.directory", + n("pollen.configuration.data.directory"), + "${java.io.tmpdir}/pollen", + File.class), + /** * Default poll type to use at a new poll creation. * * @since 2.0 Added: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties (rev 0) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2014-04-29 09:33:33 UTC (rev 3885) @@ -0,0 +1,11 @@ +pollen.configuration.data.directory= +pollen.configuration.defaultPollCommentVisibility= +pollen.configuration.defaultPollType= +pollen.configuration.defaultPollVoteVisibility= +pollen.configuration.defaultVoteCountingType= +pollen.error.favoriteList.import.csv.already.used.email= +pollen.error.favoriteList.import.csv.already.used.name= +pollen.error.favoriteList.import.csv.invalid.email= +pollen.error.favoriteList.import.ldap.already.used.email= +pollen.error.favoriteList.import.ldap.already.used.name= +pollen.error.favoriteList.import.ldap.invalid.email= Property changes on: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties (rev 0) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2014-04-29 09:33:33 UTC (rev 3885) @@ -0,0 +1,11 @@ +pollen.configuration.data.directory= +pollen.configuration.defaultPollCommentVisibility= +pollen.configuration.defaultPollType= +pollen.configuration.defaultPollVoteVisibility= +pollen.configuration.defaultVoteCountingType= +pollen.error.favoriteList.import.csv.already.used.email= +pollen.error.favoriteList.import.csv.already.used.name= +pollen.error.favoriteList.import.csv.invalid.email= +pollen.error.favoriteList.import.ldap.already.used.email= +pollen.error.favoriteList.import.ldap.already.used.name= +pollen.error.favoriteList.import.ldap.invalid.email= Property changes on: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-ui-angular/pom.xml =================================================================== --- trunk/pollen-ui-angular/pom.xml 2014-04-29 08:47:41 UTC (rev 3884) +++ trunk/pollen-ui-angular/pom.xml 2014-04-29 09:33:33 UTC (rev 3885) @@ -14,7 +14,7 @@ <groupId>org.chorem.pollen</groupId> <artifactId>pollen-ui-angular</artifactId> - <packaging>pom</packaging> + <packaging>war</packaging> <properties> @@ -86,4 +86,15 @@ </plugins> </build> + <profiles> + + <profile> +  + <id>deploy-ui-angular</id> + <properties> + <deployFiles>target/${project.build.finalName}.war</deployFiles> + </properties> + </profile> + + </profiles> </project>

1 0

r3884 - in trunk: pollen-persistence/src/main/resources pollen-rest-api/src/main/java/org/chorem/pollen/rest/api pollen-rest-api/src/test/java/org/chorem/pollen/rest/api pollen-services/src/main/java/org/chorem/pollen/services/config pollen-services/src/test/java/org/chorem/pollen/service
by tchemit＠users.chorem.org April 29, 2014

April 29, 2014

Author: tchemit Date: 2014-04-29 10:47:41 +0200 (Tue, 29 Apr 2014) New Revision: 3884 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3884 Log: use specific configuration files (pollen-services.properties, pollen-rest-api.properties to avoid any collision with existing config) Removed: trunk/pollen-persistence/src/main/resources/META-INF/ Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -75,7 +75,7 @@ protected PollenServiceConfig applicationConfig; public static PollenRestApiApplicationContext newApplicationContext() { - PollenServiceConfig applicationConfig = new PollenServiceConfig(); + PollenServiceConfig applicationConfig = new PollenServiceConfig("pollen-rest-api.properties"); PollenTopiaApplicationContext pollenTopiaApplicationContext = new PollenTopiaApplicationContext(applicationConfig.getTopiaProperties()); PollenRestApiApplicationContext result = new PollenRestApiApplicationContext(applicationConfig, pollenTopiaApplicationContext); return result; Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -51,7 +51,7 @@ @Before public void launchServer() throws Exception { - PollenRestApiApplicationContext applicationContext = FakePollenRestApiApplicationContext.newApplicationContext(); + PollenRestApiApplicationContext applicationContext = FakePollenRestApiApplicationContext.newFakeApplicationContext(); applicationContext.init(); PollenRestApiApplicationContext.setApplicationContext(applicationContext); Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -52,8 +52,8 @@ protected List<PollenTopiaPersistenceContext> openedTransactions = new LinkedList<>(); - public static PollenRestApiApplicationContext newApplicationContext() { - PollenServiceConfig applicationConfig = new PollenServiceConfig(); + public static PollenRestApiApplicationContext newFakeApplicationContext() { + PollenServiceConfig applicationConfig = new PollenServiceConfig("pollen-rest-api.properties"); PollenTopiaApplicationContext pollenTopiaApplicationContext = newTopiaApplicationContext(applicationConfig, UUID.randomUUID().toString()); PollenRestApiApplicationContext result = new FakePollenRestApiApplicationContext(applicationConfig, pollenTopiaApplicationContext); return result; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -53,16 +53,20 @@ protected ApplicationConfig applicationConfig; public PollenServiceConfig() { + this("pollen.properties"); + } + + public PollenServiceConfig(String filename) { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(PollenServiceConfigOption.values()); - applicationConfig.setConfigFileName("pollen.properties"); + applicationConfig.setConfigFileName(filename); try { applicationConfig.parse(); } catch (ArgumentsParserException e) { throw new PollenTechnicalException(e); } if (log.isInfoEnabled()) { - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new StringBuilder("Filename: "+filename); List<PollenServiceConfigOption> options = Lists.newArrayList(PollenServiceConfigOption.values()); for (PollenServiceConfigOption option : options) { builder.append(String.format("\n%1$-40s = %2$s", Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java 2014-04-28 15:39:15 UTC (rev 3883) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/service/AbstractPollenServiceTest.java 2014-04-29 08:47:41 UTC (rev 3884) @@ -118,13 +118,13 @@ log.debug("jdbc url is\n" + jdbcUrl); } - PollenTopiaApplicationContext applicationContext = new PollenTopiaApplicationContext(hibernateH2Config); + PollenTopiaApplicationContext topiaApplicationContext = new PollenTopiaApplicationContext(hibernateH2Config); if (log.isTraceEnabled()) { - log.trace("created root context " + applicationContext); + log.trace("created root context " + topiaApplicationContext); } - return applicationContext; + return topiaApplicationContext; } protected PollenTopiaApplicationContext getApplicationContext() { @@ -159,7 +159,7 @@ if (applicationConfig == null) { - applicationConfig = new PollenServiceConfig(); + applicationConfig = new PollenServiceConfig("pollen-services.properties"); } return applicationConfig;

1 0

r3883 - in trunk/pollen-ui-angular/src/main/webapp: . css js js/controllers partials
by garandel＠users.chorem.org April 28, 2014

April 28, 2014

Author: garandel Date: 2014-04-28 17:39:15 +0200 (Mon, 28 Apr 2014) New Revision: 3883 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3883 Log: d?\195?\169sactivation de certain modification apres le 1er vote Modified: trunk/pollen-ui-angular/src/main/webapp/css/style.css trunk/pollen-ui-angular/src/main/webapp/index.html trunk/pollen-ui-angular/src/main/webapp/js/app.js trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html trunk/pollen-ui-angular/src/main/webapp/partials/poll.html Modified: trunk/pollen-ui-angular/src/main/webapp/css/style.css =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/css/style.css 2014-04-28 09:56:29 UTC (rev 3882) +++ trunk/pollen-ui-angular/src/main/webapp/css/style.css 2014-04-28 15:39:15 UTC (rev 3883) @@ -133,12 +133,14 @@ margin:auto; margin-bottom:8px; } -#poll tr, #poll tr td { - border-collapse: collapse; + +#poll tr td > .btn-large { + height:60px; + width:80px; } + .pollChoice { - height:60px; min-width:150px; padding-left:5px; padding-right:5px; @@ -146,10 +148,9 @@ padding-bottom:5px; border: 1px dashed #AAAAAA; text-align:center; - padding-left:5px; - padding-right:5px; -} -.pollChoice input[type=text]{ + } +. +pollChoice input[type=text]{ height:25px; width:140px; } Modified: trunk/pollen-ui-angular/src/main/webapp/index.html =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/index.html 2014-04-28 09:56:29 UTC (rev 3882) +++ trunk/pollen-ui-angular/src/main/webapp/index.html 2014-04-28 15:39:15 UTC (rev 3883) @@ -32,7 +32,6 @@ <script src="js/app.js"></script> <script src="js/controllers/pollCtrl.js"></script> - <script src="js/services.js"></script> </head> <body> Modified: trunk/pollen-ui-angular/src/main/webapp/js/app.js =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/js/app.js 2014-04-28 09:56:29 UTC (rev 3882) +++ trunk/pollen-ui-angular/src/main/webapp/js/app.js 2014-04-28 15:39:15 UTC (rev 3883) @@ -18,19 +18,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ["ngRoute", "pollenControllers", "pollenServices", 'ui.bootstrap']) +angular.module('pollen', ["ngRoute", "pollControllers", 'ui.bootstrap']) .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: 'partials/home.html', controller: "HomeCtrl"}) - .when('/poll/create', {templateUrl: 'partials/poll.html', controller: "PollCreateCtrl"}) + .when('/poll/create', {templateUrl: 'partials/poll.html', controller: "PollAdminCtrl"}) + .when('/poll/edit/:pollId', {templateUrl: 'partials/poll.html', controller:"PollAdminCtrl"}) .when('/poll/vote', {templateUrl: 'partials/poll.html', controller :"PollVoteCtrl"}) + .when('/poll/list', {templateUrl: 'partials/poll-list.html', controller :"PollListCtrl"}) .otherwise({redirectTo: '/'}); -}]).config(['$httpProvider', function($httpProvider) { - - $httpProvider.defaults.useXDomain = true; - delete $httpProvider.defaults.headers.common['X-Requested-With']; }]) + .directive('focusMe', function($timeout) { return { link: function($scope, element, attrs) { @@ -51,10 +50,10 @@ restrict:'A', link: function ($scope, element, attrs) { element.bind('click', function () { - if ($scope.gvar.editMode) { + if ($scope.globalVariables.editMode) { $scope.$apply(function () { $scope[attrs.editMe] = true; - $scope.gvar.saved = false; + $scope.globalVariables.saved = false; }); } }); Modified: trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-04-28 09:56:29 UTC (rev 3882) +++ trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-04-28 15:39:15 UTC (rev 3883) @@ -18,15 +18,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollenControllers', []).controller('HomeCtrl', ['$scope', '$http', function ($scope, $http) { +angular.module('pollControllers', []).controller('HomeCtrl', ['$scope', '$rootScope', function ($scope, $rootScope) { }]) .controller('PollCtrl', ['$scope', '$sce', '$timeout', 'pollStorage', function ($scope, $sce, $timeout, pollStorage) { - $scope.gvar = {saved:false}; - $scope.$watch('gvar.saved', function() { + $scope.globalVariables = {saved:false}; + $scope.$watch('globalVariables.saved', function() { $timeout(function () { - $scope.gvar.saved = false; + $scope.globalVariables.saved = false; }, 5000); }); @@ -35,130 +35,161 @@ $scope.toHTML = function (data) { return $sce.trustAsHtml(data); } - }]) -.controller('PollCreateCtrl', ['$scope', '$controller', '$modal', '$filter', '$timeout', 'pollStorage', function ($scope, $controller, $modal, $filter, $timeout, pollStorage) { + +.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$filter', '$timeout', 'pollStorage', function ($scope, $controller, $modal, $filter, $timeout, pollStorage) { $controller('PollCtrl', {$scope:$scope}); - function initPoll() { - return { - title :'', - description : '', - choices : [] - }; - } + var initPoll = function () { + return { + title :'', + description : '', + choices : [] + }; + } - function initChoice() { - return { - name: '', - type: 'text' - }; - } + var initChoice = function () { + return { + name: '', + type: $scope.globalVariables.lastType + }; + } - $scope.gvar.editMode = true; + $scope.globalVariables.editMode = true; + $scope.globalVariables.voted = angular.isDefined($scope.poll.votants); + $scope.globalVariables.lastType = 'text'; - if (JSON.stringify($scope.poll) == "{}") { - $scope.poll = initPoll(); - } + $scope.$watch('pollForm.$valid', function (newVal) { + $scope.formValid = newVal; + $scope.globalVariables.errorForm = false; + }); - $scope.voteChoices = $scope.poll.choices; + if (!angular.isDefined($scope.poll.choices)) { + $scope.poll = initPoll(); + } + $scope.voteChoices = $scope.poll.choices; - $scope.addChoice = function () { - var index = $scope.poll.choices.push(initChoice()); - var choice = $scope.poll.choices[index-1]; - popupChoice(choice, 'Add Choice'); + $scope.addChoice = function () { + var index = $scope.poll.choices.push(initChoice()); + var choice = $scope.poll.choices[index-1]; + popupChoice(choice, 'Add Choice'); + } - } + $scope.editChoice = function (choice) { + popupChoice(choice, 'Edit Choice'); + } - $scope.editChoice = function (choice) { - popupChoice(choice, 'Edit Choice'); + var deleteChoice = function (ch) { + var index = $scope.poll.choices.indexOf(ch); + if (index > -1) { + $scope.poll.choices.splice(index,1); } + } - var deleteChoice = function (ch) { - var index = $scope.poll.choices.indexOf(ch); - if (index > -1) { - $scope.poll.choices.splice(index,1); - } - } - var popupChoice = function (choice, title) { - var modalInstance = $modal.open({ - templateUrl : 'partials/poll-popupChoice.html', - controller : PollPopChoiceCtrl, - resolve : { - title : function () { return title;}, - choice : function () { return choice; } - } - }); + var popupChoice = function (choice, title) { + var modalInstance = $modal.open({ + templateUrl : 'partials/poll-popupChoice.html', + controller : PollPopChoiceCtrl, + resolve : { + title : function () { return title;}, + choice : function () { return choice; } + } + }); - modalInstance.result.then(function (ch) { - deleteChoice(ch); - }); - } + modalInstance.result.then(function (ch) { + deleteChoice(ch); + }, function () { + $scope.globalVariables.lastType = choice.type; + }); + } - $scope.save = function () { - pollStorage.put($scope.poll); - $scope.gvar.saved = true; + $scope.save = function () { + if ($scope.formValid) { + pollStorage.put($scope.poll); + $scope.globalVariables.saved = true; } - - $scope.reset = function () { - $scope.poll = initPoll(); - $scope.voteChoices = $scope.poll.choices; - pollStorage.put({}); + else { + $scope.globalVariables.errorForm = true; } - var PollPopChoiceCtrl = function ($scope, $filter, $modalInstance, title, choice) { - $scope.title = title; - $scope.choice = choice; - var oldChoice = angular.copy(choice); + } - $scope.saveChoice = function () { - $modalInstance.close(); - } + $scope.reset = function () { + $scope.poll = initPoll(); + $scope.voteChoices = $scope.poll.choices; + pollStorage.put({}); + } - $scope.cancelChoice = function () { - angular.copy(oldChoice, $scope.choice); - $modalInstance.close(); - } + $scope.delete = function () { + $scope.poll = initPoll(); + $scope.voteChoices = $scope.poll.choices; + pollStorage.put({}); + } - $scope.deleteChoice = function (ch) { - $modalInstance.close(ch); - } + var PollPopChoiceCtrl = function ($scope, $filter, $modalInstance, title, choice) { + $scope.title = title; + $scope.choice = choice; + var oldChoice = angular.copy(choice); + + $scope.saveChoice = function () { + $modalInstance.dismiss(); } + + $scope.cancelChoice = function () { + angular.copy(oldChoice, $scope.choice); + $modalInstance.dismiss(); + } + + $scope.deleteChoice = function (ch) { + $modalInstance.close(ch); + } + + } }]) .controller('PollVoteCtrl', ['$scope', '$filter', '$controller', 'pollStorage', function ($scope, $filter, $controller, pollStorage) { $controller('PollCtrl', {$scope:$scope}); - $scope.gvar.editMode = false; + $scope.globalVariables.editMode = false; - var initVote = function () { - $scope.voteName = ""; - $scope.voteChoices = []; - for (var i = 0; i < $scope.poll.choices.length; ++i) { - if ($scope.poll.choices[i].type == 'text') { - $scope.voteChoices.push({name:$scope.poll.choices[i].name, value:false}); - } - else if ($scope.poll.choices[i].type == 'date') { - $scope.voteChoices.push({name: $filter('date')($scope.poll.choices[i].date,'dd/MM/yyyy') , value:false}); - } + var initVote = function () { + $scope.voteName = ""; + $scope.voteChoices = []; + for (var i = 0; i < $scope.poll.choices.length; ++i) { + if ($scope.poll.choices[i].type == 'text') { + $scope.voteChoices.push({name:$scope.poll.choices[i].name, value:false}); } + else if ($scope.poll.choices[i].type == 'date') { + $scope.voteChoices.push({name: $scope.poll.choices[i].date , value:false}); + } } - initVote(); + } + initVote(); - $scope.vote = function () { - var data = {}; - data.name = $scope.voteName; - data.choices = angular.copy($scope.voteChoices); - if (!angular.isDefined($scope.poll.votants)) { - $scope.poll.votants = []; - } - $scope.poll.votants.push(data); - pollStorage.put($scope.poll); - $scope.gvar.saved = true; - initVote(); + $scope.vote = function () { + if ($scope.voteName != '') { + var data = {}; + data.name = $scope.voteName; + data.choices = angular.copy($scope.voteChoices); + if (!angular.isDefined($scope.poll.votants)) { + $scope.poll.votants = []; + } + $scope.poll.votants.push(data); + pollStorage.put($scope.poll); + $scope.globalVariables.saved = true; + initVote(); } + else { + $scope.globalVariables.errorForm = true; + } + } }]) + +.controller('PollListCtrl', ['$scope', 'pollStorage', function ($scope, pollStorage) { + +}]) + ; \ No newline at end of file Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html 2014-04-28 09:56:29 UTC (rev 3882) +++ trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html 2014-04-28 15:39:15 UTC (rev 3883) @@ -1,7 +1,6 @@ <form class="form-horizontal"> <div class="modal-header"> <h4 class="modal-title">{{title}}</h4> - {{oldChoice}} </div> <div class="modal-body"> Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll.html =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/partials/poll.html 2014-04-28 09:56:29 UTC (rev 3882) +++ trunk/pollen-ui-angular/src/main/webapp/partials/poll.html 2014-04-28 15:39:15 UTC (rev 3883) @@ -20,14 +20,18 @@ ~ #L% ~ --> -<form class="form-inline"> - <alert type="'success'" ng-if="gvar.editMode && gvar.saved"> Sondage sauvegardé..</alert> - <alert type="'success'" ng-if="!gvar.editMode && gvar.saved"> Vote effectué.. </alert> +<form class="form-inline" name="pollForm" novalidate> + <alert type="'danger'" ng-if="globalVariables.errorForm"> Champ non remplie </alert> + <alert type="'success'" ng-if="globalVariables.editMode && globalVariables.saved"> Sondage sauvegardé..</alert> + <alert type="'success'" ng-if="!globalVariables.editMode && globalVariables.saved"> Vote effectué.. </alert> + + <alert type="'warning'" ng-if="globalVariables.voted"> Les votes ont commencé, certaine modification sont inaccessible.. </alert> + <div class="pollTitle pollAnim" edit-me="showEditTitle"> <h1 ng-hide="showEditTitle"> {{poll.title || 'Click Me for Editing'}} </h1> - <h1 ng-show="showEditTitle"><input type="text" class="form-control" focus-me="showEditTitle" ng-model="poll.title" ng-exit="showEditTitle = false"/></h1> + <h1 ng-show="showEditTitle"><input type="text" class="form-control" focus-me="showEditTitle" ng-model="poll.title" ng-exit="showEditTitle = false" required/></h1> </div> <div ng-hide="showEditDesc" class="pollDesc pollAnim" edit-me="showEditDesc"> @@ -44,23 +48,23 @@ <table> <tr> <td class="pollChoice"></td> - <td ng-repeat="choice in poll.choices" class="pollChoice pollAnim" edit-me="showEdit" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> - <div ng-show="choice.type == 'text'"> - <div ng-hide="showEdit" class="fixe-input" title="{{choice.description}}">{{choice.name}} <input type="button" class="btn btn-default" ng-if="gvar.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> - <div ng-show="showEdit"> - <input type="text" class="form-control" ng-model="choice.name" focus-me="showEdit" ng-exit="showEdit = false"/> + <td ng-repeat="choice in poll.choices" class="pollChoice pollAnim" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> + <div ng-if="choice.type == 'text'" edit-me="showEdit" > + <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}">{{choice.name}} <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> + <div ng-show="showEdit && !globalVariables.voted"> + <input type="text" class="form-control" ng-model="choice.name" focus-me="showEdit" ng-exit="showEdit = false" required/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </div> - <div ng-show="choice.type == 'date'"> - <div ng-hide="showEdit || isOpen" class="fixe-input" title="{{choice.description}}">{{choice.date | date:'dd/MM/yyyy'}} <input type="button" class="btn btn-default" ng-if="gvar.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> - <div ng-show="showEdit || isOpen" > - <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="dd/MM/yyyy" is-open="isOpen" ng-exit="showEdit = false" /> + <div ng-if="choice.type == 'date'" edit-me="showEdit" > + <div ng-hide="!globalVariables.voted && showEdit || isOpen" class="fixe-input" title="{{choice.description}}">{{choice.date | date:'dd/MM/yyyy'}} <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> + <div ng-show="!globalVariables.voted && showEdit || isOpen" > + <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="dd/MM/yyyy" is-open="isOpen" ng-exit="showEdit = false" required/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </div> </td> - <td ng-if="gvar.editMode"><input type="button" class="btn btn-default" value="+" ng-click="addChoice()"/></td> + <td ng-if="!globalVariables.voted && globalVariables.editMode"><input type="button" class="btn btn-default btn-large" value="+" ng-click="addChoice()"/></td> </tr> <tr> @@ -68,7 +72,9 @@ <td ng-repeat="choice in voteChoices" class="pollChoice"> <input type="checkbox" name="{{choice.name}}" ng-model="choice.value"/> </td> - <td></td> + <td> + <input class="btn btn-primary btn-large" type="button" value="Vote" ng-click="vote()" /> + </td> </tr> <tr ng-repeat="vote in poll.votants track by $index" class="pollAnim"> @@ -79,15 +85,13 @@ </tr> </table> - <div ng-if="gvar.editMode"> - <input class="btn btn-primary" type="button" value="Save" ng-click="save()"/> - <br/><br/><br/> - <input type="button" value="reset" ng-click="reset();"/> + <div ng-if="globalVariables.editMode"> + <button class="btn btn-primary" ng-click="save()">Save</button> + <button class="btn btn-warning" ng-click="reset();" ng-if="!globalVariables.voted">Reset</button> + <button class="btn btn-danger" ng-click="delete();">Delete</button> </div> - <div ng-if="!gvar.editMode"> - <input class="btn btn-primary" type="button" value="Vote" ng-click="vote()" /> - </div> + </div> </form>

1 0

r3882 - in trunk/pollen-ui-angular/src/main/webapp: css js/controllers partials
by garandel＠users.chorem.org April 28, 2014

April 28, 2014

Author: garandel Date: 2014-04-28 11:56:29 +0200 (Mon, 28 Apr 2014) New Revision: 3882 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3882 Log: add gobal poll controller. Added: trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html Modified: trunk/pollen-ui-angular/src/main/webapp/css/style.css trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js trunk/pollen-ui-angular/src/main/webapp/partials/poll.html Modified: trunk/pollen-ui-angular/src/main/webapp/css/style.css =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/css/style.css 2014-04-27 17:12:24 UTC (rev 3881) +++ trunk/pollen-ui-angular/src/main/webapp/css/style.css 2014-04-28 09:56:29 UTC (rev 3882) @@ -164,4 +164,9 @@ right: 30px; top:10px; pointer-events: none; +} + +.fixe-input .ng-hide { + display:inline-block !important; + visibility:hidden; } \ No newline at end of file Modified: trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-04-27 17:12:24 UTC (rev 3881) +++ trunk/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js 2014-04-28 09:56:29 UTC (rev 3882) @@ -21,7 +21,26 @@ angular.module('pollenControllers', []).controller('HomeCtrl', ['$scope', '$http', function ($scope, $http) { }]) -.controller('PollCreateCtrl', ['$scope', '$http', '$sce', '$modal', '$filter', '$timeout', 'pollStorage', function ($scope, $http, $sce, $modal, $filter, $timeout, pollStorage) { + +.controller('PollCtrl', ['$scope', '$sce', '$timeout', 'pollStorage', function ($scope, $sce, $timeout, pollStorage) { + $scope.gvar = {saved:false}; + $scope.$watch('gvar.saved', function() { + $timeout(function () { + $scope.gvar.saved = false; + }, 5000); + }); + + $scope.poll = pollStorage.get(); + + $scope.toHTML = function (data) { + return $sce.trustAsHtml(data); + } + +}]) + +.controller('PollCreateCtrl', ['$scope', '$controller', '$modal', '$filter', '$timeout', 'pollStorage', function ($scope, $controller, $modal, $filter, $timeout, pollStorage) { + $controller('PollCtrl', {$scope:$scope}); + function initPoll() { return { title :'', @@ -37,14 +56,8 @@ }; } - $scope.gvar = {saved:false, editMode:true}; - $scope.$watch('gvar.saved', function() { - $timeout(function () { - $scope.gvar.saved = false; - }, 5000); - }) + $scope.gvar.editMode = true; - $scope.poll = pollStorage.get(); if (JSON.stringify($scope.poll) == "{}") { $scope.poll = initPoll(); } @@ -54,33 +67,12 @@ $scope.addChoice = function () { var index = $scope.poll.choices.push(initChoice()); var choice = $scope.poll.choices[index-1]; - var modalInstance = $modal.open({ - templateUrl : 'popupChoice.html', - controller : PollPopChoiceCtrl, - resolve : { - title : function () { return 'Add Choice';}, - choice : function () { return choice; } - } - }); - modalInstance.result.then(function (ch) { - deleteChoice(ch); - }); + popupChoice(choice, 'Add Choice'); } $scope.editChoice = function (choice) { - var modalInstance = $modal.open({ - templateUrl : 'popupChoice.html', - controller : PollPopChoiceCtrl, - resolve : { - title : function () { return 'Edit Choice';}, - choice : function () { return choice; } - } - }); - - modalInstance.result.then(function (ch) { - deleteChoice(ch); - }); + popupChoice(choice, 'Edit Choice'); } var deleteChoice = function (ch) { @@ -90,6 +82,21 @@ } } + var popupChoice = function (choice, title) { + var modalInstance = $modal.open({ + templateUrl : 'partials/poll-popupChoice.html', + controller : PollPopChoiceCtrl, + resolve : { + title : function () { return title;}, + choice : function () { return choice; } + } + }); + + modalInstance.result.then(function (ch) { + deleteChoice(ch); + }); + } + $scope.save = function () { pollStorage.put($scope.poll); $scope.gvar.saved = true; @@ -97,21 +104,24 @@ $scope.reset = function () { $scope.poll = initPoll(); + $scope.voteChoices = $scope.poll.choices; pollStorage.put({}); } - $scope.toHTML = function (data) { - return $sce.trustAsHtml(data); - } - var PollPopChoiceCtrl = function ($scope, $filter, $modalInstance, title, choice) { $scope.title = title; $scope.choice = choice; + var oldChoice = angular.copy(choice); $scope.saveChoice = function () { $modalInstance.close(); } + $scope.cancelChoice = function () { + angular.copy(oldChoice, $scope.choice); + $modalInstance.close(); + } + $scope.deleteChoice = function (ch) { $modalInstance.close(ch); } @@ -119,24 +129,24 @@ } }]) -.controller('PollVoteCtrl', ['$scope', '$filter', '$sce', '$timeout', 'pollStorage', function ($scope, $filter, $sce, $timeout, pollStorage) { - $scope.gvar = {saved:false, editMode:false}; - $scope.$watch('gvar.saved', function() { - $timeout(function () { - $scope.gvar.saved = false; - }, 5000); - }) - $scope.poll = pollStorage.get(); - $scope.voteName = ""; - $scope.voteChoices = []; - for (var i = 0; i < $scope.poll.choices.length; ++i) { - if ($scope.poll.choices[i].type == 'text') { - $scope.voteChoices.push({name:$scope.poll.choices[i].name, value:false}); - } - else if ($scope.poll.choices[i].type == 'date') { - $scope.voteChoices.push({name: $filter('date')($scope.poll.choices[i].date,'dd/MM/yyyy') , value:false}); - } +.controller('PollVoteCtrl', ['$scope', '$filter', '$controller', 'pollStorage', function ($scope, $filter, $controller, pollStorage) { + $controller('PollCtrl', {$scope:$scope}); + + $scope.gvar.editMode = false; + + var initVote = function () { + $scope.voteName = ""; + $scope.voteChoices = []; + for (var i = 0; i < $scope.poll.choices.length; ++i) { + if ($scope.poll.choices[i].type == 'text') { + $scope.voteChoices.push({name:$scope.poll.choices[i].name, value:false}); + } + else if ($scope.poll.choices[i].type == 'date') { + $scope.voteChoices.push({name: $filter('date')($scope.poll.choices[i].date,'dd/MM/yyyy') , value:false}); + } + } } + initVote(); $scope.vote = function () { var data = {}; @@ -148,10 +158,7 @@ $scope.poll.votants.push(data); pollStorage.put($scope.poll); $scope.gvar.saved = true; + initVote(); } - - $scope.toHTML = function (data) { - return $sce.trustAsHtml(data); - } }]) ; \ No newline at end of file Added: trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html (rev 0) +++ trunk/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html 2014-04-28 09:56:29 UTC (rev 3882) @@ -0,0 +1,49 @@ +<form class="form-horizontal"> + <div class="modal-header"> + <h4 class="modal-title">{{title}}</h4> + {{oldChoice}} + </div> + <div class="modal-body"> + + <div class="form-group"> + <label class="col-sm-4 control-label">Type de choix :</label> + + <div class="col-sm-8 btn-group"> + <button type="button" class="btn btn-default" ng-model="choice.type" btn-radio="'text'">Text</button> + <button type="button" class="btn btn-default" ng-model="choice.type" btn-radio="'date'">Date</button> + <button type="button" class="btn btn-default" ng-model="choice.type" btn-radio="'picture'" disabled>Image</button> + </div> + </div> + + <div class="form-group" ng-if="choice.type == 'text'"> + <label for="popNameChoiceCheck" class="col-sm-4 control-label">Nom du Choix : </label> + + <div class="col-sm-6"> + <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" /> + </div> + </div> + + <div class="form-group" ng-if="choice.type == 'date'"> + <label for="popNameChoiceDate" class="col-sm-4 control-label">Date : </label> + + <div class="col-sm-6"> + <div class="right-inner-addon "> + <i class="glyphicon glyphicon-calendar glyphicon-input"></i> + <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened"/> + </div> + </div> + </div> + <div class="form-group"> + <label for="popDescChoice" class="col-sm-4 control-label">Description : </label> + + <div class="col-sm-6"> + <textarea id="popDescChoice" type="text" ng-model="choice.description" class="form-control"></textarea> + </div> + </div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-danger" ng-click="deleteChoice(choice)">Delete</button> + <button type="button" class="btn btn-default" ng-click="cancelChoice()">Cancel</button> + <button type="button" class="btn btn-primary" ng-click="saveChoice()">Save</button> + </div> +</form> \ No newline at end of file Modified: trunk/pollen-ui-angular/src/main/webapp/partials/poll.html =================================================================== --- trunk/pollen-ui-angular/src/main/webapp/partials/poll.html 2014-04-27 17:12:24 UTC (rev 3881) +++ trunk/pollen-ui-angular/src/main/webapp/partials/poll.html 2014-04-28 09:56:29 UTC (rev 3882) @@ -46,15 +46,15 @@ <td class="pollChoice"></td> <td ng-repeat="choice in poll.choices" class="pollChoice pollAnim" edit-me="showEdit" ng-mouseenter="showEditHover = true" ng-mouseleave="showEditHover = false"> <div ng-show="choice.type == 'text'"> - <div ng-hide="showEdit" title="{{choice.description}}">{{choice.name}} <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-show="gvar.editMode && showEditHover" ng-click="editChoice(choice)" value="..."/></div> + <div ng-hide="showEdit" class="fixe-input" title="{{choice.description}}">{{choice.name}} <input type="button" class="btn btn-default" ng-if="gvar.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> <div ng-show="showEdit"> <input type="text" class="form-control" ng-model="choice.name" focus-me="showEdit" ng-exit="showEdit = false"/> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> </div> <div ng-show="choice.type == 'date'"> - <div ng-hide="showEdit || isOpen" title="{{choice.description}}">{{choice.date | date:'dd/MM/yyyy'}} <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> - <div ng-show="showEdit || isOpen"> + <div ng-hide="showEdit || isOpen" class="fixe-input" title="{{choice.description}}">{{choice.date | date:'dd/MM/yyyy'}} <input type="button" class="btn btn-default" ng-if="gvar.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> + <div ng-show="showEdit || isOpen" > <input type="text" class="form-control" ng-model="choice.date" focus-me="showEdit" datepicker-popup="dd/MM/yyyy" is-open="isOpen" ng-exit="showEdit = false" /> <input type="button" class="btn btn-default" data-toggle="modal" data-target="#popupAddChoice" ng-click="editChoice(choice)" value="..."/> </div> @@ -91,52 +91,3 @@ </div> </form> -<script type="text/ng-template" id="popupChoice.html"> - <form class="form-horizontal"> - <div class="modal-header"> - <h4 class="modal-title">{{title}}</h4> - </div> - <div class="modal-body"> - - <div class="form-group"> - <label class="col-sm-4 control-label">Type de choix :</label> - - <div class="col-sm-8 btn-group"> - <button type="button" class="btn btn-default" ng-model="choice.type" btn-radio="'text'">Text</button> - <button type="button" class="btn btn-default" ng-model="choice.type" btn-radio="'date'">Date</button> - <button type="button" class="btn btn-default" ng-model="choice.type" btn-radio="'picture'" disabled>Image</button> - </div> - </div> - - <div class="form-group" ng-if="choice.type == 'text'"> - <label for="popNameChoiceCheck" class="col-sm-4 control-label">Nom du Choix : </label> - - <div class="col-sm-6"> - <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" /> - </div> - </div> - - <div class="form-group" ng-if="choice.type == 'date'"> - <label for="popNameChoiceDate" class="col-sm-4 control-label">Date : </label> - - <div class="col-sm-6"> - <div class="right-inner-addon "> - <i class="glyphicon glyphicon-calendar glyphicon-input"></i> - <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened"/> - </div> - </div> - </div> - <div class="form-group"> - <label for="popDescChoice" class="col-sm-4 control-label">Description : </label> - - <div class="col-sm-6"> - <textarea id="popDescChoice" type="text" ng-model="choice.description" class="form-control"></textarea> - </div> - </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-danger" data-dismiss="modal" ng-click="deleteChoice(choice)">delete</button> - <button type="button" class="btn btn-primary" ng-click="saveChoice()">Save</button> - </div> - </form> -</script>

1 0

Build failed in Jenkins: pollen-nightly #10
by admin+ci-chorem.org＠codelutin.com April 27, 2014

April 27, 2014

See <http://ci.chorem.org/jenkins/job/pollen-nightly/10/changes> Changes: [garandel] un template pour creation/edition/vote de sondage [Tony CHEMIT] refs #885 : move to Topia3 stack [garandel] update create and vote page ------------------------------------------ [...truncated 1726 lines...] [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] Scan 104 files header done in 148.175ms. [INFO] * uptodate header on 11 files. * add header on 93 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ pollen-persistence --- [INFO] Compiling 86 source files to <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [WARNING] <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ pollen-persistence --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ pollen-persistence --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ pollen-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ pollen-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ pollen-persistence --- [INFO] Nothing to compile - all classes are up to date [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ pollen-persistence --- [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ pollen-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ pollen-persistence --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.9-SNAPSHOT:generate (generate-entities) @ pollen-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] No file generated. [INFO] Process phase [xmi] for one entry. [INFO] No file generated. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.String] : the tagvalue 'String' is unkown. [INFO] No file generated. [INFO] Process phase [java] for one entry. [INFO] Apply generator JavaEnumerationTransformer [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) @ pollen-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/pollen-persistence…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ pollen-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ pollen-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) @ pollen-persistence --- [INFO] Loaded <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/target/collect-art…> [INFO] Copying pollen-persistence-2.0-SNAPSHOT.jar to <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/target/collect/org…> [INFO] Copying THIRD-PARTY.properties to <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/target/collect/org…> [INFO] Copying pollen-persistence-2.0-SNAPSHOT-sources.jar to <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/target/collect/org…> [INFO] Copying pollen-persistence-2.0-SNAPSHOT-javadoc.jar to <http://ci.chorem.org/jenkins/job/pollen-nightly/ws/trunk/target/collect/org…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ pollen-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ pollen-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ pollen-persistence --- [INFO] Used declared dependencies found: [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [WARNING] Unused declared dependencies found: [WARNING] commons-codec:commons-codec:jar:1.9:compile [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Pollen ............................................ SUCCESS [ 31.689 s] [INFO] Pollen :: VoteCounting (Api) ...................... SUCCESS [ 13.061 s] [INFO] Pollen :: VoteCounting :: Normal .................. SUCCESS [ 4.288 s] [INFO] Pollen :: VoteCounting :: Percentage .............. SUCCESS [ 4.142 s] [INFO] Pollen :: VoteCounting :: Condorcet ............... SUCCESS [ 4.065 s] [INFO] Pollen :: VoteCounting :: Number .................. SUCCESS [ 4.350 s] [INFO] Pollen :: VoteCounting :: Borda ................... SUCCESS [ 4.042 s] [INFO] Pollen :: VoteCounting :: Instant Runoff .......... SUCCESS [ 3.971 s] [INFO] Pollen :: VoteCounting :: Coombs .................. SUCCESS [ 3.882 s] [INFO] Pollen :: VoteCounting (Aggregator) ............... SUCCESS [ 1.482 s] [INFO] Pollen :: Persistence ............................. FAILURE [ 21.887 s] [INFO] Pollen :: Service ................................. SKIPPED [INFO] Pollen :: Rest Api ................................ SKIPPED [INFO] Pollen :: UI (CanJS) .............................. SKIPPED [INFO] Pollen :: UI (Angular) ............................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:40 min [INFO] Finished at: 2014-04-26T01:02:10+01:00 [INFO] Final Memory: 65M/286M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-dependency-plugin:2.8:analyze-only (analyze) on project pollen-persistence: Dependency problems found -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-dependency-plugin:2.8:analyze-only (analyze) on project pollen-persistence: Dependency problems found at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) 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.MojoExecutionException: Dependency problems found at org.apache.maven.plugin.dependency.analyze.AbstractAnalyzeMojo.execute(AbstractAnalyzeMojo.java:188) 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/MojoExecutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :pollen-persistence Sending e-mails to: pollen-commits(a)list.chorem.org chemit+chorem-ci(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE Failed to send e-mail to garandel because no e-mail address is known, and no default e-mail domain is configured

1 2

Build failed in Jenkins: pollen-nightly » Pollen :: Persistence #10
by admin+ci-chorem.org＠codelutin.com April 27, 2014

April 27, 2014

See <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> Changes: [Tony CHEMIT] refs #885 : move to Topia3 stack ------------------------------------------ [...truncated 46 lines...] [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 49.2 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 4.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 51.2 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 4.2 KB/sec) [INFO] Process phase [zargo] for one entry. [INFO] Generate one file in 57.382ms. [INFO] Process phase [xmi] for one entry. [INFO] Generate one file in 2.893s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.String] : the tagvalue 'String' is unkown. [INFO] No file generated. [INFO] Process phase [java] for one entry. [INFO] Apply generator JavaEnumerationTransformer [INFO] Apply generator TopiaMetaTransformer [INFO] Generate 92 files in 372.936ms. [INFO] [INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ pollen-persistence --- [INFO] Will create or update license file [agpl_v3] to <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] [INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ pollen-persistence --- [INFO] Load missing file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/mch… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/com/mchange/c3p0/… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/mchange/c3p0/0.9.2.1/c3p0-0.9.2.1-t… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/mch… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/com/mchange/mchan… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/mchange/mchange-commons-java/0.2.3.… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/common… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.3.2/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/hibernate/hib… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-c3p0/4.3.5.Fina… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/hibernate/jav… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/javax/persistence/hiberna… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/moc… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/mockito/mocki… [INFO] Downloading: http://repo.maven.apache.org/maven2/org/mockito/mockito-core/1.9.5/mockito-… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (855 B at 13.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/nuiton… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/nuiton… (855 B at 9.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/nuiton-utils/2.7.1/nuiton-ut… [INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/nuiton-utils/2.7.1/nuiton-ut… (855 B at 2.2 KB/sec) [INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/2.7.1/nuiton-utils-2.7.1-third-party.properties [INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/2.7.1/nuiton-utils-2.7.1-third-party.properties [INFO] Missing file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> is up-to-date. [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] Regenerate missing license file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] Will attach third party file from <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ pollen-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 12 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.6:update-file-header (update-file-header) @ pollen-persistence --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] - adding license header on file <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] Scan 104 files header done in 148.175ms. [INFO] * uptodate header on 11 files. * add header on 93 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ pollen-persistence --- [INFO] Compiling 86 source files to <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [WARNING] <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ pollen-persistence --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.1:generate-changes (jredmine-generate-changes) @ pollen-persistence --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ pollen-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ pollen-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ pollen-persistence --- [INFO] Nothing to compile - all classes are up to date [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ pollen-persistence --- [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ pollen-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ pollen-persistence --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.9-SNAPSHOT:generate (generate-entities) @ pollen-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] No file generated. [INFO] Process phase [xmi] for one entry. [INFO] No file generated. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.String] : the tagvalue 'String' is unkown. [INFO] No file generated. [INFO] Process phase [java] for one entry. [INFO] Apply generator JavaEnumerationTransformer [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) @ pollen-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-nightly/org.chorem.pollen$pollen-pe…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ pollen-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ pollen-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) @ pollen-persistence --- [INFO] Loaded /var/local/forge/data/chorem.org/jenkins/workspace/pollen-nightly/trunk/target/collect-artifacts.txt [INFO] Copying pollen-persistence-2.0-SNAPSHOT.jar to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-nightly/trunk/target/collect/org.chorem.pollen--pollen-persistence/pollen-persistence-2.0-SNAPSHOT.jar [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-nightly/trunk/target/collect/org.chorem.pollen--pollen-persistence/THIRD-PARTY.properties [INFO] Copying pollen-persistence-2.0-SNAPSHOT-sources.jar to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-nightly/trunk/target/collect/org.chorem.pollen--pollen-persistence/pollen-persistence-2.0-SNAPSHOT-sources.jar [INFO] Copying pollen-persistence-2.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-nightly/trunk/target/collect/org.chorem.pollen--pollen-persistence/pollen-persistence-2.0-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ pollen-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ pollen-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ pollen-persistence --- [INFO] Used declared dependencies found: [INFO] com.google.guava:guava:jar:16.0.1:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [WARNING] Unused declared dependencies found: [WARNING] commons-codec:commons-codec:jar:1.9:compile [JENKINS] Archiving disabled

1 2

r3881 - in trunk: pollen-persistence pollen-persistence/src/license pollen-persistence/src/main/java/org/chorem/pollen/persistence pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity pollen-rest-api pollen-rest-api/src/main/java/org/chorem/pollen/rest/api pollen-rest-api/src/test/java/org/chorem/pollen/rest/api pollen-services
by tchemit＠users.chorem.org April 27, 2014

April 27, 2014

Author: tchemit Date: 2014-04-27 19:12:24 +0200 (Sun, 27 Apr 2014) New Revision: 3881 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3881 Log: optimze dependencies + add missing license headers Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java trunk/pollen-rest-api/pom.xml trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java trunk/pollen-services/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/pom.xml 2014-04-27 17:12:24 UTC (rev 3881) @@ -27,10 +27,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> <dependency> <groupId>org.nuiton.topia</groupId> Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,13 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,13 +20,13 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 # - The MIT License -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 02 18:32:57 CEST 2013 +#Sun Apr 27 18:43:51 CEST 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenPersistenceContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.persistence; +/* + * #%L + * Pollen :: Persistence + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.persistence; +/* + * #%L + * Pollen :: Persistence + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.persistence.entity; +/* + * #%L + * Pollen :: Persistence + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * Created on 4/25/14. * Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-rest-api/pom.xml 2014-04-27 17:12:24 UTC (rev 3881) @@ -24,7 +24,6 @@ <artifactId>pollen-persistence</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-services</artifactId> @@ -32,10 +31,19 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion</artifactId> </dependency> - <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion-unittest</artifactId> @@ -45,6 +53,10 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> <dependency> <groupId>javax</groupId> Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.rest.api; +/* + * #%L + * Pollen :: Rest Api + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.chorem.pollen.services.PollenSecurityContext; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.service.AuthService; Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/FakePollenRestApiApplicationContext.java 2014-04-27 17:12:24 UTC (rev 3881) @@ -1,5 +1,26 @@ package org.chorem.pollen.rest.api; +/* + * #%L + * Pollen :: Rest Api + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2014-04-27 16:47:39 UTC (rev 3880) +++ trunk/pollen-services/pom.xml 2014-04-27 17:12:24 UTC (rev 3881) @@ -24,7 +24,16 @@ <dependency> <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> +  + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> </dependency> <dependency> @@ -54,6 +63,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> <!--dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId>

1 0

Jenkins build became unstable: pollen-ci #9
by admin+ci-chorem.org＠codelutin.com April 27, 2014

April 27, 2014

See <http://ci.chorem.org/jenkins/job/pollen-ci/9/changes>

1 3