Commit 6183f303 authored by Yann Mombrun's avatar Yann Mombrun
Browse files

WEBLAB-1260 - Uses all latest components that have been migrated to parent 1.2.8

Use latest application installer fixing it
Update the headers and reduce the number of warnings in the code.
Remove petals and servicemix managers.
Properly configure solr logging by the use of a dedicated sub project.
Removes fuseki files since fuseki was removed in previous bundle.

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@4067 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 7d4d960a
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>distribution</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
......@@ -17,38 +16,28 @@
<directory>../conf/tomcat/conf</directory>
<outputDirectory>${tomcat.path}/conf</outputDirectory>
</fileSet>
<fileSet>
<!-- add solr configuration in WebLab Bundle conf dir -->
<directory>../target/maven-shared-archive-resources/solr</directory>
<outputDirectory>conf/solr</outputDirectory>
</fileSet>
<fileSet>
<!-- add weblab-client/filter configuration in WebLab Bundle conf dir -->
<directory>../conf/exposed-configuration</directory>
<outputDirectory>conf/exposed-configuration</outputDirectory>
</fileSet>
<!-- Put Commons libraries into Liferay -->
<fileSet>
<!-- Add Fuseki configuration in Weblab Bundle conf dir -->
<directory>../conf/fuseki</directory>
<outputDirectory>conf/fuseki</outputDirectory>
</fileSet>
<!-- Put Commons libraries into Tomcat -->
<fileSet>
<directory>../libraries/services/target/services-libs</directory>
<outputDirectory>${tomcat.path}/lib/</outputDirectory>
</fileSet>
<!-- Put Commons libraries into Liferay -->
<fileSet>
<directory>../libraries/portlets/target/portlets-libs</directory>
<outputDirectory>${liferay.tomcat.path}/lib/ext</outputDirectory>
</fileSet>
</fileSet>
<!-- Copy content manager libs into tika service libs directory -->
<fileSet>
<directory>../libraries/content/target/content-libs</directory>
<outputDirectory>${tomcat.path}/webapps/tika-normaliser/WEB-INF/lib</outputDirectory>
</fileSet>
<!-- Copy solr libs into solr service libs directory -->
<fileSet>
<directory>../libraries/solr-logging/target/solr-logging-libs</directory>
<outputDirectory>${tomcat.path}/webapps/solr/WEB-INF/lib</outputDirectory>
</fileSet>
<fileSet>
<!-- copy jbi samples and cxf sample -->
<!-- copy tomcat server.xml and cxf samples -->
<directory>../conf/samples</directory>
<outputDirectory>conf/samples</outputDirectory>
</fileSet>
......@@ -90,21 +79,16 @@
<source>../conf/configuration.xml</source>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<!-- Content manager file -->
<source>../conf/contentManager.properties</source>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<!-- Service registry -->
<source>../conf/camelBeans.xml</source>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<!-- Copy WebLab Launcher -->
<source>../libraries/weblab-launcher/target/weblab-launcher-${weblab.bundle.version}-jar-with-dependencies.jar</source>
<destName>weblab-launcher.jar</destName>
</file>
<!-- Copy solr logging configuration -->
<file>
<source>../libraries/solr-logging/log4j.properties</source>
<outputDirectory>${tomcat.path}/webapps/solr/WEB-INF/classes/</outputDirectory>
</file>
<file>
<!-- Support inter pages events in portal-ext.properties -->
<source>../conf/liferay/portal-ext.properties</source>
......@@ -115,11 +99,13 @@
<source>target/site/dependencies.html</source>
<destName>THIRD-PARTY.html</destName>
</file>
<file>
<!-- Add LGPL license -->
<file>
<!-- Add LGPL license -->
<source>../LICENCE</source>
</file>
</files>
<dependencySets>
<!-- Extract servers -->
......@@ -128,38 +114,36 @@
<include>org.apache.tomcat:tomcat:zip</include>
<include>com.liferay:liferay-portal-tomcat:zip</include>
<include>org.ow2.weblab.osgi:karaf-weblab:tar.gz</include>
<include>org.apache.jena:jena-fuseki:zip</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<!-- Disable default env -->
<exclude>${liferay.tomcat.path}/bin/setenv.sh</exclude>
<exclude>${liferay.tomcat.path}/bin/setenv.bat</exclude>
<exclude>${liferay.tomcat.path}/bin/setenv.sh</exclude>
<exclude>${liferay.tomcat.path}/bin/setenv.bat</exclude>
<!-- Remove JVM from liferay -->
<exclude>${liferay.tomcat.path}/jre1.6.0_20/</exclude>
<!-- remove default data -->
<exclude>${liferay.path}/data/</exclude>
<exclude>${liferay.path}/data/</exclude>
<!-- http://issues.liferay.com/browse/LPS-37433 -->
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/themes/classic/images/calendar/calendar_drop_shadow.png</exclude>
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/themes/_unstyled/images/calendar/calendar_drop_shadow.png</exclude>
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/themes/classic/images/calendar/calendar_drop_shadow.png</exclude>
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/themes/_unstyled/images/calendar/calendar_drop_shadow.png</exclude>
<!-- Remove unused tomcat elements -->
<exclude>${tomcat.path}/conf/server.xml</exclude>
<exclude>${tomcat.path}/conf/tomcat-users.xml</exclude>
<exclude>${tomcat.path}/webapps/docs/</exclude>
<exclude>${tomcat.path}/webapps/examples/</exclude>
<exclude>${tomcat.path}/webapps/host-manager/</exclude>
<!-- Remove unused standard Liferay portlets -->
<exclude>${liferay.tomcat.path}/webapps/welcome-theme/</exclude>
<exclude>${liferay.tomcat.path}/webapps/marketplace-portlet/</exclude>
<exclude>${liferay.tomcat.path}/webapps/resources-importer-web/</exclude>
<exclude>${liferay.tomcat.path}/webapps/marketplace-portlet/</exclude>
<exclude>${liferay.tomcat.path}/webapps/resources-importer-web/</exclude>
</excludes>
</unpackOptions>
<fileMode>0755</fileMode>
......@@ -184,40 +168,31 @@
</includes>
<outputDirectory>${tomcat.path}/webapps/${artifact.artifactId}</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<!-- Remove common libraries already existing into the server -->
<unpack>true</unpack>
<unpackOptions>
<excludes>
<!-- Remove overrided service configuration files -->
<!-- Remove overridden service configuration files -->
<exclude>WEB-INF/classes/contentManager.properties</exclude>
<exclude>WEB-INF/classes/services_configuration.xml</exclude>
</excludes>
</unpackOptions>
</dependencySet>
<!-- add slf deps to solr war, see: http://wiki.apache.org/solr/SolrLogging -->
<dependencySet>
<includes>
<include>log4j:log4j:jar:*</include>
<include>org.slf4j:slf4j-log4j12:jar:*</include>
<include>org.slf4j:slf4j-api:jar:*</include>
</includes>
<outputDirectory>${tomcat.path}/webapps/solr/WEB-INF/lib/</outputDirectory>
</dependencySet>
<!-- add Solr config -->
<dependencySet>
<includes>
<include>org.ow2.weblab.components:solr-config:jar:*</include>
</includes>
<outputDirectory>conf/</outputDirectory>
<unpack>true</unpack>
</dependencySet>
<!-- Libs for servers management-->
<!-- add Solr config -->
<dependencySet>
<includes>
<include>org.ow2.weblab.components:solr-config:jar:*</include>
</includes>
<outputDirectory>conf/</outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>META-INF/</exclude>
</excludes>
</unpackOptions>
</dependencySet>
<!-- Libs for servers management -->
<dependencySet>
<includes>
<include>org.ow2.weblab.bundle.servers:*:zip:libs</include>
......
......@@ -11,7 +11,7 @@
<artifactId>bundle</artifactId>
<packaging>pom</packaging>
<name>WebLab bundle assembly.</name>
<description>WebLab bundle application.</description>
......@@ -34,15 +34,8 @@
<version>${weblab.bundle.version}</version>
<type>tar.gz</type>
</dependency>
<!-- <dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
<version>${fuseki.version}</version>
<classifier>distribution</classifier>
<type>zip</type>
</dependency> -->
<!-- Services -->
<dependency>
<groupId>org.ow2.weblab.webservices</groupId>
......@@ -120,63 +113,28 @@
<type>war</type>
</dependency>
<!-- Common libraries to copy into Liferay -->
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-portlet</artifactId>
<version>${weblab.weblab-portlet.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
<type>jar</type>
</dependency>
<!-- Libs for solr see: http://wiki.apache.org/solr/SolrLogging -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<!-- Solr configuration -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>solr-config</artifactId>
<version>${solr.config.version}</version>
</dependency>
<!-- Liferay WebLab Team -->
<!-- Liferay WebLab Team -->
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-theme</artifactId>
<version>2.0.0</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-application-management-portlet</artifactId>
<version>2.0.0</version>
<version>${portlet.weblab-theme.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-application-installer-portlet</artifactId>
<version>2.0.2</version>
<version>${portlet.application-installer.version}</version>
<type>war</type>
</dependency>
<!-- Launcher server manager support -->
<!-- Launcher server manager support -->
<dependency>
<groupId>org.ow2.weblab.bundle.servers</groupId>
<artifactId>karaf-manager</artifactId>
......@@ -184,14 +142,14 @@
<classifier>libs</classifier>
<type>zip</type>
</dependency>
<dependency>
<dependency>
<groupId>org.ow2.weblab.bundle.servers</groupId>
<artifactId>fuseki-manager</artifactId>
<version>${weblab.bundle.version}</version>
<classifier>libs</classifier>
<type>zip</type>
</dependency>
</dependencies>
<build>
......@@ -205,33 +163,16 @@
<goals>
<goal>single</goal>
</goals>
<configuration>
<archiverConfig>
<encoding>UTF-8</encoding>
</archiverConfig>
</configuration>
</execution>
</executions>
<configuration>
<tarLongFileMode>posix</tarLongFileMode>
<descriptor>assembly.xml</descriptor>
<finalName>WebLab-Bundle-Karaf-${maven.build.timestamp}</finalName>
<encoding>UTF-8</encoding>
<outputDirectory>../target</outputDirectory>
</configuration>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>2.4.4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
</plugin>
</plugins>
</build>
......
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean id="CamelContentManager" class="org.ow2.weblab.content.camel.CamelContentManager">
<constructor-arg ref="camelFileContext" />
<constructor-arg ref="defaultMediaUnitHandler" />
<constructor-arg value="true" />
</bean>
<!-- Camel context for file management -->
<camelContext id="camelFileContext" xmlns="http://camel.apache.org/schema/spring">
<routeContextRef ref="fileRouteContext"/>
<endpoint id="file-endpoint" uri="file:${weblab.repository}"/>
</camelContext>
<!-- default mediaunit handler -->
<bean id="defaultMediaUnitHandler" class="org.ow2.weblab.content.handler.DefaultMediaUnitHandler">
<property name="properties">
<set>
<value>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</value>
<value>http://www.w3.org/2000/01/rdf-schema#label</value>
<value>http://purl.org/dc/elements/1.1/format</value>
</set>
</property>
</bean>
<!-- WebLab processors-->
<bean id="StreamToByteArrayProcessor" class="org.ow2.weblab.content.processor.StreamToByteArray"/>
<bean id="ResourceToURIProcessor" class="org.ow2.weblab.content.processor.ResourceProducedToURI">
<constructor-arg><value>CamelFileNameProduced</value></constructor-arg>
</bean>
<bean id="CallEndpointFromURIProcessor" class="org.ow2.weblab.content.processor.CallEndpointFromURI"/>
<bean id="CallHTTPEndpointToURI" class="org.ow2.weblab.content.processor.CallEndpointToURI">
<constructor-arg><value>http://localhost:8080/api/secure/webdav/guest/document_library/WebLab/</value></constructor-arg>
<constructor-arg><value>true</value></constructor-arg>
</bean>
<bean id="HTTPResourceToURIProcessor" class="org.ow2.weblab.content.processor.ResourceProducedToURI">
<constructor-arg><value>uriContent</value></constructor-arg>
</bean>
<!-- Camel routes to deal with WebLab document contents -->
<routeContext id="fileRouteContext" xmlns="http://camel.apache.org/schema/spring">
<!-- writing route -->
<route id="weblab-in">
<from uri="direct:weblab-default-in"/>
<process ref="StreamToByteArrayProcessor"></process>
<!-- send Images resources to webdav repo -->
<setHeader headerName="CamelHttpMethod">
<constant>PUT</constant>
</setHeader>
<setHeader headerName="uriOptions">
<constant>?authMethod=Digest&amp;authUsername=demo@weblab-project.org&amp;authPassword=demo</constant>
</setHeader>
<process ref="CallHTTPEndpointToURI"></process>
<process ref="HTTPResourceToURIProcessor"></process>
</route>
<route>
<from uri="direct:weblab-default-out"/>
<setHeader headerName="uriOptions">
<constant>?authMethod=Digest&amp;authUsername=demo@weblab-project.org&amp;authPassword=demo</constant>
</setHeader>
<process ref="CallEndpointFromURIProcessor"></process>
<to uri="ref:file-endpoint" />
<process ref="ResourceToURIProcessor"></process>
</route>
<!-- writing file route
<route>
<from uri="direct:weblab-default-in"/>
<choice>
<when>
<simple>${headers.weblabStreamin} is 'java.io.InputStream'</simple>
<process ref="StreamToByteArrayProcessor"></process>
<to uri="ref:file-endpoint" />
<process ref="ResourceToURIProcessor"></process>
</when>
</choice>
</route> -->
<!-- reading file route
<route>
<from uri="direct:weblab-default-out"/>
<setHeader headerName="uriOptions"><constant>&amp;initialDelay=50&amp;delay=50&amp;noop=true&amp;readLock=none</constant></setHeader>
<process ref="CallEndpointFromURIProcessor"></process>
<to uri="ref:file-endpoint" />
<process ref="ResourceToURIProcessor"></process>
</route> -->
<route>
<from uri="direct:weblab-in"/>
<enrich uri="direct:weblab-default-in"/>
</route>
<route>
<from uri="direct:weblab-out"/>
<enrich uri="direct:weblab-default-out"/>
</route>
</routeContext>
</beans>
\ No newline at end of file
......@@ -9,54 +9,54 @@
<prop key="tomcat.http.port">8181</prop>
<prop key="liferay.http.port">8080</prop>
<prop key="karaf.http.port">8282</prop>
<!-- <prop key="fuseki.http.port">3030</prop> -->
<prop key="tomcat.path">apache-tomcat-7.0.59</prop>
<prop key="liferay.path">liferay-portal-6.1.2-ce-ga3/tomcat-7.0.40</prop>
<prop key="karaf.path">karaf-weblab-2.0.3-SNAPSHOT</prop>
<prop key="fuseki.path">jena-fuseki-1.0.1</prop>
<prop key="files.to.index">${weblab.data}toIndex</prop>
<prop key="warcs.to.index">${weblab.data}warcs</prop>
<prop key="content.folder">${weblab.data}content</prop>
</props>
</property>
</bean>
<bean id="WebLab" class="org.ow2.weblab.bundle.conf.WebLabBean">
<property name="debug" value = "info" />
<property name="jmxEnabled" value="true" />
<property name="monitoring"><ref bean="Monitoring"/></property>
<property name="remoteAccess" value="false"/>
<property name="remoteLogin" value="weblab" />
<property name="remotePassword" value="weblab" />
<property name="repository" value="${weblab.data}repository" />
<property name="servicesReconfigure" value="true" />
<property name="solrData" value="${weblab.data}solr" />
<property name="chainManagerService" value="http://localhost:${tomcat.http.port}/camel-router/chainManager" />
<property name="timeout" value="300000" />
<property name="toindex" value="${files.to.index}" />
<property name="warcs" value="${warcs.to.index}" />
<property name="webdavPassword" value="demo" />
<property name="webdavUrl" value="http://localhost:8080/api/secure/webdav/guest/document_library/WebLab/" />
<property name="webdavUser" value="demo@weblab-project.org" />
<property name="bus">
<ref bean="Karaf"/>
</property>
<property name="portal">
<ref bean="Liferay"/>
</property>
<property name="applicationServer">
<ref bean="Tomcat"/>
</property>
<property name="servers">
<list>
<!-- <ref bean="Fuseki"/> -->
......@@ -65,7 +65,7 @@
</list>
</property>
</bean>
<bean id="Tomcat" class="org.ow2.weblab.bundle.server.TomcatServer">
<property name="name" value="tomcat" />
<property name="enabled" value="true" />
......@@ -78,8 +78,7 @@
<constructor-arg>
<map>
<entry key="CATALINA_HOME" value="${weblab.home}${tomcat.path}" />
<!-- <entry key="CATALINA_PID" value="${weblab.data}pids/tomcat.pid" /> -->
<entry key="JAVA_OPTS" value=" -Xmx1500m -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -Dweblab.content.manager=${weblab.conf}contentManager.properties -Dweblab.files=${files.to.index} -Dweblab.warcs=${warcs.to.index} -Dsolr.solr.home=${weblab.conf}solr -Dweblab.repository=${weblab.data}repository -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18181 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false " />
<entry key="JAVA_OPTS" value=" -Xmx1500m -XX:MaxPermSize=256m -Dtomcat.http.port=${tomcat.http.port} -Dweblab.home=${weblab.home} -Dweblab.content.manager=${weblab.conf}contentManager.properties -Dweblab.files=${files.to.index} -Dweblab.warcs=${warcs.to.index} -Dsolr.solr.home=${weblab.conf}solr -Dweblab.repository=${weblab.data}repository -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18181 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}" />
</map>
</constructor-arg>
</bean>
......@@ -96,7 +95,7 @@
<!-- <property name="script" value="${weblab.home}${tomcat.path}/bin/catalina.sh" /> -->
<property name="timeout" value="300000" />
</bean>
<bean id="Liferay" class="org.ow2.weblab.bundle.server.TomcatServer">
<property name="name" value="liferay" />
<property name="enabled" value="true" />
......@@ -110,7 +109,7 @@
<map>
<entry key="CATALINA_HOME" value="${weblab.home}${liferay.path}" />
<!-- <entry key="CATALINA_PID" value="${weblab.data}pids/liferay.pid" /> -->
<entry key="JAVA_OPTS" value=" -Xmx1024m -XX:MaxPermSize=512m -Dweblab.client.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-client.xml -Dweblab.portlet.filter.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-portlet-filters.xml -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false " />
<entry key="JAVA_OPTS" value=" -Xmx1024m -XX:MaxPermSize=512m -Dweblab.client.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-client.xml -Dweblab.portlet.filter.url=http://localhost:${tomcat.http.port}/exposed-configuration/weblab-portlet-filters.xml -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=18080 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder}" />
</map>
</constructor-arg>
</bean>
......@@ -127,7 +126,7 @@
<!-- <property name="script" value="${weblab.home}${liferay.path}/bin/catalina.sh" /> -->
<property name="timeout" value="300000" />
</bean>
<bean id="Karaf" class="org.ow2.weblab.bundle.server.Karaf">
<property name="name" value="karaf" />
<property name="enabled" value="true" />
......@@ -142,7 +141,7 @@
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="JAVA_OPTS" value=" -server -Xms128M -Xmx1024m -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Dweblab.files=${files.to.index}?maxMessagesPerPoll=500 -Dweblab.warcs=${warcs.to.index}?maxMessagesPerPoll=500 " />
<entry key="JAVA_OPTS" value=" -server -Xms128M -Xmx1024m -XX:MaxPermSize=512m -Dcom.sun.management.jmxremote -Dweblab.files=${files.to.index}?maxMessagesPerPoll=500 -Dweblab.warcs=${warcs.to.index}?maxMessagesPerPoll=500 -Dweblab.content.manager=org.ow2.weblab.content.impl.SecureFileContentManager -Dfile.path=${content.folder} " />
</map>
</constructor-arg>
</bean>
......@@ -150,26 +149,6 @@
<property name="timeout" value="300000" />
</bean>
<!-- <bean id="Fuseki" class="org.ow2.weblab.bundle.server.Fuseki">
<property name="name" value="fuseki" />
<property name="enabled" value="true" />
<property name="home" value="${weblab.home}${fuseki.path}" />
<property name="binDirectory" value="${weblab.home}${fuseki.path}" />
<property name="port" value="3030" />
<property name="env" >
<bean class="org.ow2.weblab.bundle.utils.ProcessUtils.Env">
<constructor-arg>
<map>
<entry key="JAVA_OPTIONS" value=" -Xmx512m " />
<entry key="FUSEKI_ARGS" value=" -config=${weblab.conf}fuseki/config-tdb.ttl " />
</map>
</constructor-arg>
</bean>
</property>
<property name="script" value="${weblab.home}${fuseki.path}/fuseki" />
<property name="timeout" value="300000" />
</bean> -->
<bean id="Monitoring" class="org.ow2.weblab.bundle.conf.MonitoringBean">
<property name="delay"><value>300000</value></property>
<property name="email"><value>demo@weblab-project.org</value></property>
......
#################################
# ContentManager implementation selection #
#################################
# set to the actual class defined in your implementation
#reader.implementation=org.ow2.weblab.content.impl.webdav.WebDAVContentManager
#writer.implementation=org.ow2.weblab.content.impl.webdav.WebDAVContentManager
# Camel content manager
#reader.implementation=org.ow2.weblab.content.camel.CamelContentManager
#writer.implementation=org.ow2.weblab.content.camel.CamelContentManager
# File content manager
reader.implementation=org.ow2.weblab.content.impl.FileContentManager
writer.implementation=org.ow2.weblab.content.impl.FileContentManager
##################################################
# FileContentManager parameters (default impl) #