branch develop updated (4860258 -> af16d6a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 4860258 correction gestion de erreur en cas de sondage non accessible new af16d6a devMode à false par défaut, et a vrai dans la configuration des tests. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit af16d6a766572a635dc382831ca4c9ffee2adcd0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 13:22:53 2017 +0200 devMode à false par défaut, et a vrai dans la configuration des tests. Summary of changes: .../src/test/resources/pollen-rest-api.properties | 13 ++++--------- pollen-services/src/main/config/PollenServices.ini | 5 ++--- .../org/chorem/pollen/services/service/FixturesService.java | 5 ----- .../src/test/resources/pollen-services.properties | 1 + 4 files changed, 7 insertions(+), 17 deletions(-) copy pollen-persistence/src/test/resources/db.properties => pollen-rest-api/src/test/resources/pollen-rest-api.properties (74%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit af16d6a766572a635dc382831ca4c9ffee2adcd0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 24 13:22:53 2017 +0200 devMode à false par défaut, et a vrai dans la configuration des tests. --- .../src/test/resources/pollen-rest-api.properties | 12 +++--------- pollen-services/src/main/config/PollenServices.ini | 5 ++--- .../org/chorem/pollen/services/service/FixturesService.java | 5 ----- .../src/test/resources/pollen-services.properties | 1 + 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/pollen-services/src/test/resources/pollen-services.properties b/pollen-rest-api/src/test/resources/pollen-rest-api.properties similarity index 70% copy from pollen-services/src/test/resources/pollen-services.properties copy to pollen-rest-api/src/test/resources/pollen-rest-api.properties index 572e5a5..798c1a3 100644 --- a/pollen-services/src/test/resources/pollen-services.properties +++ b/pollen-rest-api/src/test/resources/pollen-rest-api.properties @@ -8,20 +8,14 @@ # 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% ### -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 -pollen.version=${project.version} +pollen.devMode=true diff --git a/pollen-services/src/main/config/PollenServices.ini b/pollen-services/src/main/config/PollenServices.ini index b64ccde..38e8001 100644 --- a/pollen-services/src/main/config/PollenServices.ini +++ b/pollen-services/src/main/config/PollenServices.ini @@ -4,7 +4,7 @@ description = PollenServicesConfig.description description = pollen.configuration.devMode key = pollen.devMode type = Boolean -defaultValue = true +defaultValue = false transient = true final = true @@ -118,13 +118,12 @@ defaultValue = 3600 description = pollen.configuration.smptHost key = pollen.smtp.host type = string -defaultValue = localhost [option smtpPort] description = pollen.configuration.smtpPort key = pollen.smtp.port type = int -defaultValue = 1025 +defaultValue = 25 [option smtpFrom] description = pollen.configuration.smtpFrom diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FixturesService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FixturesService.java index 59eb839..a6e5f46 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FixturesService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FixturesService.java @@ -21,7 +21,6 @@ package org.chorem.pollen.services.service; * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,10 +64,6 @@ public class FixturesService extends PollenServiceSupport { protected PollenFixtures loadFixtures(String fixturesSetName, boolean cleanDatabase) { - boolean devMode = serviceContext.getPollenServicesConfig().isDevMode(); - - Preconditions.checkState(devMode); - PollenFixtures fixtures = fixtureSets.get(fixturesSetName); if (fixtures == null) { diff --git a/pollen-services/src/test/resources/pollen-services.properties b/pollen-services/src/test/resources/pollen-services.properties index 572e5a5..73def9b 100644 --- a/pollen-services/src/test/resources/pollen-services.properties +++ b/pollen-services/src/test/resources/pollen-services.properties @@ -25,3 +25,4 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver #hibernate.hbm2ddl.auto=update pollen.version=${project.version} +pollen.devMode=true -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm