This is an automated email from the git hooks/post-receive script. New commit to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 99f26655168eadd0894cd76bbfe4dcd40aeb621a Author: Tony CHEMIT <dev@tchemit.fr> Date: Sat Jan 14 08:39:27 2017 +0100 Use same configuration as default bundle application for dev --- pollen-rest-api/pom.xml | 25 +------------------------ pollen-ui-riot-js/src/main/web/conf.json | 2 +- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index ed76250..de336ad 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -238,29 +238,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <stopKey>B</stopKey> - <stopPort>1270</stopPort> - <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> - <webAppConfig> - <contextPath>/${defaultWebContextPath}</contextPath> - </webAppConfig> - <systemProperties> - <systemProperty> - <name>testDirectory</name> - <value>${defaultLogDir}</value> - </systemProperty> - <systemProperty> - <name>pollen.data.directory</name> - <value>${defaultDbDir}</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - - <plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> <configuration> @@ -270,7 +247,7 @@ <pollen.log.dir>${defaultLogDir}</pollen.log.dir> </systemProperties> <uriEncoding>UTF-8</uriEncoding> - <port>8084</port> + <port>8888</port> </configuration> </plugin> </plugins> diff --git a/pollen-ui-riot-js/src/main/web/conf.json b/pollen-ui-riot-js/src/main/web/conf.json index eaace3f..78dd34b 100644 --- a/pollen-ui-riot-js/src/main/web/conf.json +++ b/pollen-ui-riot-js/src/main/web/conf.json @@ -1,5 +1,5 @@ { - "endPoint": "http://localhost:8084/pollen-rest-api", + "endPoint": "http://localhost:8888/pollen-rest-api", "pollDefaultPageSize": 10, "commentDefaultPageSize": 10, "favoriteListDefaultPageSize": 15, -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.