Commit 3d19f63f authored by Yann Mombrun's avatar Yann Mombrun
Browse files

OPENAXES-11 - Stable version 0.1.0 of the bundle, jetty manager and mongodb manager.

Minor clean of the poms, configuration and assembly.
parent 9e28cc01
......@@ -145,14 +145,6 @@
<include>eu.axes.gui:axes-research:zip</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>${jetty.path}/demo-base/</exclude>
<exclude>${jetty.path}/start.d/</exclude>
<exclude>${jetty.path}/webapps/README.txt</exclude>
<exclude>${jetty.path}/start.ini</exclude>
</excludes>
</unpackOptions>
</dependencySet>
<!-- Libs for servers management -->
......
......@@ -21,17 +21,22 @@
<prop key="mongodb.host">localhost</prop>
<prop key="jetty.host">localhost</prop>
<prop key="limas.conf">${weblab.conf}limas/cOpenAXES.py</prop>
<prop key="limas.conf">${weblab.conf}limas</prop>
<prop key="user.timezone">Europe/Paris</prop>
<prop key="mongodb.db">${weblab.data}mongodb</prop>
<prop key="weblab.repository">${weblab.data}repository</prop>
<prop key="files.endpoint.uri">file:${weblab.data}toIndex?consumer.initialDelay=10000&amp;maxMessagesPerPoll=500&amp;consumer.recursive=true&amp;consumer.regexPattern=.+\.(?:(?:mpe?g)|(?:mp4)|(?:webm)|(?:avi)|(?:flv)|(?:ts)|(?:wmv)|(?:mov)|(?:ogv))&amp;noop=true
</prop>
<prop key="collection.name">cOpenAXES</prop>
</props>
</property>
</bean>
<bean id="WebLab" class="org.ow2.weblab.bundle.conf.WebLabBean">
<property name="debug" value="info" />
<property name="jmxEnabled" value="true" />
......@@ -99,7 +104,7 @@
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="JAVA_OPTIONS" value=" -server -Xms128m -Xmx2g -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Duser.timezone=${user.timezone} -Dconfig.file=file://${limas.conf} " />
<entry key="JAVA_OPTIONS" value=" -server -Xms128m -Xmx2g -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Duser.timezone=${user.timezone} -Dconfig.file=file://${limas.conf}/${collection.name}.py " />
<entry key="JETTY_ARGS" value="jetty.port=${jetty.port}" />
</map>
</constructor-arg>
......@@ -123,7 +128,7 @@
<map>
<entry key="CATALINA_HOME" value="${weblab.home}${tomcat.path}" />
<entry key="JAVA_OPTS"
value=" -Xmx2g -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -Dweblab.repository=${weblab.repository} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=${tomcat.jmx.port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Duser.timezone=${user.timezone} -Dlimas.conf=${limas.conf} " />
value=" -Xmx2g -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -Dweblab.repository=${weblab.repository} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=${tomcat.jmx.port} -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Duser.timezone=${user.timezone} -Dlimas.conf=${limas.conf}/${collection.name}.py " />
</map>
</constructor-arg>
</bean>
......@@ -154,7 +159,8 @@
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="JAVA_OPTS" value=" -server -Xms128m -Xmx2g -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Duser.timezone=${user.timezone} " />
<entry key="JAVA_OPTS"
value=" -server -Xms128m -Xmx2g -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Duser.timezone=${user.timezone} -Dtomcat.http.port=${tomcat.http.port} -Dweblab.files=${weblab.files} " />
</map>
</constructor-arg>
</bean>
......@@ -162,6 +168,7 @@
<property name="timeout" value="300000" />
</bean>
<bean id="Monitoring" class="org.ow2.weblab.bundle.conf.MonitoringBean">
<property name="delay" value="300000" />
<property name="email" value="demo@weblab-project.org" />
......
......@@ -3,7 +3,7 @@
<groupId>eu.axes.bundle.servers</groupId>
<artifactId>jetty-manager</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.1.0</version>
<packaging>jar</packaging>
......
......@@ -3,7 +3,7 @@
<groupId>eu.axes.bundle.servers</groupId>
<artifactId>mongodb-manager</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.1.0</version>
<packaging>jar</packaging>
......
......@@ -3,7 +3,7 @@
<groupId>eu.axes.bundle</groupId>
<artifactId>open-axes</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.1.0</version>
<packaging>pom</packaging>
......@@ -14,7 +14,7 @@
<modules>
<module>libraries/mongodb-manager</module>
<module>libraries/jetty-manager</module>
<!-- <module>chain-camel</module> -->
<!--<module>libraries/openaxes-camel</module>-->
</modules>
<properties>
......@@ -41,6 +41,7 @@
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
......@@ -103,7 +104,7 @@
<dependency>
<groupId>eu.axes.limas</groupId>
<artifactId>limas-web</artifactId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0</version>
<type>war</type>
<exclusions>
<exclusion>
......@@ -117,7 +118,7 @@
<dependency>
<groupId>eu.axes.services</groupId>
<artifactId>limas-indexer</artifactId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0</version>
<type>war</type>
<exclusions>
<exclusion>
......@@ -218,11 +219,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>Old-OW2</id>
<name>Old OW2 Maven repository</name>
<url>http://maven.ow2.org/maven2/</url>
</repository>
<repository>
<id>WebLab</id>
<name>WebLab Maven repository</name>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment